From cdd56ad8588329ceaa7f7c6c3338fb2568139695 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Sep 2022 00:01:59 +0000
Subject: [PATCH 001/299] Bump maven-pmd-plugin from 3.18.0 to 3.19.0

Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.18.0 to 3.19.0.
- [Release notes](https://github.com/apache/maven-pmd-plugin/releases)
- [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.18.0...maven-pmd-plugin-3.19.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-pmd-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d6b453e58..ae74529c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenPluginPluginVersion>3.6.4</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.4.1</mavenJavadocPluginVersion>
-    <mavenPmdPluginVersion>3.18.0</mavenPmdPluginVersion>
+    <mavenPmdPluginVersion>3.19.0</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
     <previousRatVersion>0.15</previousRatVersion>
     <currentSnapshotRatVersion>0.16-SNAPSHOT</currentSnapshotRatVersion>

From e7cbca9be2c2985b1f8a006cf3d4fad5b36dfdb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 00:02:23 +0000
Subject: [PATCH 002/299] Bump mockito-core from 4.7.0 to 4.8.0

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d6b453e58..e86a1176a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ agnostic home for software distribution comprehension and audit tools.
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
     <ant.version>1.10.12</ant.version>
-    <mockito.version>4.7.0</mockito.version>
+    <mockito.version>4.8.0</mockito.version>
     <javaVersion>1.8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>

From 08b0cfcb51e23643dcbd409b0209257cd8309f98 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 19 Sep 2022 08:41:28 +0200
Subject: [PATCH 003/299] LHF: reformat pom

---
 pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6245d9664..041db9a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,7 +376,7 @@ agnostic home for software distribution comprehension and audit tools.
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -398,7 +398,7 @@ agnostic home for software distribution comprehension and audit tools.
             </goals>
             <configuration>
               <target>
-                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false" />
+                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false"/>
               </target>
             </configuration>
           </execution>
@@ -697,11 +697,11 @@ agnostic home for software distribution comprehension and audit tools.
       </build>
     </profile>
   </profiles>
-    <!-- in order to test new releases this reference can be activated locally-->
-    <pluginRepositories>
-      <pluginRepository>
-        <id>staged-releases-rat-015</id>
-        <url>https://repository.apache.org/content/repositories/orgapachecreadur-1008/</url>
-      </pluginRepository>
-    </pluginRepositories>
+  <!-- in order to test new releases this reference can be activated locally-->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>staged-releases-rat-015</id>
+      <url>https://repository.apache.org/content/repositories/orgapachecreadur-1008/</url>
+    </pluginRepository>
+  </pluginRepositories>
 </project>

From e318aa56f14d6ef5bf5fc2dafefa02206719f6bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 00:22:50 +0000
Subject: [PATCH 004/299] Bump actions/setup-java from 3.4.1 to 3.6.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.4.1 to 3.6.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.4.1...v3.6.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 852632387..67893430a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.6.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From cf09ec76fd29ac89ddd48a6d46b97c239bef4631 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 20 Oct 2022 11:57:35 +0200
Subject: [PATCH 005/299] RAT-312: Remove travis build files and links to it

---
 .travis.yml | 9 ---------
 README.md   | 4 ----
 2 files changed, 13 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1b56d79bd..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: java
-dist: focal 
-sudo: required
-
-jobs:
-    include:
-        - name: "Java 16"
-          jdk: openjdk16
-          script: mvn -e -B -V clean package site
diff --git a/README.md b/README.md
index c32836205..177f6e9f7 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,8 @@
 
 ASF Jenkins: [![ASF Jenkins Build Status](https://ci-builds.apache.org/buildStatus/icon?job=Creadur%2FCreadur-Rat)](https://ci-builds.apache.org/job/Creadur/job/Creadur-Rat/)
 
-Travis: [![Build Status](https://app.travis-ci.com/apache/creadur-rat.svg?branch=master)](https://app.travis-ci.com/apache/creadur-rat)
-
 GA: [![Github Action master branch status](https://github.com/apache/creadur-rat/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/apache/creadur-rat/actions)
 
-Due to a bug in the Travis build infrastructure the builds fail regularly because Travis selects a JDK that fails animal-sniffer-plugin runs as it is not the one specified in the build.
-
 ## What is RAT?
 
 Apache Rat is developed by the Apache Creadur project of the Apache Software

From fd2e55b6ac7f7465783df32f62bed32261763b04 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 20 Oct 2022 11:59:24 +0200
Subject: [PATCH 006/299] RAT-312: Remove travis build files, replaced by
 GA/ASF Jenkins

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e05c0db0b..a7110f7c1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-312" type="fix" dev="pottlinger">
+        Remove Travis build as they are unreliable. Builds with ASF Jenkins and Github Actions remain as before.
+      </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.16.
       </action>

From d423110cb4d849e6a6f7a1561290e124bd07d09b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 20 Oct 2022 12:00:26 +0200
Subject: [PATCH 007/299] RAT-312: Remove RAT exclusion for travis build file

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1dc519838..eca7cd1c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,8 +331,6 @@ agnostic home for software distribution comprehension and audit tools.
           <version>0.15</version>
           <configuration>
             <excludes>
-              <!-- This file only describes how to build the project and it has no license header -->
-              <exclude>.travis.yml</exclude>
               <exclude>BUILD.txt</exclude>
               <!-- rat:check does not seem to use exclusions from modules -->
               <exclude>apache-rat/README*.txt</exclude>

From a0a09dca0ed661c313bdfdb44304bb337adb9f36 Mon Sep 17 00:00:00 2001
From: Hugo Hirsch <github@hugo-hirsch.de>
Date: Thu, 20 Oct 2022 13:49:04 +0200
Subject: [PATCH 008/299] RAT-312: Try to use caching of artifacts to speedup
 GA builds

---
 .github/workflows/maven.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 67893430a..186ae6958 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -42,6 +42,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Configura artifact caching
+        uses: actions/cache@v3.0.11
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
       - name: Set up JDK
         uses: actions/setup-java@v3.6.0
         with:

From 69b5f33d94e96d1f539ec67aca4ffb51e7167e44 Mon Sep 17 00:00:00 2001
From: Hugo Hirsch <github@hugo-hirsch.de>
Date: Thu, 20 Oct 2022 13:51:03 +0200
Subject: [PATCH 009/299] RAT-312: Do not show download progress during builds

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 186ae6958..4c27ca837 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -58,7 +58,7 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn -e -B -V clean package site
+        run: mvn -e -B -V -ntp clean package site
 
 # as of 20220505:  Invalid workflow file
 # The workflow is not valid. .github/workflows/maven.yml (Line: 55, Col: 1): Unexpected value 'notifications'

From 1789dcc9f3ba2807a8255a1659c0b7b6586e6ce7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 00:01:07 +0000
Subject: [PATCH 010/299] Bump plexus-utils from 3.4.2 to 3.5.0

Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.4.2...plexus-utils-3.5.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index c24e75fbc..22dcc325c 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -264,7 +264,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.4.2</version>
+      <version>3.5.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

From e4f20584896e9d96bd4b0bcce5d97dae9f0ee198 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 00:01:18 +0000
Subject: [PATCH 011/299] Bump mockito-core from 4.8.0 to 4.8.1

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eca7cd1c7..43049bf45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ agnostic home for software distribution comprehension and audit tools.
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
     <ant.version>1.10.12</ant.version>
-    <mockito.version>4.8.0</mockito.version>
+    <mockito.version>4.8.1</mockito.version>
     <javaVersion>1.8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>

From 0e3ca8484169c4c0a20f813273301c2cb6d3f36f Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 24 Oct 2022 23:55:44 +0200
Subject: [PATCH 012/299] Add github metadata

---
 .asf.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .asf.yaml

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 000000000..8896f727f
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,11 @@
+github:
+  description: "Apache Creadur RAT - Release Audit Tool"
+  homepage: https://creadur.apache.org/
+  labels:
+    - maven
+    - java
+    - cli
+    - licensechecker 
+    - apache
+    - creadur
+    - rat

From 26cbc5157601953d83731e4b0a93b31bbb4cc922 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 25 Oct 2022 00:05:51 +0200
Subject: [PATCH 013/299] Enable RAT exclusion for asf github control

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index eca7cd1c7..4b044ca3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,6 +331,7 @@ agnostic home for software distribution comprehension and audit tools.
           <version>0.15</version>
           <configuration>
             <excludes>
+              <exclude>.asf.yaml</exclude>
               <exclude>BUILD.txt</exclude>
               <!-- rat:check does not seem to use exclusions from modules -->
               <exclude>apache-rat/README*.txt</exclude>

From 83c8f31d7d2ab685febbf9623b547f7a80f2a56b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 00:03:24 +0000
Subject: [PATCH 014/299] Bump commons-compress from 1.21 to 1.22

Bumps commons-compress from 1.21 to 1.22.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4b044ca3f..c499ac242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.21</version>
+        <version>1.22</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>

From b456efb7c1a6c1663945ae828e3eff4c50c38ac2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 00:01:03 +0000
Subject: [PATCH 015/299] Bump mavenPluginPluginVersion from 3.6.4 to 3.7.0

Bumps `mavenPluginPluginVersion` from 3.6.4 to 3.7.0.

Updates `maven-plugin-annotations` from 3.6.4 to 3.7.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.4...maven-plugin-tools-3.7.0)

Updates `maven-plugin-plugin` from 3.6.4 to 3.7.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.4...maven-plugin-tools-3.7.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7d136c4f..a17cf29dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenVersion>2.2.1</mavenVersion>
     <creadur.jira.id>RAT</creadur.jira.id>
     <!-- maven plugin versions -->
-    <mavenPluginPluginVersion>3.6.4</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.7.0</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.4.1</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.19.0</mavenPmdPluginVersion>

From 3f5ec698d919912d31555b81cadd7bdaf2a68ae0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 00:00:45 +0000
Subject: [PATCH 016/299] Bump mockito-core from 4.8.1 to 4.9.0

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.9.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7d136c4f..90476ff31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ agnostic home for software distribution comprehension and audit tools.
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
     <ant.version>1.10.12</ant.version>
-    <mockito.version>4.8.1</mockito.version>
+    <mockito.version>4.9.0</mockito.version>
     <javaVersion>1.8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>

From 3dd6545f4a1774699a258d5905c9ade53d84bdbb Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 16 Nov 2022 21:01:25 +0100
Subject: [PATCH 017/299] Fix spacing in site

---
 src/site/apt/index.apt.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 52f9cc9c8..bf4513dbe 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -49,7 +49,7 @@ Apache Rat
 
  Apache Rat ${project.version} ships with tooling for
 
-   * {{{https://ant.apache.org/} Apache Ant}},
+   * {{{https://ant.apache.org/}Apache Ant}},
 
    * {{{https://maven.apache.org}Apache Maven}} and
 

From e2670ad396085512c19ba6d5474760f243ab98ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Nov 2022 00:01:06 +0000
Subject: [PATCH 018/299] Bump apache from 27 to 28

Bumps [apache](https://github.com/apache/maven-apache-parent) from 27 to 28.
- [Release notes](https://github.com/apache/maven-apache-parent/releases)
- [Commits](https://github.com/apache/maven-apache-parent/commits)

---
updated-dependencies:
- dependency-name: org.apache:apache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7d136c4f..6e502ff12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>27</version>
+    <version>28</version>
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>

From 5292c721ebe4be7fa47f74eeecd8998e3bc5a3c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 00:00:50 +0000
Subject: [PATCH 019/299] Bump maven-dependency-plugin from 3.3.0 to 3.4.0

Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.3.0...maven-dependency-plugin-3.4.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7d136c4f..9c02a3602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,7 +306,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.4.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From df4ff72642537431738fa0e8920f88c79c1e7f5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 00:08:55 +0000
Subject: [PATCH 020/299] Bump actions/setup-java from 3.6.0 to 3.7.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4c27ca837..8e21375de 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.6.0
+        uses: actions/setup-java@v3.7.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From 5267a55a30f62ba83e3528d741f1f30692086100 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 7 Dec 2022 11:17:21 +0100
Subject: [PATCH 021/299] INFRA-23976: restrict to run on ubuntu in order to
 have JDK8

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4ff77fb3b..0c6b982d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,8 +19,8 @@
  */
 pipeline {
 
-//    agent { label 'ubuntu' } 
-    agent any
+    agent { label 'ubuntu' } 
+// arm does not have JDK8 anymore: agent any
 
     environment {
         // It seems the login the jenkins slave uses, doesn't pick up the environment changes,

From 4ec3970a1202232c7d6c002ee233f180d36f82aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Dec 2022 00:00:52 +0000
Subject: [PATCH 022/299] Bump mockito-core from 4.9.0 to 4.10.0

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.9.0 to 4.10.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.10.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 46ac68b3f..5b9b7aeaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ agnostic home for software distribution comprehension and audit tools.
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
     <ant.version>1.10.12</ant.version>
-    <mockito.version>4.9.0</mockito.version>
+    <mockito.version>4.10.0</mockito.version>
     <javaVersion>1.8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>

From 96df4c1a793ecb7f65acbae43a331ab8d4a81ce2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Dec 2022 00:00:55 +0000
Subject: [PATCH 023/299] Bump apache from 28 to 29

Bumps [apache](https://github.com/apache/maven-apache-parent) from 28 to 29.
- [Release notes](https://github.com/apache/maven-apache-parent/releases)
- [Commits](https://github.com/apache/maven-apache-parent/commits)

---
updated-dependencies:
- dependency-name: org.apache:apache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 46ac68b3f..56d6829cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>28</version>
+    <version>29</version>
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>

From 9b0fee104b97dc2be13076f1a01031bd775f953f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Dec 2022 00:07:10 +0000
Subject: [PATCH 024/299] Bump actions/setup-java from 3.7.0 to 3.9.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.7.0 to 3.9.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.7.0...v3.9.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8e21375de..4bb3f3755 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.7.0
+        uses: actions/setup-java@v3.9.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From 6541ac613bc889ecb453191ed1698a5c88dee04d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Dec 2022 00:00:55 +0000
Subject: [PATCH 025/299] Bump wagon-ssh from 3.5.2 to 3.5.3

Bumps wagon-ssh from 3.5.2 to 3.5.3.

---
updated-dependencies:
- dependency-name: org.apache.maven.wagon:wagon-ssh
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63f2830a1..e540832c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -479,7 +479,7 @@ agnostic home for software distribution comprehension and audit tools.
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>
         <!-- Last version that is compatible with Maven 2 -->
-        <version>3.5.2</version>
+        <version>3.5.3</version>
       </extension>
     </extensions>
   </build>

From 8366d0cccd1fd86262f1d6074631b3ce7dc1bccf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Dec 2022 00:14:12 +0000
Subject: [PATCH 026/299] Bump actions/cache from 3.0.11 to 3.2.2

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.11 to 3.2.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.11...v3.2.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4bb3f3755..4c168b843 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Configura artifact caching
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v3.2.2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

From 1a728d12a28d0f43ec5a6dd928feaa68bc633d51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Dec 2022 00:00:49 +0000
Subject: [PATCH 027/299] Bump mockito-core from 4.10.0 to 4.11.0

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.10.0...v4.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63f2830a1..ad7850c86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ agnostic home for software distribution comprehension and audit tools.
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
     <ant.version>1.10.12</ant.version>
-    <mockito.version>4.10.0</mockito.version>
+    <mockito.version>4.11.0</mockito.version>
     <javaVersion>1.8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>

From 3bf655f3c892a8ba52d3d23823614557cffe97f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 00:10:22 +0000
Subject: [PATCH 028/299] Bump actions/cache from 3.2.2 to 3.2.3

Bumps [actions/cache](https://github.com/actions/cache) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4c168b843..b16bea90b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Configura artifact caching
-        uses: actions/cache@v3.2.2
+        uses: actions/cache@v3.2.3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

From 408810a1bce4a4798588ed5f7de4d25cf161a9de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:00:54 +0000
Subject: [PATCH 029/299] Bump ant.version from 1.10.12 to 1.10.13

Bumps `ant.version` from 1.10.12 to 1.10.13.

Updates `ant` from 1.10.12 to 1.10.13

Updates `ant-testutil` from 1.10.12 to 1.10.13

---
updated-dependencies:
- dependency-name: org.apache.ant:ant
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.ant:ant-testutil
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 626c2d218..64550ad8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@ agnostic home for software distribution comprehension and audit tools.
   <properties>
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
-    <ant.version>1.10.12</ant.version>
+    <ant.version>1.10.13</ant.version>
     <mockito.version>4.11.0</mockito.version>
     <javaVersion>1.8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>

From 6b8d00022d7a900878d6a203a600e642c03784ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 00:00:55 +0000
Subject: [PATCH 030/299] Bump maven-dependency-plugin from 3.4.0 to 3.5.0

Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.4.0...maven-dependency-plugin-3.5.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 626c2d218..b97591c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,7 +306,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.4.0</version>
+          <version>3.5.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 84c02e891b1f2647be4b5bd4200d4f87dd82a044 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 00:00:58 +0000
Subject: [PATCH 031/299] Bump maven-project-info-reports-plugin from 3.4.1 to
 3.4.2

Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases)
- [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.4.1...maven-project-info-reports-plugin-3.4.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 626c2d218..95b80f7a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,7 +244,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <reportSets>
           <reportSet>
             <reports>

From b13af807c244afe6dc0bbc39db844d7b24e57aa7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 00:01:09 +0000
Subject: [PATCH 032/299] Bump maven-pmd-plugin from 3.19.0 to 3.20.0

Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.19.0 to 3.20.0.
- [Release notes](https://github.com/apache/maven-pmd-plugin/releases)
- [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.19.0...maven-pmd-plugin-3.20.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-pmd-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 626c2d218..b63d63f5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenPluginPluginVersion>3.7.0</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.4.1</mavenJavadocPluginVersion>
-    <mavenPmdPluginVersion>3.19.0</mavenPmdPluginVersion>
+    <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
     <previousRatVersion>0.16</previousRatVersion>
     <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>

From e7245b43d48f6c7df28e29eb5055bdfa5901f561 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 00:01:04 +0000
Subject: [PATCH 033/299] Bump doxiaVersion from 1.11.1 to 1.12.0

Bumps `doxiaVersion` from 1.11.1 to 1.12.0.

Updates `doxia-core` from 1.11.1 to 1.12.0
- [Release notes](https://github.com/apache/maven-doxia/releases)
- [Commits](https://github.com/apache/maven-doxia/compare/doxia-1.11.1...doxia-1.12.0)

Updates `doxia-module-xhtml` from 1.11.1 to 1.12.0

Updates `doxia-sink-api` from 1.11.1 to 1.12.0
- [Release notes](https://github.com/apache/maven-doxia/releases)
- [Commits](https://github.com/apache/maven-doxia/compare/doxia-1.11.1...doxia-1.12.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.doxia:doxia-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.doxia:doxia-module-xhtml
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.doxia:doxia-sink-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 22dcc325c..55bba561e 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -34,7 +34,7 @@
   </prerequisites>
   <properties>
     <currentVersion>${project.version}</currentVersion>
-    <doxiaVersion>1.11.1</doxiaVersion>
+    <doxiaVersion>1.12.0</doxiaVersion>
     <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
   </properties>
   <build>

From 3cca01080c6097c543e06a58f0d6eda0aaaae634 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 27 Jan 2023 23:18:38 +0100
Subject: [PATCH 034/299] RAT-314: Add recursive exclusion for .mvn

---
 .../src/main/java/org/apache/rat/mp/util/ExclusionHelper.java  | 2 +-
 src/changes/changes.xml                                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
index 9552cc513..2561a6579 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
@@ -43,7 +43,7 @@ public final class ExclusionHelper {
                     "release.properties", //
                     ".repository", // Used by Jenkins when a Maven job uses a private repository that is "Local to the workspace"
                     "build.log", // RAT-160: until now maven-invoker-plugin runs create a build.log that is not part of a release
-                    ".mvn", // Project configuration since Maven 3.3.1 which contains maven.config, jvm.config, extensions.xml
+                    ".mvn/**", // Project configuration since Maven 3.3.1 which contains maven.config, jvm.config, extensions.xml
                     "pom.xml.releaseBackup"));
 
     /**
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a7110f7c1..3926c1530 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-314" type="fix" dev="pottlinger" due-to="François Guillot">
+        Add default recursive exclusion for maven-induced build artifacts in folder .mvn.
+      </action>
       <action issue="RAT-312" type="fix" dev="pottlinger">
         Remove Travis build as they are unreliable. Builds with ASF Jenkins and Github Actions remain as before.
       </action>

From d6313407b0d08b87fd876eaf4305f23326665023 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 27 Jan 2023 23:29:58 +0100
Subject: [PATCH 035/299] RAT-314: Apply same recursive exclusion as for
 existing target subfolder

---
 .../src/main/java/org/apache/rat/mp/util/ExclusionHelper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
index 2561a6579..fa7c74b9c 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
@@ -43,7 +43,7 @@ public final class ExclusionHelper {
                     "release.properties", //
                     ".repository", // Used by Jenkins when a Maven job uses a private repository that is "Local to the workspace"
                     "build.log", // RAT-160: until now maven-invoker-plugin runs create a build.log that is not part of a release
-                    ".mvn/**", // Project configuration since Maven 3.3.1 which contains maven.config, jvm.config, extensions.xml
+                    ".mvn/**/*", // Project configuration since Maven 3.3.1 which contains maven.config, jvm.config, extensions.xml
                     "pom.xml.releaseBackup"));
 
     /**

From 4cf68140c1a9343ef543cf7a056f1ea3c74a894f Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sat, 28 Jan 2023 00:15:31 +0100
Subject: [PATCH 036/299] Add 2023 to footer copyright notice

---
 src/site/site.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index beda3f78b..76f93cf0c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -99,7 +99,7 @@
     <menu ref="modules"/>
     <menu ref="reports"/>
 
-    <footer>Copyright &amp;copy; 2016-2022 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+    <footer>Copyright &amp;copy; 2016-2023 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.

From 14281be2aa501a51b48b0bc241313a6e363faf7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Feb 2023 00:03:52 +0000
Subject: [PATCH 037/299] Bump actions/setup-java from 3.9.0 to 3.10.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.9.0...v3.10.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b16bea90b..07c91af50 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.9.0
+        uses: actions/setup-java@v3.10.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From 4e395f92b7be8f853fd801a3cb55a3a02e66149f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Feb 2023 00:27:31 +0000
Subject: [PATCH 038/299] Bump actions/cache from 3.2.3 to 3.2.6

Bumps [actions/cache](https://github.com/actions/cache) from 3.2.3 to 3.2.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.2.3...v3.2.6)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b16bea90b..ac66004b1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Configura artifact caching
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v3.2.6
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

From 684806606e48720f2bd0249d70fc1be84b9baa7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 00:56:46 +0000
Subject: [PATCH 039/299] Bump plexus-utils from 3.5.0 to 3.5.1

Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.5.0...plexus-utils-3.5.1)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 55bba561e..9e5acbed3 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -264,7 +264,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

From 75110b5bf1d769ec389bf1a179b2695809f6866a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 00:56:50 +0000
Subject: [PATCH 040/299] Bump maven-compiler-plugin from 3.10.1 to 3.11.0

Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b94c75e92..a569d9b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,7 +296,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.1</version>
+          <version>3.11.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 192390a4fe376bf97e87d628bbe4dd8b6ecee949 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 00:58:57 +0000
Subject: [PATCH 041/299] Bump commons-lang3 from 3.5 to 3.12.0

Bumps commons-lang3 from 3.5 to 3.12.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 55bba561e..aa7f49518 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -269,7 +269,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.5</version>
+      <version>3.12.0</version>
     </dependency>
   </dependencies>
   <reporting>

From d58b4545529f1f7b32b72ecc078b5ac5b8c5824e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 00:59:13 +0000
Subject: [PATCH 042/299] Bump mavenPluginPluginVersion from 3.7.0 to 3.8.1

Bumps `mavenPluginPluginVersion` from 3.7.0 to 3.8.1.

Updates `maven-plugin-annotations` from 3.7.0 to 3.8.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.7.0...maven-plugin-tools-3.8.1)

Updates `maven-plugin-plugin` from 3.7.0 to 3.8.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.7.0...maven-plugin-tools-3.8.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b94c75e92..8ef4989c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenVersion>2.2.1</mavenVersion>
     <creadur.jira.id>RAT</creadur.jira.id>
     <!-- maven plugin versions -->
-    <mavenPluginPluginVersion>3.7.0</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.8.1</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.4.1</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>

From 9e6b0a574168c8d2bbc40521709f1412675ba9ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Mar 2023 01:00:15 +0000
Subject: [PATCH 043/299] Bump actions/cache from 3.2.6 to 3.3.1

Bumps [actions/cache](https://github.com/actions/cache) from 3.2.6 to 3.3.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.2.6...v3.3.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dce5bc509..3eb025116 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Configura artifact caching
-        uses: actions/cache@v3.2.6
+        uses: actions/cache@v3.3.1
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

From f37a8984b64ac987c92ee1648265ef790b77d664 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Mar 2023 00:56:47 +0000
Subject: [PATCH 044/299] Bump maven-javadoc-plugin from 3.4.1 to 3.5.0

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b93d8385..e09c6a345 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@ agnostic home for software distribution comprehension and audit tools.
     <!-- maven plugin versions -->
     <mavenPluginPluginVersion>3.8.1</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
-    <mavenJavadocPluginVersion>3.4.1</mavenJavadocPluginVersion>
+    <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
     <previousRatVersion>0.16</previousRatVersion>

From 34fd39a15e94b40ed6e6226c4510c998bd03c294 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Mar 2023 00:56:56 +0000
Subject: [PATCH 045/299] Bump maven-release-plugin from 2.5.3 to 3.0.0

Bumps [maven-release-plugin](https://github.com/apache/maven-release) from 2.5.3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-release/releases)
- [Commits](https://github.com/apache/maven-release/compare/maven-release-2.5.3...maven-release-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b93d8385..730226d2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,7 +348,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
+          <version>3.0.0</version>
           <configuration>
             <!-- Only prompt once for the release version -->
             <autoVersionSubmodules>true</autoVersionSubmodules>

From 7aa05b418887772bc08b4363637238edd26696ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 00:58:55 +0000
Subject: [PATCH 046/299] Bump commons-compress from 1.22 to 1.23.0

Bumps commons-compress from 1.22 to 1.23.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b93d8385..51e9eebae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.22</version>
+        <version>1.23.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>

From bbaba34bad983b7328a67fb57bec8c462d2bc275 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 00:58:43 +0000
Subject: [PATCH 047/299] Bump actions/setup-java from 3.10.0 to 3.11.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.10.0...v3.11.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3eb025116..8b69d61c7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From 7d18582e4d22ad839cd1c2545edd5d60a059de4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Apr 2023 00:56:57 +0000
Subject: [PATCH 048/299] Bump maven-enforcer-plugin from 3.1.0 to 3.3.0

Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.1.0...enforcer-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b93d8385..6e96cdec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -406,7 +406,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <!-- This checks the bytecode version of the dependencies transitively -->

From e81813f88fd70739038f5b34887a1c2961ae9b25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 00:56:56 +0000
Subject: [PATCH 049/299] Bump maven-project-info-reports-plugin from 3.4.2 to
 3.4.3

Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases)
- [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.4.2...maven-project-info-reports-plugin-3.4.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 270ef814f..e6ee5ecfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,7 +244,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.4.2</version>
+        <version>3.4.3</version>
         <reportSets>
           <reportSet>
             <reports>

From 3a6767dbcd6f1296a197e6192e177d21f7605e25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 00:57:00 +0000
Subject: [PATCH 050/299] Bump animal-sniffer-maven-plugin from 1.22 to 1.23

Bumps [animal-sniffer-maven-plugin](https://github.com/mojohaus/animal-sniffer) from 1.22 to 1.23.
- [Release notes](https://github.com/mojohaus/animal-sniffer/releases)
- [Commits](https://github.com/mojohaus/animal-sniffer/compare/animal-sniffer-parent-1.22...1.23)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:animal-sniffer-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 270ef814f..9d9c554e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -449,7 +449,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.22</version>
+        <version>1.23</version>
         <executions>
           <execution>
             <!-- This checks the source code of our project -->

From deff5d94408c2db0996ce938326dc7482b930508 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 00:57:09 +0000
Subject: [PATCH 051/299] Bump mavenPluginPluginVersion from 3.8.1 to 3.8.2

Bumps `mavenPluginPluginVersion` from 3.8.1 to 3.8.2.

Updates `maven-plugin-annotations` from 3.8.1 to 3.8.2
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.8.1...maven-plugin-tools-3.8.2)

Updates `maven-plugin-plugin` from 3.8.1 to 3.8.2
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.8.1...maven-plugin-tools-3.8.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 270ef814f..79b60790b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenVersion>2.2.1</mavenVersion>
     <creadur.jira.id>RAT</creadur.jira.id>
     <!-- maven plugin versions -->
-    <mavenPluginPluginVersion>3.8.1</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.8.2</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>

From 3c3c18487d31e864681fe5968ac6eb0309c009f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 00:57:14 +0000
Subject: [PATCH 052/299] Bump extra-enforcer-rules from 1.6.1 to 1.6.2

Bumps [extra-enforcer-rules](https://github.com/mojohaus/extra-enforcer-rules) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/mojohaus/extra-enforcer-rules/releases)
- [Commits](https://github.com/mojohaus/extra-enforcer-rules/compare/extra-enforcer-rules-1.6.1...1.6.2)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:extra-enforcer-rules
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 270ef814f..e7b034f4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,7 +431,7 @@ agnostic home for software distribution comprehension and audit tools.
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
           </dependency>
         </dependencies>
       </plugin>

From dcbc04160351ee1f0498c42b50158fbe1a0c830e Mon Sep 17 00:00:00 2001
From: Gary Gregory <ggregory@rocketsoftware.com>
Date: Mon, 1 May 2023 10:30:04 -0400
Subject: [PATCH 053/299] [RAT-317] Maven plugin is too chatty

---
 .../org/apache/rat/mp/AbstractRatMojo.java    | 24 +++++++++----------
 .../java/org/apache/rat/mp/RatReportMojo.java |  2 +-
 .../apache/rat/mp/util/ScmIgnoreParser.java   |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 97a0e8dfe..67ba00045 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -258,7 +258,7 @@ private List<IHeaderMatcher> mergeLicenseMatchers()
 
         if (licenses != null) {
             matchers.addAll(Arrays.asList(licenses));
-            getLog().info("Added " + licenses.length + " additional default licenses.");
+            getLog().debug("Added " + licenses.length + " additional default licenses.");
         }
 
         if (licenseMatchers != null) {
@@ -268,7 +268,7 @@ private List<IHeaderMatcher> mergeLicenseMatchers()
         }
 
         if (addDefaultLicenseMatchers) {
-            getLog().info("Enabled default license matchers.");
+            getLog().debug("Enabled default license matchers.");
             matchers.addAll(Defaults.DEFAULT_MATCHERS);
         }
         logLicenseMatchers(matchers);
@@ -312,7 +312,7 @@ private void logAboutIncludedFiles(final String[] files) {
         if (files.length == 0) {
             getLog().warn("No resources included.");
         } else {
-            getLog().info(
+            getLog().debug(
                     files.length
                             + " resources included");
             if (getLog().isDebugEnabled()) {
@@ -350,7 +350,7 @@ private void setIncludes(DirectoryScanner ds) throws MojoExecutionException {
         		if (!f.isFile()) {
         			getLog().error("IncludesFile not found: " + f.getAbsolutePath());
         		} else {
-        			getLog().info("Includes loaded from file " + includesFile + ", using character set " + charset);
+        			getLog().debug("Includes loaded from file " + includesFile + ", using character set " + charset);
         		}
         		includeList.addAll(getPatternsFromFile(f, charset));
         	}
@@ -404,9 +404,9 @@ private List<String> getPatternsFromFile(File pFile, String pCharset) throws Moj
     private void setExcludes(DirectoryScanner ds) throws MojoExecutionException {
         final List<String> excludeList = mergeDefaultExclusions();
         if (excludes == null || excludes.length == 0) {
-            getLog().info("No excludes explicitly specified.");
+            getLog().debug("No excludes explicitly specified.");
         } else {
-            getLog().info(excludes.length + " explicit excludes.");
+            getLog().debug(excludes.length + " explicit excludes.");
         	for (final String exclude : excludes) {
                 getLog().debug("Exclude: " + exclude);
             }
@@ -430,9 +430,9 @@ private List<String> mergeDefaultExclusions() throws MojoExecutionException {
         addIdeaDefaults(getLog(), useIdeaDefaultExcludes, results);
 
         if (parseSCMIgnoresAsExcludes) {
-            getLog().info("Will parse SCM ignores for exclusions...");
+            getLog().debug("Will parse SCM ignores for exclusions...");
             results.addAll(ScmIgnoreParser.getExclusionsFromSCM(getLog(), project.getBasedir()));
-            getLog().info("Finished adding exclusions from SCM ignore files.");
+            getLog().debug("Finished adding exclusions from SCM ignore files.");
         }
 
         if (excludeSubProjects && project != null
@@ -450,9 +450,9 @@ private List<String> mergeDefaultExclusions() throws MojoExecutionException {
 
         getLog().debug("Finished creating list of implicit excludes.");
         if (results.isEmpty()) {
-            getLog().info("No excludes implicitly specified.");
+            getLog().debug("No excludes implicitly specified.");
         } else {
-            getLog().info(
+            getLog().debug(
                     results.size()
                             + " implicit excludes.");
             for (final String exclude : results) {
@@ -468,7 +468,7 @@ private List<String> mergeDefaultExclusions() throws MojoExecutionException {
         		getLog().error("Excludes file not readable: " + f.getAbsolutePath());
         	}
         	final String charset = excludesFileCharset == null ? "UTF8" : excludesFileCharset;
-        	getLog().info("Loading excludes from file " + f + ", using character set " + charset);
+        	getLog().debug("Loading excludes from file " + f + ", using character set " + charset);
         	results.addAll(getPatternsFromFile(f, charset));
         }
 
@@ -541,7 +541,7 @@ private List<ILicenseFamily> mergeApprovedLicenseNames()
             throws MojoExecutionException, MojoFailureException {
         final List<ILicenseFamily> list = new ArrayList<>();
         if (licenseFamilies != null) {
-            getLog().info("Added " + licenseFamilies.length + " custom approved licenses.");
+            getLog().debug("Added " + licenseFamilies.length + " custom approved licenses.");
             list.addAll(Arrays.asList(licenseFamilies));
         }
         if (licenseFamilyNames != null) {
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 04d7d599b..4f907be07 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -189,7 +189,7 @@ private SiteRenderingContext createSiteRenderingContext(Locale locale)
             Artifact skinArtifact =
                     siteTool.getSkinArtifactFromRepository(localRepository, remoteRepositories, decorationModel);
 
-            getLog().info(buffer().a("Rendering content with ").strong(skinArtifact.getId()
+            getLog().debug(buffer().a("Rendering content with ").strong(skinArtifact.getId()
                     + " skin").a('.').toString());
 
             context = siteRenderer.createContextForSkin(skinArtifact, templateProperties, decorationModel,
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java
index 97b81c16f..a165454f7 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java
@@ -55,7 +55,7 @@ public static List<String> getExcludesFromFile(final Log log, final File scmIgno
         final List<String> exclusionLines = new ArrayList<>();
 
         if (scmIgnore != null && scmIgnore.exists() && scmIgnore.isFile()) {
-            log.info("Parsing exclusions from " + scmIgnore);
+            log.debug("Parsing exclusions from " + scmIgnore);
             BufferedReader reader = null;
             try {
                 reader = new BufferedReader(new FileReader(scmIgnore));

From aa065147e51297ccd087e5108714dae70a15121d Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 1 May 2023 20:10:48 +0200
Subject: [PATCH 054/299] RAT-317: Reduce log output of SCM ignore parser

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3926c1530..cde6f6c6f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-317" type="fix" dev="pottlinger" due-to="Gary Gregory">
+        Change log output level of SCM ignore parser from info to debug in order to produce less log output in RAT runs.
+      </action>
       <action issue="RAT-314" type="fix" dev="pottlinger" due-to="François Guillot">
         Add default recursive exclusion for maven-induced build artifacts in folder .mvn.
       </action>

From 101c13f4dcfa6483dde701b6c3364ea380aaa6d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 00:56:50 +0000
Subject: [PATCH 055/299] Bump maven-shared-utils from 3.3.4 to 3.4.1

Bumps [maven-shared-utils](https://github.com/apache/maven-shared-utils) from 3.3.4 to 3.4.1.
- [Release notes](https://github.com/apache/maven-shared-utils/releases)
- [Commits](https://github.com/apache/maven-shared-utils/compare/maven-shared-utils-3.3.4...maven-shared-utils-3.4.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.shared:maven-shared-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 7af29c614..db1a021d7 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -253,7 +253,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.4</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

From 127a155d44a8e710dee0a270029b8d4461c17ea9 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 16 May 2023 16:06:05 +0200
Subject: [PATCH 056/299] [RAT-315] Fix build with maven 3.9.x

---
 apache-rat-plugin/pom.xml                     | 35 ++++++++++-------
 .../java/org/apache/rat/mp/RatReportMojo.java |  7 ++--
 .../org/apache/rat/mp/RatCheckMojoTest.java   |  6 +--
 .../org/apache/rat/mp/RatTestHelpers.java     | 20 ----------
 apache-rat-tasks/pom.xml                      |  8 ----
 apache-rat/pom.xml                            |  1 +
 pom.xml                                       | 38 ++++++++++++++++++-
 7 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 7af29c614..a09f357fb 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -125,20 +125,13 @@
         		</lifecycleMappingMetadata>
         	</configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <forkCount>1</forkCount>
-            <argLine>-Dfile.encoding=ISO-8859-1</argLine>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
+        <version>3.5.1</version>
         <configuration>
           <cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
@@ -181,16 +174,13 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-      <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -200,8 +190,9 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
+      <artifactId>maven-core</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -214,6 +205,10 @@
       <artifactId>doxia-core</artifactId>
       <version>${doxiaVersion}</version>
       <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>xerces</groupId>
           <artifactId>xercesImpl</artifactId>
@@ -239,11 +234,23 @@
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-integration-tools</artifactId>
       <version>${doxiaSitetoolsVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-site-renderer</artifactId>
       <version>${doxiaSitetoolsVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 4f907be07..04aba95d1 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -32,6 +32,7 @@
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 import org.apache.maven.doxia.tools.SiteTool;
 import org.apache.maven.doxia.tools.SiteToolException;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
@@ -80,8 +81,8 @@ public class RatReportMojo extends AbstractRatMojo implements MavenMultiPageRepo
     /**
      * The local repository.
      */
-    @Parameter(defaultValue = "${localRepository}", readonly = true, required = true)
-    protected ArtifactRepository localRepository;
+    @Parameter(defaultValue = "${session}", readonly = true, required = true)
+    protected MavenSession session;
 
     /**
      * Remote repositories used for the project.
@@ -187,7 +188,7 @@ private SiteRenderingContext createSiteRenderingContext(Locale locale)
         SiteRenderingContext context;
         try {
             Artifact skinArtifact =
-                    siteTool.getSkinArtifactFromRepository(localRepository, remoteRepositories, decorationModel);
+                    siteTool.getSkinArtifactFromRepository(session.getLocalRepository(), remoteRepositories, decorationModel);
 
             getLog().debug(buffer().a("Rendering content with ").strong(skinArtifact.getId()
                     + " skin").a('.').toString());
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index b12e114b0..e78d7a934 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -37,7 +37,6 @@
 import static org.apache.rat.mp.RatTestHelpers.getSourceDirectory;
 import static org.apache.rat.mp.RatTestHelpers.newArtifactFactory;
 import static org.apache.rat.mp.RatTestHelpers.newArtifactRepository;
-import static org.apache.rat.mp.RatTestHelpers.newArtifactResolver;
 import static org.apache.rat.mp.RatTestHelpers.newSiteRenderer;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
@@ -105,11 +104,10 @@ public Build getBuild() {
 
         if (mojo instanceof RatReportMojo) {
             setVariableValueToObject(mojo, "localRepository",
-                    newArtifactRepository(container));
-            setVariableValueToObject(mojo, "resolver", newArtifactResolver());
+                    newArtifactRepository(getContainer()));
             setVariableValueToObject(mojo, "factory", newArtifactFactory());
             setVariableValueToObject(mojo, "siteRenderer",
-                    newSiteRenderer(container));
+                    newSiteRenderer(getContainer()));
         } else if (mojo instanceof RatCheckMojo) {
             final File ratTxtFile = new File(buildDirectory, "rat.txt");
             setVariableValueToObject(mojo, "reportFile", ratTxtFile);
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
index 5467f6e19..d9133b38b 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
@@ -23,7 +23,6 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.resolver.DefaultArtifactResolver;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.settings.Settings;
@@ -151,25 +150,6 @@ public Object invoke(Object pProxy, Method pMethod, Object[] pArgs)
                 new Class[]{ArtifactFactory.class}, handler);
     }
 
-    /**
-     * Creates a new instance of {@link ArtifactResolver}.
-     *
-     * @return A configured instance of {@link DefaultArtifactResolver}.
-     * @throws Exception Creating the object failed.
-     */
-    public static ArtifactResolver newArtifactResolver() throws Exception {
-        final InvocationHandler handler = new InvocationHandler() {
-            public Object invoke(Object pProxy, Method pMethod, Object[] pArgs)
-                    throws Throwable {
-                System.out.println("Invoking method " + pMethod);
-                throw new IllegalStateException("Not implemented");
-            }
-        };
-        return (ArtifactResolver) Proxy.newProxyInstance(Thread.currentThread()
-                        .getContextClassLoader(),
-                new Class[]{ArtifactResolver.class}, handler);
-    }
-
     /**
      * Creates an instance of {@link ArtifactRepository}.
      *
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 84eb8b8ee..1e034acc3 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -158,14 +158,6 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <forkCount>1</forkCount>
-            <argLine>-Dfile.encoding=ISO-8859-1</argLine>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index 418ee9328..16cd10aff 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -108,6 +108,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <version>1.23</version>
         <executions>
           <execution>
             <!-- This sub project has no source code, so we need to skip animal sniffer -->
diff --git a/pom.xml b/pom.xml
index 54befb444..20c14cc53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,10 +51,10 @@ agnostic home for software distribution comprehension and audit tools.
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>
     <!-- This is the version of Maven required to use the Rat Maven Plugin -->
-    <mavenVersion>2.2.1</mavenVersion>
+    <mavenVersion>3.0</mavenVersion>
     <creadur.jira.id>RAT</creadur.jira.id>
     <!-- maven plugin versions -->
-    <mavenPluginPluginVersion>3.8.2</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
@@ -146,6 +146,11 @@ agnostic home for software distribution comprehension and audit tools.
         <version>${ant.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-annotations</artifactId>
+        <version>${mavenPluginPluginVersion}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <reporting>
@@ -308,6 +313,11 @@ agnostic home for software distribution comprehension and audit tools.
           <artifactId>maven-dependency-plugin</artifactId>
           <version>3.5.0</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>3.5.1</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
@@ -316,6 +326,11 @@ agnostic home for software distribution comprehension and audit tools.
             <targetJdk>${javaVersion}</targetJdk>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${mavenPluginPluginVersion}</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
@@ -345,6 +360,11 @@ agnostic home for software distribution comprehension and audit tools.
             </excludes>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
@@ -355,6 +375,20 @@ agnostic home for software distribution comprehension and audit tools.
             <mavenExecutorId>forked-path</mavenExecutorId>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.1.0</version>
+          <configuration>
+            <forkCount>1</forkCount>
+            <argLine>-Dfile.encoding=ISO-8859-1</argLine>
+          </configuration>
+        </plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>

From 149f885dfa362fada1f7dea7cffcd6b0f3865562 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 26 May 2023 11:43:05 +0200
Subject: [PATCH 057/299] Fix build, raise minimum maven requirement to 3.2.5

---
 apache-rat-plugin/pom.xml                              | 10 ++++++++--
 .../src/main/java/org/apache/rat/mp/RatReportMojo.java |  2 +-
 .../test/java/org/apache/rat/mp/RatTestHelpers.java    | 10 +++++-----
 pom.xml                                                |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index a09f357fb..30671a6d9 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -200,6 +200,12 @@
       <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-core</artifactId>
@@ -263,9 +269,9 @@
       <version>3.3.4</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
+      <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>1.1</version>
+      <version>3.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 04aba95d1..e54c5b5cf 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -354,7 +354,7 @@ public boolean canGenerateReport() {
     // TODO The canonical way is to read the pom.properties for the artifact desired in META-INF/maven
     private String getRatVersion() {
         //noinspection unchecked
-        for (Artifact a : (Iterable<Artifact>) getProject().getDependencyArtifacts()) {
+        for (Artifact a : getProject().getDependencyArtifacts()) {
             if ("rat-lib".equals(a.getArtifactId())) {
                 return a.getVersion();
             }
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
index d9133b38b..1656a95ff 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
@@ -21,9 +21,9 @@
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.factory.DefaultArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.resolver.DefaultArtifactResolver;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
@@ -154,7 +154,7 @@ public Object invoke(Object pProxy, Method pMethod, Object[] pArgs)
      * Creates an instance of {@link ArtifactRepository}.
      *
      * @param container current plexus container.
-     * @return A configured instance of {@link DefaultArtifactRepository}.
+     * @return A configured instance of {@link MavenArtifactRepository}.
      * @throws Exception Creating the object failed.
      */
     public static ArtifactRepository newArtifactRepository(
@@ -172,8 +172,8 @@ public static ArtifactRepository newArtifactRepository(
         }
         ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) container
                 .lookup(ArtifactRepositoryLayout.ROLE, "default");
-        return new DefaultArtifactRepository("local", "file://" + localRepo,
-                repositoryLayout);
+        return new MavenArtifactRepository("local", "file://" + localRepo,
+                repositoryLayout, new ArtifactRepositoryPolicy(), new ArtifactRepositoryPolicy());
     }
 
     public static File makeSourceDirectory(String mvnBaseDir, File pFile,
diff --git a/pom.xml b/pom.xml
index 20c14cc53..8f4dc239e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@ agnostic home for software distribution comprehension and audit tools.
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>
     <!-- This is the version of Maven required to use the Rat Maven Plugin -->
-    <mavenVersion>3.0</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
     <creadur.jira.id>RAT</creadur.jira.id>
     <!-- maven plugin versions -->
     <mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>

From 3630e7616098968e533cc086dcb8e013b91b81fe Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 26 May 2023 11:52:23 +0200
Subject: [PATCH 058/299] Upgrade to latest m-dependency-p and remove duplicate
 version

---
 pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f4dc239e..bfaa23808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,8 +271,6 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <!-- Do not use property values here as this causes problems during release -->
-        <version>0.15</version>
       </plugin>
     </plugins>
   </reporting>
@@ -311,7 +309,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 3ae704463b30af28716db72238c2f54ac19d4a5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jun 2023 00:56:47 +0000
Subject: [PATCH 059/299] Bump extra-enforcer-rules from 1.6.2 to 1.7.0

Bumps [extra-enforcer-rules](https://github.com/mojohaus/extra-enforcer-rules) from 1.6.2 to 1.7.0.
- [Release notes](https://github.com/mojohaus/extra-enforcer-rules/releases)
- [Commits](https://github.com/mojohaus/extra-enforcer-rules/compare/1.6.2...1.7.0)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:extra-enforcer-rules
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 54befb444..c5885b3a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,7 +431,7 @@ agnostic home for software distribution comprehension and audit tools.
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.0</version>
           </dependency>
         </dependencies>
       </plugin>

From 81fca65a5853ddf1c361e1b1659e8238927d533d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Mon, 19 Jun 2023 13:13:36 +0000
Subject: [PATCH 060/299] Remove misspelled, broken link

---
 src/site/site.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index 76f93cf0c..3a1d7b5b6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -89,7 +89,6 @@
       <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="Howto publish this site" href="site-publish.html"/>
-      <item name='Plant Apache' href='https://planet.apache.org/committers/'/>
       <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/'/>

From 8d2aabf44ac3c6260f763b5f7cb8f945d6572afb Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 23 Jul 2023 18:04:53 +0200
Subject: [PATCH 061/299] Added SPDX processing for default licenses.

Fixed issues with GPL1 and GPL2 names
Modified HeadermacherMultiplexer to accept any type of Collection of
IHeaderMatchers
---
 .../main/java/org/apache/rat/Defaults.java    |  4 +-
 .../rat/analysis/license/SPDXMatcher.java     | 89 +++++++++++++++++++
 .../util/HeaderMatcherMultiplexer.java        |  7 +-
 .../java/org/apache/rat/api/MetaData.java     |  4 +-
 .../org/apache/rat/policy/DefaultPolicy.java  |  1 +
 .../rat/analysis/license/SPDXMatcherTest.java | 74 +++++++++++++++
 6 files changed, 174 insertions(+), 5 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 68fb5ec09..2272d174f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -29,6 +29,7 @@
 import org.apache.rat.analysis.license.GPL3License;
 import org.apache.rat.analysis.license.MITLicense;
 import org.apache.rat.analysis.license.OASISLicense;
+import org.apache.rat.analysis.license.SPDXMatcher;
 import org.apache.rat.analysis.license.TMF854LicenseHeader;
 import org.apache.rat.analysis.license.W3CDocLicense;
 import org.apache.rat.analysis.license.W3CLicense;
@@ -68,7 +69,8 @@ private Defaults() {
                     new GeneratedLicenseNotRequired(), // does not have a MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_... entry
                     new DojoLicenseHeader(),
                     new TMF854LicenseHeader(),
-                    new CDDL1License()));
+                    new CDDL1License(),
+                    SPDXMatcher.Factory.getDefault()));
 
     // all classes in license package implementing ILicenseFamily
     public static final List<String> DEFAULT_LICENSE_FAMILIES = Collections.unmodifiableList(
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
new file mode 100644
index 000000000..c41910425
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
@@ -0,0 +1,89 @@
+package org.apache.rat.analysis.license;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+
+/**
+ * Defines a matcher for an SPDX tag.  SPDX tag is of the format
+ * {@code SPDX-License-Identifier: short-name} where {@code short-name} matches the regex pattern
+ * [A-Za-z0-9\.\-]+
+ * <p>SPDX identifiers are specified by the Software Package Data Exchange(R) also known as SPDX(R) project
+ * from the Linux foundation.</p>
+ * 
+ * @see https://spdx.dev/ids/
+ */
+public class SPDXMatcher extends BaseLicense implements IHeaderMatcher {
+
+    /**
+     * Creates IHeaderMatcher instances that are a collection of SPDXMatcher instances.  Used in the
+     * default matcher construction.
+     */
+    public static class Factory {
+        static Map<String, IHeaderMatcher> getDefaultMatchers() {
+            Map<String, IHeaderMatcher> matchers = new HashMap<>();
+            matchers.put("CDDL-1.0", new SPDXMatcher("CDDL-1.0", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1));
+            matchers.put("GPL-1.0-only",
+                    new SPDXMatcher("GPL-1.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL1,
+                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1));
+            matchers.put("GPL-2.0-only",
+                    new SPDXMatcher("GPL-2.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL2,
+                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2));
+            matchers.put("GPL-3.0-only",
+                    new SPDXMatcher("GPL-3.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL3,
+                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_3));
+            matchers.put("MIT", new SPDXMatcher("MIT", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MIT));
+            matchers.put("Apache-2.0", new SPDXMatcher("Apache-2.0", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0));
+            matchers.put("W3C", new SPDXMatcher("W3C", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT));
+            return matchers;
+        }
+
+        public static final IHeaderMatcher getDefault() {
+            return new HeaderMatcherMultiplexer(getDefaultMatchers().values());
+        }
+    }
+
+    private static Pattern groupSelector = Pattern.compile(".*SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)");
+    private Predicate<String> regex;
+
+    /**
+     * Constructor.
+     * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
+     * @param licenseFamilyCategory the RAT license family category for the license.
+     * @param licenseFamilyName the RAT license family name for the license.
+     */
+    public SPDXMatcher(final String spdxId, final MetaData.Datum licenseFamilyCategory,
+            final MetaData.Datum licenseFamilyName) {
+        super(licenseFamilyCategory, licenseFamilyName, "");
+        this.regex = Pattern.compile(spdxId).asPredicate();
+    }
+
+    @Override
+    public void reset() {
+    }
+
+    @Override
+    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
+        Matcher matcher = groupSelector.matcher(line);
+        if (matcher.find()) {
+            String name = matcher.group(1);
+            if (regex.test(name)) {
+                reportOnLicense(subject);
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
index ed3eb7382..3f3592132 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
@@ -22,6 +22,7 @@
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -30,12 +31,13 @@
  */
 public final class HeaderMatcherMultiplexer implements IHeaderMatcher {
 
-    private final List<IHeaderMatcher> matchers;
+    private final Collection<IHeaderMatcher> matchers;
 
-    public HeaderMatcherMultiplexer(final List<IHeaderMatcher> matchers) {
+    public HeaderMatcherMultiplexer(final Collection<IHeaderMatcher> matchers) {
         this.matchers = matchers;
     }
 
+    @Override
     public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
         boolean result = false;
         for (IHeaderMatcher matcher : matchers) {
@@ -47,6 +49,7 @@ public boolean match(Document subject, String line) throws RatHeaderAnalysisExce
         return result;
     }
 
+    @Override
     public void reset() {
         for (IHeaderMatcher matcher : matchers) {
             matcher.reset();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index 556912e72..1c871a188 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -110,9 +110,9 @@ public class MetaData {
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
     public static final Datum
-            RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL1);
+            RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1);
     public static final Datum
-            RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL2);
+            RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2);
     public static final Datum
             RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_3 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3);
     public static final Datum
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 6cbf7a327..1a329fdd4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -66,6 +66,7 @@ public DefaultPolicy(final List<String> approvedLicenseNames, boolean mergeWithD
         Collections.sort(this.approvedLicenseNames);
     }
 
+    @Override
     public void analyse(final Document subject) throws RatDocumentAnalysisException {
         if (subject != null) {
             final String name = subject.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
new file mode 100644
index 000000000..348b52de1
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
@@ -0,0 +1,74 @@
+package org.apache.rat.analysis.license;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.document.MockDocument;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SPDXMatcherTest {
+
+    private IHeaderMatcher defaults = SPDXMatcher.Factory.getDefault();
+    private Document testDocument;
+
+    @Before
+    public void setup() {
+        testDocument = new MockDocument("SPDXMatcher test");
+    }
+    
+    private String getTag(String shortName) {
+        return String.format("Some text\n  SPDX-License-Identifier:\t%s \nSome more text", shortName);
+    }
+    
+    private void validate( String category, String name) {
+        assertEquals(category, testDocument.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY));
+        assertEquals(name, testDocument.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
+  
+    }
+    @Test
+    public void testCDDL1() throws RatHeaderAnalysisException {
+        assertTrue( defaults.match( testDocument, getTag("CDDL-1.0")));
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_CDDL1, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1);
+    }
+    
+    @Test
+    public void testGPL1() throws RatHeaderAnalysisException {
+        assertTrue( defaults.match( testDocument, getTag("GPL-1.0-only")));
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL1, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1);
+    }
+
+    @Test
+    public void testGPL2() throws RatHeaderAnalysisException {
+        assertTrue( defaults.match( testDocument, getTag("GPL-2.0-only")));
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL2, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2);
+    }
+
+    @Test
+    public void testGPL3() throws RatHeaderAnalysisException {
+        assertTrue( defaults.match( testDocument, getTag("GPL-3.0-only")));
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL3, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3);
+    }
+
+    @Test
+    public void testMIT() throws RatHeaderAnalysisException {
+        assertTrue( defaults.match( testDocument, getTag("MIT")));
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_MIT, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT);
+    }
+
+    @Test
+    public void testApache2() throws RatHeaderAnalysisException {
+        assertTrue( defaults.match( testDocument, getTag("Apache-2.0")));
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
+    }
+
+    @Test
+    public void testW3C() throws RatHeaderAnalysisException {
+        assertTrue( defaults.match( testDocument, getTag("W3C")));
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3CD, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT);
+    }
+}

From 7516f9dc0ee7f47a40a56ee1868fce3c50e97583 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 23 Jul 2023 18:10:21 +0200
Subject: [PATCH 062/299] added missing license header

---
 .../rat/analysis/license/SPDXMatcher.java      | 18 ++++++++++++++++++
 .../rat/analysis/license/SPDXMatcherTest.java  | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
index c41910425..f6de73ce1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */ 
 package org.apache.rat.analysis.license;
 
 import java.util.HashMap;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
index 348b52de1..b3a057a79 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */ 
 package org.apache.rat.analysis.license;
 
 import static org.junit.Assert.assertEquals;

From f7bea3ebd741667e8ed22f47ae010432c624d737 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@apache.org>
Date: Mon, 24 Jul 2023 07:03:32 +0100
Subject: [PATCH 063/299] Update pom.xml

Added Claude Warren as a contributor
---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index f94e03380..713cd240e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,6 +623,10 @@ agnostic home for software distribution comprehension and audit tools.
       <name>Paul Merlin</name>
       <email>paulmerlin@apache.org</email>
     </contributor>
+    <contributor>
+      <name>Claude Warren</name>
+      <email>claude@apache.org</email>
+    </contributor>
   </contributors>
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>

From 82fde057d87689f6254fc95e13bd91c003d11733 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 24 Jul 2023 14:03:53 +0200
Subject: [PATCH 064/299] Update changes.xml

Updated changes.xml for pull request #148
---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cde6f6c6f..9f30cac6c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-251" type="fix" dev="claudenw">
+         Added SPDX processing for default licenses.
+      </action>
       <action issue="RAT-317" type="fix" dev="pottlinger" due-to="Gary Gregory">
         Change log output level of SCM ignore parser from info to debug in order to produce less log output in RAT runs.
       </action>

From 2cae1a3a555ad5b6ecd5ea2cc44ee2de55e875dd Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 24 Jul 2023 15:20:49 +0200
Subject: [PATCH 065/299] RAT-315: Remove usage of deprecated mvn v2 methods to
 run with newer Maven versions

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cde6f6c6f..f49ca30a5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-315" type="fix" dev="jochenw" due-to="Guillaume Nodet">
+        Fix warnings when using RAT with newer Maven versions as methods from Maven v2 are deprecated. No change in compatibility of RAT itself.
+      </action>
       <action issue="RAT-317" type="fix" dev="pottlinger" due-to="Gary Gregory">
         Change log output level of SCM ignore parser from info to debug in order to produce less log output in RAT runs.
       </action>

From efa752012c0948c67576a70965f109e94b339535 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 24 Jul 2023 16:20:52 +0200
Subject: [PATCH 066/299] RAT-315: Add note about minimum version of Maven
 changed to 3.2.5

---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f49ca30a5..60f4d4076 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -61,7 +61,7 @@ The <action> type attribute can be add,update,fix,remove.
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
       <action issue="RAT-315" type="fix" dev="jochenw" due-to="Guillaume Nodet">
-        Fix warnings when using RAT with newer Maven versions as methods from Maven v2 are deprecated. No change in compatibility of RAT itself.
+        Fix warnings when using RAT with newer Maven versions as methods from Maven v2 are deprecated. Minimum version of required Maven changed to 3.2.5.
       </action>
       <action issue="RAT-317" type="fix" dev="pottlinger" due-to="Gary Gregory">
         Change log output level of SCM ignore parser from info to debug in order to produce less log output in RAT runs.

From d322ab714ec44956e1ef36faaa20d789226af934 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 00:58:19 +0000
Subject: [PATCH 067/299] Bump actions/setup-java from 3.11.0 to 3.12.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.11.0...v3.12.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8b69d61c7..50f5ef0bf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v3.12.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From b9291204380ce457599b37493d2dda60d544ae84 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 26 Jul 2023 10:05:30 +0200
Subject: [PATCH 068/299] Update changes.xml

Fixed tag as per comment
---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e6d62b1f0..208e33359 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,7 +60,7 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
-      <action issue="RAT-251" type="fix" dev="claudenw">
+      <action issue="RAT-251" type="fix" dev="jochenw" due-to="Claude Warren">
          Added SPDX processing for default licenses.
       </action>
       <action issue="RAT-315" type="fix" dev="jochenw" due-to="Guillaume Nodet">

From f5b415acc0dccff94914d0a148e7828a3dab52ec Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 7 Aug 2023 19:26:42 +0200
Subject: [PATCH 069/299] removed multiple regex queries

---
 .../main/java/org/apache/rat/Defaults.java    |  2 +-
 .../rat/analysis/license/SPDXMatcher.java     | 57 ++++++++-----------
 .../rat/analysis/license/SPDXMatcherTest.java |  2 +-
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 2272d174f..a1e9ca495 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -70,7 +70,7 @@ private Defaults() {
                     new DojoLicenseHeader(),
                     new TMF854LicenseHeader(),
                     new CDDL1License(),
-                    SPDXMatcher.Factory.getDefault()));
+                    new SPDXMatcher()));
 
     // all classes in license package implementing ILicenseFamily
     public static final List<String> DEFAULT_LICENSE_FAMILIES = Collections.unmodifiableList(
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
index f6de73ce1..efc365fff 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
@@ -39,53 +39,46 @@
  * 
  * @see https://spdx.dev/ids/
  */
-public class SPDXMatcher extends BaseLicense implements IHeaderMatcher {
+public class SPDXMatcher implements IHeaderMatcher {
 
     /**
      * Creates IHeaderMatcher instances that are a collection of SPDXMatcher instances.  Used in the
      * default matcher construction.
      */
-    public static class Factory {
-        static Map<String, IHeaderMatcher> getDefaultMatchers() {
-            Map<String, IHeaderMatcher> matchers = new HashMap<>();
-            matchers.put("CDDL-1.0", new SPDXMatcher("CDDL-1.0", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1));
+    private static final Map<String, BaseLicense> matchers = new HashMap<>();
+    
+    static {
+            matchers.put("CDDL-1.0", new BaseLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1,""));
             matchers.put("GPL-1.0-only",
-                    new SPDXMatcher("GPL-1.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL1,
-                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1));
+                    new BaseLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL1,
+                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1,""));
             matchers.put("GPL-2.0-only",
-                    new SPDXMatcher("GPL-2.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL2,
-                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2));
+                    new BaseLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL2,
+                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2,""));
             matchers.put("GPL-3.0-only",
-                    new SPDXMatcher("GPL-3.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL3,
-                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_3));
-            matchers.put("MIT", new SPDXMatcher("MIT", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MIT));
-            matchers.put("Apache-2.0", new SPDXMatcher("Apache-2.0", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0));
-            matchers.put("W3C", new SPDXMatcher("W3C", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT));
-            return matchers;
+                    new BaseLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL3,
+                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_3,""));
+            matchers.put("MIT", new BaseLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MIT,""));
+            matchers.put("Apache-2.0", new BaseLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,""));
+            matchers.put("W3C", new BaseLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD,
+                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT,""));
         }
 
-        public static final IHeaderMatcher getDefault() {
-            return new HeaderMatcherMultiplexer(getDefaultMatchers().values());
-        }
-    }
+  
 
     private static Pattern groupSelector = Pattern.compile(".*SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)");
-    private Predicate<String> regex;
-
+  
     /**
      * Constructor.
      * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
      * @param licenseFamilyCategory the RAT license family category for the license.
      * @param licenseFamilyName the RAT license family name for the license.
      */
-    public SPDXMatcher(final String spdxId, final MetaData.Datum licenseFamilyCategory,
-            final MetaData.Datum licenseFamilyName) {
-        super(licenseFamilyCategory, licenseFamilyName, "");
-        this.regex = Pattern.compile(spdxId).asPredicate();
+    public SPDXMatcher() {
+        super();
     }
 
     @Override
@@ -96,9 +89,9 @@ public void reset() {
     public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
         Matcher matcher = groupSelector.matcher(line);
         if (matcher.find()) {
-            String name = matcher.group(1);
-            if (regex.test(name)) {
-                reportOnLicense(subject);
+            BaseLicense data = matchers.get(matcher.group(1));
+        	if (data != null) {
+        		data.reportOnLicense(subject);
                 return true;
             }
         }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
index b3a057a79..fa792142c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
@@ -31,7 +31,7 @@
 
 public class SPDXMatcherTest {
 
-    private IHeaderMatcher defaults = SPDXMatcher.Factory.getDefault();
+    private IHeaderMatcher defaults = new SPDXMatcher();
     private Document testDocument;
 
     @Before

From de2b38fdab0a55ed2cdd2caac059a75c3c6a843b Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 12 Aug 2023 08:38:48 +0200
Subject: [PATCH 070/299] Work in progress -- do not merge

---
 apache-rat-core/pom.xml                       |    3 +
 .../main/java/org/apache/rat/Defaults.java    |  160 ++
 .../rat/analysis/license/CopyrightHeader.java |    2 +-
 .../license/FullTextMatchingLicense.java      |    2 +-
 pom.xml                                       | 1423 +++++++++--------
 5 files changed, 890 insertions(+), 700 deletions(-)

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 60f4de006..eb0e60d06 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -115,5 +115,8 @@
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
     </dependency>
+    <dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-configuration2</artifactId></dependency>
   </dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 2272d174f..a1635e140 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -18,12 +18,26 @@
  */
 package org.apache.rat;
 
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
+import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.generation.GeneratedLicenseNotRequired;
 import org.apache.rat.analysis.generation.JavaDocLicenseNotRequired;
 import org.apache.rat.analysis.license.ApacheSoftwareLicense20;
+import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.analysis.license.CDDL1License;
+import org.apache.rat.analysis.license.CopyrightHeader;
 import org.apache.rat.analysis.license.DojoLicenseHeader;
+import org.apache.rat.analysis.license.FullTextMatchingLicense;
 import org.apache.rat.analysis.license.GPL1License;
 import org.apache.rat.analysis.license.GPL2License;
 import org.apache.rat.analysis.license.GPL3License;
@@ -35,11 +49,17 @@
 import org.apache.rat.analysis.license.W3CLicense;
 import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.api.MetaData.Datum;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.logging.FileHandler;
 
 
 /**
@@ -51,6 +71,146 @@ public class Defaults {
      */
     private Defaults() {
     }
+    
+    private static List<BaseLicense> licenses;
+    private static Map<String,MetaData> licenseFamilies = new HashMap<>();
+    
+    private static Configuration readConfigFiles(String... fileNames) throws ConfigurationException {
+
+        CompositeConfiguration composite = new CompositeConfiguration();
+        FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
+                PropertiesConfiguration.class);
+//        PropertiesBuilderParameters propertyParameters = new Parameters().properties()
+//                .setThrowExceptionOnMissing(true);
+
+        
+        XMLBuilderParameters parameters = new Parameters().xml().setThrowExceptionOnMissing(true);
+                
+      for (String fname : fileNames) {
+      parameters.setFile(new File(fname));
+      composite.addConfiguration(builder.configure(parameters).getConfiguration());
+  }
+        return composite;
+    }
+    
+    private static void readFamilies(Configuration families) {
+        Iterator<String> iter = families.getKeys();
+        while (iter.hasNext()) {
+            MetaData meta = new MetaData();
+            String id=iter.next();
+            Configuration fam = families.subset(id);
+            
+            String category = fam.getString("category").concat("     ").substring(0,5);
+            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, category));
+            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, fam.getString("name")));
+            licenseFamilies.put(id, meta);
+        }
+    }
+    
+    private static void readLicenses(Configuration licenseConfig) {
+        Iterator<String> iter = licenseConfig.getKeys();
+        while (iter.hasNext()) {
+            String id=iter.next();
+            Configuration lic = licenseConfig.subset(id);
+            String familyId = lic.getString("family");
+            MetaData family = licenseFamilies.get(familyId);
+            if (family == null) {
+                throw new IllegalArgumentException( String.format( "license %s uses family %s which is missing", id, familyId));
+            }
+            if (lic.containsKey("fullText"))
+            {
+                licenses.add( new FullTextMatchingLicense(
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
+                        lic.getString("notes", ""),
+                        lic.getString("fullText")));
+            }
+            if (lic.containsKey("copyright")) {
+                licenses.add( new CopyrightHeader(
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
+                        lic.getString("notes", ""),
+                        lic.getString("copyright")));
+            }
+            if (lic.containsKey("text")) {
+                
+                //lic.get
+            }
+            if (lic.containsKey("spdx")) {
+                licenses.add( new SPDXMatcher( lic.getString("spdx"),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME)
+                        ));
+            }
+        }
+    }
+    
+    public static void readConfig(String... fileNames) throws ConfigurationException {
+        Configuration config = readConfigFiles(fileNames);
+        readFamilies( config.subset("family"));
+        readLicenses( config.subset("license"));
+        
+        /*
+         * --- JSON ---
+         *  {
+         *      families : {
+         *          xxx: 'name',
+         *          },
+         *      licenses : [
+         *      {
+         *          family : 'xxx',
+         *          notes: 'notes',
+         *          spdx: 'spdx',
+         *          fulltext: 'text',
+         *          copyright: 'copyright',
+         *          text = ['text','text2','text3'],
+         *          }],
+         *  }
+         * 
+         * --- RDF ---
+         *
+         * family:category [
+         *   name='   '
+         *   ] 
+         *
+         * license:id [
+         *   family family:category
+         *   notes=''
+         *   spdx=''
+         *   fulltext=''
+         *   copyright=''
+         *   text=''
+         *   text=''
+         *   text=''
+         * ]
+         *
+         * --- XML ---
+         * <config>
+         * <family id='fxx' category='xxxxx'>
+         *      name text
+         * </family>
+         * 
+         * <license id="lxx' family='fxx' spdx='spdxtx'>
+         *  <notes>notes text</notes>
+         *  <fulltext>full text</fulltext>
+         *  <copyright>copyright</copyright>
+         *  <text>text</text>
+         *  </license>
+         *  </config>
+         *  
+         *  --- CONFIG ---
+         * family.famid.category=xxxxx
+         * family.famid.name=text
+         * 
+         * 
+         * license.id.family=famid
+         * license.id.notes=
+         * license.id.fullText=
+         * license.id.copyright=
+         * license.id.text=
+         * license.id.spdx=
+         */
+    }
 
     /**
      * The standard list of licenses to include in the reports.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
index 88037d73d..4911841d0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
@@ -59,7 +59,7 @@ protected CopyrightHeader(Datum licenseFamilyCategory, Datum licenseFamilyName,
         super(licenseFamilyCategory, licenseFamilyName, notes);
     }
 
-    protected CopyrightHeader(Datum licenseFamilyCategory, Datum licenseFamilyName, String notes, String copyrightOwner) {
+    public CopyrightHeader(Datum licenseFamilyCategory, Datum licenseFamilyName, String notes, String copyrightOwner) {
         this(licenseFamilyCategory, licenseFamilyName, notes);
         setCopyrightOwner(copyrightOwner);
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index 87b4aa7b6..a34e0a888 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -52,7 +52,7 @@ public class FullTextMatchingLicense extends BaseLicense
     public FullTextMatchingLicense() {
     }
 
-    protected FullTextMatchingLicense(Datum licenseFamilyCategory,
+    public FullTextMatchingLicense(Datum licenseFamilyCategory,
                                       Datum licenseFamilyName,
                                       String notes,
                                       String fullText) {
diff --git a/pom.xml b/pom.xml
index 713cd240e..e007d2d1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,728 +15,755 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>29</version>
-  </parent>
-  <groupId>org.apache.rat</groupId>
-  <artifactId>apache-rat-project</artifactId>
-  <version>0.16-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Apache Creadur Rat</name>
-  <url>https://creadur.apache.org/rat/</url>
-  <description>
-Apache Rat is a release audit tool. It improves accuracy and efficiency when checking
-releases. It is heuristic in nature: making guesses about possible problems. It
-will produce false positives and cannot find every possible issue with a release.
-Its reports require interpretation.
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache</groupId>
+		<artifactId>apache</artifactId>
+		<version>29</version>
+	</parent>
+	<groupId>org.apache.rat</groupId>
+	<artifactId>apache-rat-project</artifactId>
+	<version>0.16-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>Apache Creadur Rat</name>
+	<url>https://creadur.apache.org/rat/</url>
+	<description>
+		Apache Rat is a release audit tool. It improves accuracy and efficiency
+		when checking
+		releases. It is heuristic in nature: making guesses about possible
+		problems. It
+		will produce false positives and cannot find every possible issue with a
+		release.
+		Its reports require interpretation.
 
-In response to demands from project quality tool developers, Rat is available as a
-library suitable for inclusion in tools. This POM describes that library.
-Note that binary compatibility is not guaranteed between 0.x releases.
-
-Apache Rat is developed by the Apache Creadur project, a language and build
-agnostic home for software distribution comprehension and audit tools.
-  </description>
-  <inceptionYear>2006</inceptionYear>
-  <properties>
-    <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>10</project.build.outputTimestamp>
-    <ant.version>1.10.13</ant.version>
-    <mockito.version>4.11.0</mockito.version>
-    <javaVersion>1.8</javaVersion>
-    <maven.compiler.source>${javaVersion}</maven.compiler.source>
-    <maven.compiler.target>${javaVersion}</maven.compiler.target>
-    <!-- This is the version of Maven required to use the Rat Maven Plugin -->
-    <mavenVersion>3.2.5</mavenVersion>
-    <creadur.jira.id>RAT</creadur.jira.id>
-    <!-- maven plugin versions -->
-    <mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
-    <mavenChangesVersion>2.12.1</mavenChangesVersion>
-    <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
-    <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
-    <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
-    <previousRatVersion>0.16</previousRatVersion>
-    <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
-  </properties>
-  <distributionManagement>
-    <site>
-      <id>staging</id>
-      <url>file:bogus</url>
-    </site>
-  </distributionManagement>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-tasks</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <version>1.5.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-collections4</artifactId>
-        <version>4.4</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.11.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.12.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-compress</artifactId>
-        <version>1.23.0</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.2</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>${mockito.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-library</artifactId>
-        <version>2.2</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant</artifactId>
-        <version>${ant.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant-antunit</artifactId>
-        <version>1.4.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant-testutil</artifactId>
-        <version>${ant.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugin-tools</groupId>
-        <artifactId>maven-plugin-annotations</artifactId>
-        <version>${mavenPluginPluginVersion}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <reporting>
-    <!-- N.B. plugins defined here in the <reporting> section ignore what's defined in <pluginManagement>
+		In response to demands from project quality tool developers, Rat is
+		available as a
+		library suitable for inclusion in tools. This POM describes that
+		library.
+		Note that binary compatibility is not guaranteed between 0.x releases.
+		Apache Rat is developed by the Apache Creadur project, a language and
+		build
+		agnostic home for software distribution comprehension and audit tools.
+	</description>
+	<inceptionYear>2006</inceptionYear>
+	<properties>
+		<!-- taken from
+		https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+		<project.build.outputTimestamp>10</project.build.outputTimestamp>
+		<ant.version>1.10.13</ant.version>
+		<mockito.version>4.11.0</mockito.version>
+		<javaVersion>1.8</javaVersion>
+		<maven.compiler.source>${javaVersion}</maven.compiler.source>
+		<maven.compiler.target>${javaVersion}</maven.compiler.target>
+		<!-- This is the version of Maven required to use the Rat Maven Plugin -->
+		<mavenVersion>3.2.5</mavenVersion>
+		<creadur.jira.id>RAT</creadur.jira.id>
+		<!-- maven plugin versions -->
+		<mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
+		<mavenChangesVersion>2.12.1</mavenChangesVersion>
+		<mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
+		<mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
+		<!-- Used to generate download page for RAT during site builds, please
+		adapt versions manually BEFORE doing a release -->
+		<previousRatVersion>0.16</previousRatVersion>
+		<currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
+	</properties>
+	<distributionManagement>
+		<site>
+			<id>staging</id>
+			<url>file:bogus</url>
+		</site>
+	</distributionManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-core</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-tasks</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>1.5.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-collections4</artifactId>
+				<version>4.4</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-configuration2</artifactId>
+				<version>2.9.0</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>2.11.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-lang3</artifactId>
+				<version>3.12.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<version>1.23.0</version>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.13.2</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-core</artifactId>
+				<version>${mockito.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.hamcrest</groupId>
+				<artifactId>hamcrest-library</artifactId>
+				<version>2.2</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant</artifactId>
+				<version>${ant.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-antunit</artifactId>
+				<version>1.4.1</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-testutil</artifactId>
+				<version>${ant.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven.plugin-tools</groupId>
+				<artifactId>maven-plugin-annotations</artifactId>
+				<version>${mavenPluginPluginVersion}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<reporting>
+		<!-- N.B. plugins defined here in the <reporting> section ignore what's
+		defined in <pluginManagement>
          in the <build> section above, so we have to define the versions here. -->
-    <plugins>
-      <!-- org.apache.maven.plugins, alpha order by artifact id -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>${mavenChangesVersion}</version>
-        <configuration>
-          <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
-          <columnNames>Fix Version,Key,Component,Summary,Type,Resolution,Status</columnNames>
-          <!-- Sort cols in natural order when using JQL for JIRA 5.1 -->
-          <sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>
-          <resolutionIds>Fixed</resolutionIds>
-          <statusIds>Resolved,Closed</statusIds>
-          <!-- Don't include sub-task -->
-          <typeIds>Bug,New Feature,Task,Improvement,Wish,Test</typeIds>
-          <!-- For JIRA >= 5.1 -->
-          <useJql>true</useJql>
-          <!-- TODO: what's the meaning of these copy-paste variables? -->
-          <onlyCurrentVersion>${commons.changes.onlyCurrentVersion}</onlyCurrentVersion>
-          <maxEntries>${commons.changes.maxEntries}</maxEntries>
-          <runOnlyAtExecutionRoot>${commons.changes.runOnlyAtExecutionRoot}</runOnlyAtExecutionRoot>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>changes-report</report>
-              <report>jira-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${mavenJavadocPluginVersion}</version>
-        <configuration>
-          <tags>
-            <tag>
-              <name>TODO</name>
-              <placement>X</placement>
-              <head>To do:</head>
-            </tag>
-          </tags>
-          <notimestamp>true</notimestamp>
-          <doclint>none</doclint>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <id>non-aggregate</id>
-            <configuration>
-            </configuration>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-          <reportSet>
-            <id>aggregate</id>
-            <configuration>
-            </configuration>
-            <reports>
-              <report>aggregate</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.3.0</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>jxr-no-fork</report>
-              <report>test-jxr-no-fork</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>${mavenPmdPluginVersion}</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>pmd</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.4.3</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>dependencies</report>
-              <report>team</report>
-              <report>mailing-lists</report>
-              <report>issue-management</report>
-              <report>ci-management</report>
-              <!-- Do not enable the license report;
+		<plugins>
+			<!-- org.apache.maven.plugins, alpha order by artifact id -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changes-plugin</artifactId>
+				<version>${mavenChangesVersion}</version>
+				<configuration>
+					<xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
+					<columnNames>Fix
+						Version,Key,Component,Summary,Type,Resolution,Status</columnNames>
+					<!-- Sort cols in natural order when using JQL for JIRA 5.1 -->
+					<sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>
+					<resolutionIds>Fixed</resolutionIds>
+					<statusIds>Resolved,Closed</statusIds>
+					<!-- Don't include sub-task -->
+					<typeIds>Bug,New Feature,Task,Improvement,Wish,Test</typeIds>
+					<!-- For JIRA >= 5.1 -->
+					<useJql>true</useJql>
+					<!-- TODO: what's the meaning of these copy-paste variables? -->
+					<onlyCurrentVersion>${commons.changes.onlyCurrentVersion}</onlyCurrentVersion>
+					<maxEntries>${commons.changes.maxEntries}</maxEntries>
+					<runOnlyAtExecutionRoot>
+						${commons.changes.runOnlyAtExecutionRoot}</runOnlyAtExecutionRoot>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>changes-report</report>
+							<report>jira-report</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>${mavenJavadocPluginVersion}</version>
+				<configuration>
+					<tags>
+						<tag>
+							<name>TODO</name>
+							<placement>X</placement>
+							<head>To do:</head>
+						</tag>
+					</tags>
+					<notimestamp>true</notimestamp>
+					<doclint>none</doclint>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<id>non-aggregate</id>
+						<configuration>
+						</configuration>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>aggregate</id>
+						<configuration>
+						</configuration>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>3.3.0</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>jxr-no-fork</report>
+							<report>test-jxr-no-fork</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>${mavenPmdPluginVersion}</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>pmd</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>3.4.3</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>dependencies</report>
+							<report>team</report>
+							<report>mailing-lists</report>
+							<report>issue-management</report>
+							<report>ci-management</report>
+							<!-- Do not enable the license report;
                    license links must only point to
                    http://www.apache.org/licenses/
               <report>license</report>
               -->
-              <report>scm</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-  <build>
-    <defaultGoal>clean install</defaultGoal>
-    <pluginManagement>
-      <!--
+							<report>scm</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
+	<build>
+		<defaultGoal>clean install</defaultGoal>
+		<pluginManagement>
+			<!--
         This section is typically used to configure the versions of
         plugins that we use. Note, that we are inheriting from the
         parent POM, so we only have to configure version numbers,
         if ours is different.
       -->
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>3.1.0</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.ant</groupId>
-              <artifactId>ant</artifactId>
-              <version>${ant.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.11.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${mavenJavadocPluginVersion}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.5.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pmd-plugin</artifactId>
-          <version>${mavenPmdPluginVersion}</version>
-          <configuration>
-            <targetJdk>${javaVersion}</targetJdk>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>${mavenPluginPluginVersion}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.12.1</version>
-          <configuration>
-            <relativizeDecorationLinks>false</relativizeDecorationLinks>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <!-- Do not use property values here as this causes problems during release -->
-          <version>0.15</version>
-          <configuration>
-            <excludes>
-              <exclude>.asf.yaml</exclude>
-              <exclude>BUILD.txt</exclude>
-              <!-- rat:check does not seem to use exclusions from modules -->
-              <exclude>apache-rat/README*.txt</exclude>
-              <exclude>apache-rat-core/src/test/resources/**</exclude>
-              <exclude>apache-rat*/target/**</exclude>
-              <exclude>apache-rat-plugin/src/test/resources/**</exclude>
-              <exclude>apache-rat-plugin/src/it/**</exclude>
-              <exclude>apache-rat-tasks/src/test/resources/**</exclude>
-              <exclude>**/iso-8859-1.html</exclude>
-              <exclude>**/velocity.log</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>3.0.0</version>
-          <configuration>
-            <!-- Only prompt once for the release version -->
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-            <mavenExecutorId>forked-path</mavenExecutorId>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.1.0</version>
-          <configuration>
-            <forkCount>1</forkCount>
-            <argLine>-Dfile.encoding=ISO-8859-1</argLine>
-          </configuration>
-        </plugin>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.rat</groupId>
-                    <artifactId>
-        							apache-rat-plugin
-        						</artifactId>
-                    <versionRange>[0.15,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>pre-site</phase>
-            <id>copy-site-resources</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false"/>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.3.0</version>
-        <executions>
-          <execution>
-            <!-- This checks the bytecode version of the dependencies transitively -->
-            <id>enforce-bytecode-version</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <enforceBytecodeVersion>
-                  <maxJdkVersion>${javaVersion}</maxJdkVersion>
-                </enforceBytecodeVersion>
-                <requireMavenVersion>
-                  <version>3.0.5</version>
-                </requireMavenVersion>
-              </rules>
-              <fail>true</fail>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.7.0</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.23</version>
-        <executions>
-          <execution>
-            <!-- This checks the source code of our project -->
-            <!--
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>3.1.0</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.ant</groupId>
+							<artifactId>ant</artifactId>
+							<version>${ant.version}</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.11.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>${mavenJavadocPluginVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>3.6.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-invoker-plugin</artifactId>
+					<version>3.5.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-pmd-plugin</artifactId>
+					<version>${mavenPmdPluginVersion}</version>
+					<configuration>
+						<targetJdk>${javaVersion}</targetJdk>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-plugin-plugin</artifactId>
+					<version>${mavenPluginPluginVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.12.1</version>
+					<configuration>
+						<relativizeDecorationLinks>false</relativizeDecorationLinks>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.rat</groupId>
+					<artifactId>apache-rat-plugin</artifactId>
+					<!-- Do not use property values here as this causes problems
+					during release -->
+					<version>0.15</version>
+					<configuration>
+						<excludes>
+							<exclude>.asf.yaml</exclude>
+							<exclude>BUILD.txt</exclude>
+							<!-- rat:check does not seem to use exclusions from
+							modules -->
+							<exclude>apache-rat/README*.txt</exclude>
+							<exclude>apache-rat-core/src/test/resources/**</exclude>
+							<exclude>apache-rat*/target/**</exclude>
+							<exclude>apache-rat-plugin/src/test/resources/**</exclude>
+							<exclude>apache-rat-plugin/src/it/**</exclude>
+							<exclude>apache-rat-tasks/src/test/resources/**</exclude>
+							<exclude>**/iso-8859-1.html</exclude>
+							<exclude>**/velocity.log</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-remote-resources-plugin</artifactId>
+					<version>3.1.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>3.0.0</version>
+					<configuration>
+						<!-- Only prompt once for the release version -->
+						<autoVersionSubmodules>true</autoVersionSubmodules>
+						<mavenExecutorId>forked-path</mavenExecutorId>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.3.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>3.1.0</version>
+					<configuration>
+						<forkCount>1</forkCount>
+						<argLine>-Dfile.encoding=ISO-8859-1</argLine>
+					</configuration>
+				</plugin>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.rat</groupId>
+										<artifactId>
+											apache-rat-plugin
+										</artifactId>
+										<versionRange>[0.15,)</versionRange>
+										<goals>
+											<goal>check</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>pre-site</phase>
+						<id>copy-site-resources</id>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<copy file="RELEASE_NOTES.txt"
+									todir="${project.build.directory}/site/"
+									failonerror="false" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<!-- This checks the bytecode version of the
+						dependencies transitively -->
+						<id>enforce-bytecode-version</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<enforceBytecodeVersion>
+									<maxJdkVersion>${javaVersion}</maxJdkVersion>
+								</enforceBytecodeVersion>
+								<requireMavenVersion>
+									<version>3.0.5</version>
+								</requireMavenVersion>
+							</rules>
+							<fail>true</fail>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>extra-enforcer-rules</artifactId>
+						<version>1.7.0</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<version>1.23</version>
+				<executions>
+					<execution>
+						<!-- This checks the source code of our project -->
+						<!--
               Note that this cannot use our ${javaVersion} property, so it must
               be changed manually when we decide to move to a higher version of
               Java
             -->
-            <id>check-java-1.8-compat</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <signature>
-                <groupId>org.codehaus.mojo.signature</groupId>
-                <artifactId>java18</artifactId>
-                <version>1.0</version>
-              </signature>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh</artifactId>
-        <!-- Last version that is compatible with Maven 2 -->
-        <version>3.5.3</version>
-      </extension>
-    </extensions>
-  </build>
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.apache.org/jira/browse/RAT</url>
-  </issueManagement>
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>https://ci-builds.apache.org/job/Creadur/job/Creadur-Rat/</url>
-  </ciManagement>
-  <mailingLists>
-    <mailingList>
-      <name>Rat Development (Apache Creadur project)</name>
-      <subscribe>dev-subscribe@creadur.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@creadur.apache.org</unsubscribe>
-      <post>dev@creadur.apache.org</post>
-      <archive>https://mail-archives.apache.org/mod_mbox/creadur-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Rat Commits (Apache Creadur project)</name>
-      <subscribe>commits-subscribe@creadur.apache.org</subscribe>
-      <unsubscribe>commits-unsubscribe@creadur.apache.org</unsubscribe>
-      <archive>https://mail-archives.apache.org/mod_mbox/creadur-commits/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>bodewig</id>
-      <name>Stefan Bodewig</name>
-      <email>bodewig@apache.org</email>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin@apache.org</email>
-    </developer>
-    <developer>
-      <id>jochen</id>
-      <name>Jochen Wiedmann</name>
-      <email>jochen@apache.org</email>
-    </developer>
-    <developer>
-      <id>gmcdonald</id>
-      <name>Gavin</name>
-      <email>gmcdonald@apache.org</email>
-    </developer>
-    <developer>
-      <id>brianf</id>
-      <name>Brian Fox</name>
-      <email>brianf@apache.org</email>
-    </developer>
-    <developer>
-      <id>dennisl</id>
-      <name>Dennis Lundberg</name>
-      <email>dennisl@apache.org</email>
-    </developer>
-    <developer>
-      <id>rgardler</id>
-      <name>Ross Gardler</name>
-      <email>rgardler@apache.org</email>
-    </developer>
-    <developer>
-      <id>crossley</id>
-      <name>David Crossley</name>
-      <email>crossley@apache.org</email>
-    </developer>
-    <developer>
-      <id>dblevins</id>
-      <name>David Blevins</name>
-      <email>dblevins@apache.org</email>
-    </developer>
-    <developer>
-      <id>pottlinger</id>
-      <name>Philipp Ottlinger</name>
-      <email>pottlinger@apache.org</email>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Jukka Zitting</name>
-      <email>jukka@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Todd Volkert</name>
-      <email>tvolkert+apache@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Henri Yandell</name>
-      <email>bayard@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Guillaume Nodet</name>
-      <email>gnodet@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Karl Pauls</name>
-      <email>pauls@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Matthieu Riou</name>
-      <email>mriou@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Garrett Rooney</name>
-      <email>rooneg@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Paul Merlin</name>
-      <email>paulmerlin@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Claude Warren</name>
-      <email>claude@apache.org</email>
-    </contributor>
-  </contributors>
-  <scm>
-    <connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>
-    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</developerConnection>
-    <url>https://gitbox.apache.org/repos/asf?p=creadur-rat.git</url>
-    <tag>HEAD</tag>
-  </scm>
-  <modules>
-    <module>apache-rat-api</module>
-    <module>apache-rat-core</module>
-    <module>apache-rat-plugin</module>
-    <module>apache-rat-tasks</module>
-    <module>apache-rat</module>
-  </modules>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-      <comments>An OSI approved open source license.</comments>
-    </license>
-  </licenses>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>https://www.apache.org</url>
-  </organization>
-  <profiles>
-    <profile>
-      <id>maven.compiler.release</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <properties>
-        <!--
+						<id>check-java-1.8-compat</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<configuration>
+							<signature>
+								<groupId>org.codehaus.mojo.signature</groupId>
+								<artifactId>java18</artifactId>
+								<version>1.0</version>
+							</signature>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-ssh</artifactId>
+				<!-- Last version that is compatible with Maven 2 -->
+				<version>3.5.3</version>
+			</extension>
+		</extensions>
+	</build>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>https://issues.apache.org/jira/browse/RAT</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Jenkins</system>
+		<url>https://ci-builds.apache.org/job/Creadur/job/Creadur-Rat/</url>
+	</ciManagement>
+	<mailingLists>
+		<mailingList>
+			<name>Rat Development (Apache Creadur project)</name>
+			<subscribe>dev-subscribe@creadur.apache.org</subscribe>
+			<unsubscribe>dev-unsubscribe@creadur.apache.org</unsubscribe>
+			<post>dev@creadur.apache.org</post>
+			<archive>https://mail-archives.apache.org/mod_mbox/creadur-dev/</archive>
+		</mailingList>
+		<mailingList>
+			<name>Rat Commits (Apache Creadur project)</name>
+			<subscribe>commits-subscribe@creadur.apache.org</subscribe>
+			<unsubscribe>commits-unsubscribe@creadur.apache.org</unsubscribe>
+			<archive>https://mail-archives.apache.org/mod_mbox/creadur-commits/</archive>
+		</mailingList>
+	</mailingLists>
+	<developers>
+		<developer>
+			<id>bodewig</id>
+			<name>Stefan Bodewig</name>
+			<email>bodewig@apache.org</email>
+		</developer>
+		<developer>
+			<id>rdonkin</id>
+			<name>Robert Burrell Donkin</name>
+			<email>rdonkin@apache.org</email>
+		</developer>
+		<developer>
+			<id>jochen</id>
+			<name>Jochen Wiedmann</name>
+			<email>jochen@apache.org</email>
+		</developer>
+		<developer>
+			<id>gmcdonald</id>
+			<name>Gavin</name>
+			<email>gmcdonald@apache.org</email>
+		</developer>
+		<developer>
+			<id>brianf</id>
+			<name>Brian Fox</name>
+			<email>brianf@apache.org</email>
+		</developer>
+		<developer>
+			<id>dennisl</id>
+			<name>Dennis Lundberg</name>
+			<email>dennisl@apache.org</email>
+		</developer>
+		<developer>
+			<id>rgardler</id>
+			<name>Ross Gardler</name>
+			<email>rgardler@apache.org</email>
+		</developer>
+		<developer>
+			<id>crossley</id>
+			<name>David Crossley</name>
+			<email>crossley@apache.org</email>
+		</developer>
+		<developer>
+			<id>dblevins</id>
+			<name>David Blevins</name>
+			<email>dblevins@apache.org</email>
+		</developer>
+		<developer>
+			<id>pottlinger</id>
+			<name>Philipp Ottlinger</name>
+			<email>pottlinger@apache.org</email>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Jukka Zitting</name>
+			<email>jukka@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Todd Volkert</name>
+			<email>tvolkert+apache@gmail.com</email>
+		</contributor>
+		<contributor>
+			<name>Henri Yandell</name>
+			<email>bayard@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Guillaume Nodet</name>
+			<email>gnodet@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Karl Pauls</name>
+			<email>pauls@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Matthieu Riou</name>
+			<email>mriou@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Garrett Rooney</name>
+			<email>rooneg@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Paul Merlin</name>
+			<email>paulmerlin@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Claude Warren</name>
+			<email>claude@apache.org</email>
+		</contributor>
+	</contributors>
+	<scm>
+		<connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>
+		<developerConnection>
+			scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</developerConnection>
+		<url>https://gitbox.apache.org/repos/asf?p=creadur-rat.git</url>
+		<tag>HEAD</tag>
+	</scm>
+	<modules>
+		<module>apache-rat-api</module>
+		<module>apache-rat-core</module>
+		<module>apache-rat-plugin</module>
+		<module>apache-rat-tasks</module>
+		<module>apache-rat</module>
+	</modules>
+	<licenses>
+		<license>
+			<name>Apache License, Version 2</name>
+			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>An OSI approved open source license.</comments>
+		</license>
+	</licenses>
+	<organization>
+		<name>Apache Software Foundation</name>
+		<url>https://www.apache.org</url>
+	</organization>
+	<profiles>
+		<profile>
+			<id>maven.compiler.release</id>
+			<activation>
+				<jdk>[9,)</jdk>
+			</activation>
+			<properties>
+				<!--
           Note that this cannot use our ${javaVersion} property, so it must
           be changed manually when we decide to move to a higher version of
           Java
         -->
-        <maven.compiler.release>8</maven.compiler.release>
-      </properties>
-    </profile>
-    <profile>
-      <id>apache-release</id>
-      <build>
-        <plugins>
-          <!-- Skip the source-release artifact here; we create it under the CLI module -->
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>source-release-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <skipAssembly>true</skipAssembly>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <!--
+				<maven.compiler.release>8</maven.compiler.release>
+			</properties>
+		</profile>
+		<profile>
+			<id>apache-release</id>
+			<build>
+				<plugins>
+					<!-- Skip the source-release artifact here; we create it
+					under the CLI module -->
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>source-release-assembly</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<skipAssembly>true</skipAssembly>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<!--
           Generate release notes in top-level directory from src/changes/changes.xml
           Usage:
           mvn changes:announcement-generate -Prelease-notes [-Dchanges.version=nnn]
 
-          Defining changes.version allows one to create the RN without first removing the SNAPSHOT suffix.
+          Defining changes.version allows one to create the RN without first removing the
+			SNAPSHOT suffix.
 
           Requires file src/changes/release-notes.vm.
        -->
-      <id>release-notes</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-changes-plugin</artifactId>
-            <version>${mavenChangesVersion}</version>
-            <configuration>
-              <template>release-notes.vm</template>
-              <templateDirectory>src/changes</templateDirectory>
-              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-              <announcementDirectory>.</announcementDirectory>
-              <announcementFile>RELEASE-NOTES.txt</announcementFile>
-              <announceParameters>
-                <releaseVersion>${mavenChangesVersion}</releaseVersion>
-              </announceParameters>
-            </configuration>
-            <executions>
-              <execution>
-                <id>create-release-notes</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>announcement-generate</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <!-- in order to test new releases this reference can be activated locally-->
-  <pluginRepositories>
-    <pluginRepository>
-      <id>staged-releases-rat-015</id>
-      <url>https://repository.apache.org/content/repositories/orgapachecreadur-1008/</url>
-    </pluginRepository>
-  </pluginRepositories>
+			<id>release-notes</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-changes-plugin</artifactId>
+						<version>${mavenChangesVersion}</version>
+						<configuration>
+							<template>release-notes.vm</template>
+							<templateDirectory>src/changes</templateDirectory>
+							<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+							<announcementDirectory>.</announcementDirectory>
+							<announcementFile>RELEASE-NOTES.txt</announcementFile>
+							<announceParameters>
+								<releaseVersion>${mavenChangesVersion}</releaseVersion>
+							</announceParameters>
+						</configuration>
+						<executions>
+							<execution>
+								<id>create-release-notes</id>
+								<phase>generate-resources</phase>
+								<goals>
+									<goal>announcement-generate</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	<!-- in order to test new releases this reference can be activated
+	locally-->
+	<pluginRepositories>
+		<pluginRepository>
+			<id>staged-releases-rat-015</id>
+			<url>
+				https://repository.apache.org/content/repositories/orgapachecreadur-1008/</url>
+		</pluginRepository>
+	</pluginRepositories>
 </project>

From f5a35302bc22c01dc2317b69a451d63597eb35ce Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Mon, 14 Aug 2023 21:37:26 +0200
Subject: [PATCH 071/299] Changes to read/parse configuration file.

---
 .../main/java/org/apache/rat/Defaults.java    | 141 +-----------------
 .../license/SimplePatternBasedLicense.java    |   5 +-
 .../configuration/ConfigurationReader.java    | 139 +++++++++++++++++
 .../org/apache/rat/configuration/Format.java  |  26 ++++
 .../org/apache/rat/configuration/Reader.java  |  23 +++
 .../org/apache/rat/configuration/Readers.java |  81 ++++++++++
 .../resources/org/apache/rat/default.config   |  83 +++++++++++
 7 files changed, 360 insertions(+), 138 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
 create mode 100644 apache-rat-core/src/main/resources/org/apache/rat/default.config

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index a1635e140..be76eea11 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -50,10 +50,13 @@
 import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.configuration.Readers;
+import org.apache.rat.configuration.Reader;
 
 import java.io.File;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -75,142 +78,12 @@ private Defaults() {
     private static List<BaseLicense> licenses;
     private static Map<String,MetaData> licenseFamilies = new HashMap<>();
     
-    private static Configuration readConfigFiles(String... fileNames) throws ConfigurationException {
-
-        CompositeConfiguration composite = new CompositeConfiguration();
-        FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
-                PropertiesConfiguration.class);
-//        PropertiesBuilderParameters propertyParameters = new Parameters().properties()
-//                .setThrowExceptionOnMissing(true);
-
-        
-        XMLBuilderParameters parameters = new Parameters().xml().setThrowExceptionOnMissing(true);
-                
-      for (String fname : fileNames) {
-      parameters.setFile(new File(fname));
-      composite.addConfiguration(builder.configure(parameters).getConfiguration());
-  }
-        return composite;
-    }
-    
-    private static void readFamilies(Configuration families) {
-        Iterator<String> iter = families.getKeys();
-        while (iter.hasNext()) {
-            MetaData meta = new MetaData();
-            String id=iter.next();
-            Configuration fam = families.subset(id);
-            
-            String category = fam.getString("category").concat("     ").substring(0,5);
-            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, category));
-            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, fam.getString("name")));
-            licenseFamilies.put(id, meta);
+    public static void readConfigFiles(String... fileNames){
+        for (String fileName : fileNames) {
+            Reader reader = Readers.get(fileName);
+            licenseFamilies.putAll(reader.readFamilies());
         }
     }
-    
-    private static void readLicenses(Configuration licenseConfig) {
-        Iterator<String> iter = licenseConfig.getKeys();
-        while (iter.hasNext()) {
-            String id=iter.next();
-            Configuration lic = licenseConfig.subset(id);
-            String familyId = lic.getString("family");
-            MetaData family = licenseFamilies.get(familyId);
-            if (family == null) {
-                throw new IllegalArgumentException( String.format( "license %s uses family %s which is missing", id, familyId));
-            }
-            if (lic.containsKey("fullText"))
-            {
-                licenses.add( new FullTextMatchingLicense(
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        lic.getString("notes", ""),
-                        lic.getString("fullText")));
-            }
-            if (lic.containsKey("copyright")) {
-                licenses.add( new CopyrightHeader(
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        lic.getString("notes", ""),
-                        lic.getString("copyright")));
-            }
-            if (lic.containsKey("text")) {
-                
-                //lic.get
-            }
-            if (lic.containsKey("spdx")) {
-                licenses.add( new SPDXMatcher( lic.getString("spdx"),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME)
-                        ));
-            }
-        }
-    }
-    
-    public static void readConfig(String... fileNames) throws ConfigurationException {
-        Configuration config = readConfigFiles(fileNames);
-        readFamilies( config.subset("family"));
-        readLicenses( config.subset("license"));
-        
-        /*
-         * --- JSON ---
-         *  {
-         *      families : {
-         *          xxx: 'name',
-         *          },
-         *      licenses : [
-         *      {
-         *          family : 'xxx',
-         *          notes: 'notes',
-         *          spdx: 'spdx',
-         *          fulltext: 'text',
-         *          copyright: 'copyright',
-         *          text = ['text','text2','text3'],
-         *          }],
-         *  }
-         * 
-         * --- RDF ---
-         *
-         * family:category [
-         *   name='   '
-         *   ] 
-         *
-         * license:id [
-         *   family family:category
-         *   notes=''
-         *   spdx=''
-         *   fulltext=''
-         *   copyright=''
-         *   text=''
-         *   text=''
-         *   text=''
-         * ]
-         *
-         * --- XML ---
-         * <config>
-         * <family id='fxx' category='xxxxx'>
-         *      name text
-         * </family>
-         * 
-         * <license id="lxx' family='fxx' spdx='spdxtx'>
-         *  <notes>notes text</notes>
-         *  <fulltext>full text</fulltext>
-         *  <copyright>copyright</copyright>
-         *  <text>text</text>
-         *  </license>
-         *  </config>
-         *  
-         *  --- CONFIG ---
-         * family.famid.category=xxxxx
-         * family.famid.name=text
-         * 
-         * 
-         * license.id.family=famid
-         * license.id.notes=
-         * license.id.fullText=
-         * license.id.copyright=
-         * license.id.text=
-         * license.id.spdx=
-         */
-    }
 
     /**
      * The standard list of licenses to include in the reports.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
index 6844d7a1d..110723e3f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -30,10 +30,7 @@
 public class SimplePatternBasedLicense extends BaseLicense implements IHeaderMatcher {
     private String[] patterns;
 
-    public SimplePatternBasedLicense() {
-    }
-
-    protected SimplePatternBasedLicense(Datum pLicenseFamilyCategory, Datum pLicenseFamilyName,
+    public SimplePatternBasedLicense(Datum pLicenseFamilyCategory, Datum pLicenseFamilyName,
             String pNotes, String[] pPatterns) {
         super(pLicenseFamilyCategory, pLicenseFamilyName, pNotes);
         setPatterns(pPatterns);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
new file mode 100644
index 000000000..11eeca393
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
@@ -0,0 +1,139 @@
+package org.apache.rat.configuration;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.List;
+import java.io.File;
+import java.util.ArrayList;
+
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.analysis.license.CopyrightHeader;
+import org.apache.rat.analysis.license.FullTextMatchingLicense;
+import org.apache.rat.analysis.license.SPDXMatcher;
+import org.apache.rat.analysis.license.SimplePatternBasedLicense;
+import org.apache.rat.api.MetaData;
+
+/*
+ *          *  
+         *  --- CONFIG ---
+         * family.category.name=text
+         * 
+         * license.id.family=famid
+         * license.id.notes=
+         * license.id.fullText=
+         * license.id.copyright=
+         * license.id.text=
+         * license.id.spdx=
+ */
+public class ConfigurationReader implements Reader {
+    private final CompositeConfiguration configuration;
+
+    public ConfigurationReader() {
+        configuration = new CompositeConfiguration();
+    }
+    
+    public void add(String fileName) {
+        try {
+            read( fileName );
+        } catch (ConfigurationException e) {
+            throw new RuntimeException(e);
+        }
+        
+    }
+    
+    public void read(String... fileNames) throws ConfigurationException {
+        FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
+                PropertiesConfiguration.class);
+        PropertiesBuilderParameters parameters = new Parameters().properties()
+                .setThrowExceptionOnMissing(true);
+
+                
+      for (String fname : fileNames) {
+          parameters.setFile(new File(fname));
+          add(builder.configure(parameters).getConfiguration());
+      }
+    }
+    
+    public void add(Configuration cfg) {
+        configuration.addConfiguration(cfg);
+    }
+    
+    @Override
+    public Map<String, MetaData> readFamilies() {
+        Map<String, MetaData> licenseFamilies = new HashMap<>();
+        Configuration families = configuration.subset("family");
+        Iterator<String> iter = families.getKeys();
+        while (iter.hasNext()) {
+            MetaData meta = new MetaData();
+            String cat = iter.next();
+            String category = cat.concat("     ").substring(0, 5);
+            Configuration fam = families.subset(cat);
+            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, category));
+            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, fam.getString("name")));
+            licenseFamilies.put(cat.trim(), meta);
+        }
+        return licenseFamilies;
+    }
+
+    @Override
+    public Collection<BaseLicense> readLicenses() {
+        Map<String,MetaData> families = readFamilies();
+        List<BaseLicense> licenses = new ArrayList<BaseLicense>();
+        Configuration licenseConfig = configuration.subset("license");
+        Iterator<String> iter = licenseConfig.getKeys();
+        while (iter.hasNext()) {
+            String id=iter.next();
+            Configuration lic = licenseConfig.subset(id);
+            String familyId = lic.getString("family").trim();
+            MetaData family = families.get(familyId);
+            if (family == null) {
+                throw new IllegalArgumentException( String.format( "license %s uses family %s which is missing", id, familyId));
+            }
+            if (lic.containsKey("fullText"))
+            {
+                licenses.add( new FullTextMatchingLicense(
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
+                        lic.getString("notes", ""),
+                        lic.getString("fullText")));
+            }
+            if (lic.containsKey("copyright")) {
+                licenses.add( new CopyrightHeader(
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
+                        lic.getString("notes", ""),
+                        lic.getString("copyright")));
+            }
+            if (lic.containsKey("text")) {
+                Configuration text = lic.subset("text");
+                List<String> texts = new ArrayList<>();
+                Iterator<String> textIter = text.getKeys();
+                while (textIter.hasNext()) {
+                    texts.add(text.getString(textIter.next()));
+                }
+                licenses.add( new SimplePatternBasedLicense(
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
+                        lic.getString("notes", ""),
+                        texts.toArray( new String[texts.size()])));
+                //lic.get
+            }
+            if (lic.containsKey("spdx")) {
+                licenses.add( new SPDXMatcher( lic.getString("spdx"),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME)
+                        ));
+            }
+        }
+        return licenses;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
new file mode 100644
index 000000000..734326613
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -0,0 +1,26 @@
+package org.apache.rat.configuration;
+
+import java.util.Arrays;
+
+public enum Format {
+    CONFIG( "cfg", "config");
+    
+    
+    String[] suffix;
+    
+    Format(String... suffix) {
+        this.suffix = suffix;
+    }
+    
+    public static Format fromName(String name) {
+        Format.valueOf("foo");
+        String[] parts = name.split("\\.");
+        String suffix = parts[parts.length-1];
+        for (Format f: Format.values()) {
+            if (Arrays.stream(f.suffix).allMatch( suffix::equals )) {
+                return f;
+            }
+        }
+        throw new IllegalArgumentException(String.format("No such suffix: %s", suffix));
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
new file mode 100644
index 000000000..1e2ae2dc4
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
@@ -0,0 +1,23 @@
+package org.apache.rat.configuration;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.api.MetaData;
+
+public interface Reader {
+    void add(String name);
+
+    /**
+     * Reads the configuration and extracts the Family metadata indexed by category id.
+     * @return Map of Category id to associated Metadata.
+     */
+    Map<String,MetaData> readFamilies();
+    
+    /**
+     * Reads the configuration and extracts the BaseLicenses.
+     * @return A collection of Base licenses.
+     */
+    Collection<BaseLicense> readLicenses();
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
new file mode 100644
index 000000000..29ab85370
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -0,0 +1,81 @@
+package org.apache.rat.configuration;
+
+import java.util.Map;
+import java.util.HashMap;
+
+public class Readers {
+    
+    /*
+     * --- JSON ---
+     *  {
+     *      families : {
+     *          xxx: 'name',
+     *          },
+     *      licenses : [
+     *      {
+     *          family : 'xxx',
+     *          notes: 'notes',
+     *          spdx: 'spdx',
+     *          fulltext: 'text',
+     *          copyright: 'copyright',
+     *          text = ['text','text2','text3'],
+     *          }],
+     *  }
+     * 
+     * --- RDF ---
+     *
+     * family:category [
+     *   name='   '
+     *   ] 
+     *
+     * license:id [
+     *   family family:category
+     *   notes=''
+     *   spdx=''
+     *   fulltext=''
+     *   copyright=''
+     *   text=''
+     *   text=''
+     *   text=''
+     * ]
+     *
+     * --- XML ---
+     * <config>
+     * <family id='fxx' category='xxxxx'>
+     *      name text
+     * </family>
+     * 
+     * <license id="lxx' family='fxx' spdx='spdxtx'>
+     *  <notes>notes text</notes>
+     *  <fulltext>full text</fulltext>
+     *  <copyright>copyright</copyright>
+     *  <text>text</text>
+     *  </license>
+     *  </config>
+     *  
+     *  --- CONFIG ---
+     * family.category.name=text
+     * 
+     * license.id.family=famid
+     * license.id.notes=
+     * license.id.fullText=
+     * license.id.copyright=
+     * license.id.text=
+     * license.id.spdx=
+     */
+
+    private static Map<Format,Reader> readers;
+
+    static {
+        readers = new HashMap<>();
+        readers.put( Format.CONFIG, new ConfigurationReader());
+    }
+
+    public static Reader get(String fileName) {
+        return readers.get(Format.fromName(fileName));
+    }
+    
+    private Readers() {
+        // do not instantiate
+    }
+}
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.config b/apache-rat-core/src/main/resources/org/apache/rat/default.config
new file mode 100644
index 000000000..3e373a02c
--- /dev/null
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.config
@@ -0,0 +1,83 @@
+family.GEN  ";
+family.?????";
+family.AL=Apache License Version 2.0
+family.OASIS=OASIS Open License
+family.W3CD=W3C Document Copyright
+family.W3C=W3C Software Copyright
+family.GPL1=GNU General Public License, version 1
+family.GPL2=GNU General Public License, version 2
+family.GPL3=GNU General Public License, version 3
+family.MIT=The MIT License
+family.CDDL1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
+family.BSD_m=Modified BSD License
+
+/*
+   * license.id.family=famid
+         * license.id.notes=
+         * license.id.fullText=
+         * license.id.copyright=
+         * license.id.text=
+         * license.id.spdx=
+         */
+license.ASL2.family=AL
+license.ASL2.text.1=Licensed under the Apache License, Version 2.0 (the "License")
+license.ASL2.text.1=Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
+license.ASL2.text.http=http://www.apache.org/licenses/LICENSE-2.0
+license.ASL2.text.https=https://www.apache.org/licenses/LICENSE-2.0
+license.ASL2.text.html=http://www.apache.org/licenses/LICENSE-2.0.html
+license.ASL2.text.htmls=https://www.apache.org/licenses/LICENSE-2.0.html
+license.ASL2.text.txt=http://www.apache.org/licenses/LICENSE-2.0.txt
+license.ASL2.text.txts=https://www.apache.org/licenses/LICENSE-2.0.txt
+license.ASL2.spdx=Apache-2.0
+
+license.ASL_Applied.family=AL
+license.ASL_Applied.copyright=UNKNOWN
+license.ASL_Applied.fullText=Licensed under the Apache License, Version 2.0 (the "License")\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an "AS IS" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n
+
+license.CDDL1.family=CDDL1
+license.CDDL1.fullText=The contents of this file are subject to the terms of the Common Development\nand Distribution License("CDDL") (the "License"). You may not use this file\nexcept in compliance with the License.\n\n
+license.CDDL1.spdx=CDDL-1.0
+
+license.CDDL1_ILLUMOS.family=CDDL1
+license.CDDL1_ILLUMOS.fullText=The contents of this file are subject to the terms of the\nCommon Development and Distribution License (the "License")\nYou may not use this file except in compliance with the License.\n
+
+license.DOJO.family=BSD_m
+license.DOJO.notes=Dual license AFL/BSD
+license.DOJO.text.dojo=http://dojotoolkit.org/community/licensing.shtml
+
+license.GPL1.family=GPL1
+license.GPL1.fullText=This program is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 1, or (at your option)\n any later version.
+license.GPL1.spdx=GPL-1.0-only
+
+license.GPL2.family=GPL2
+license.GPL2.fullText=This program is free software; you can redistribute it and/or\n modify it under the terms of the GNU General Public License\n as published by the Free Software Foundation; either version 2\n of the License, or (at your option) any later version.
+license.GPL2.spdx=GPL-2.0-only
+
+license.GPL3.family=GLP3
+license.GPL3.fullText=This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.
+license.GPL3.spdx=GPL-3.0-only
+
+license.MIT.family=MIT
+license.MIT.text.first=Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+license.MIT.text.middle=The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+license.MIT.text.asis=THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+license.MIT.spdx=MIT
+
+license.OASIS.family=OASIS
+license.OASIS.notes=No modifications allowed
+license.OASIS.copyright=.*Copyright\s.*OASIS Open.*
+license.OASIS.fullText=This document and translations of it may be copied and furnished to others and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared copied published and distributed
+
+license.TMF.family=BSD_m
+license.TMF.notes=BSD
+license.TMF.text.copy=TMF854 Version 1.0 - Copyright TeleManagement Forum
+
+license.W3C.family=W3C
+license.W3C.spdx=W3C
+license.W3C.notes=Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.
+license.W3C.text.copy=http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+license.W3CD.family=W3CD
+license.W3CD.notes=Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";
+license.W3CD.text.copy=http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+            
\ No newline at end of file

From 36c3b0b4948f666b516c4bcd334aad240c5c5e0a Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Tue, 15 Aug 2023 19:00:33 +0200
Subject: [PATCH 072/299] added configreader and tests

---
 apache-rat-core/pom.xml                       | 241 ++++++++++--------
 .../rat/analysis/license/SPDXMatcher.java     |  16 +-
 .../configuration/ConfigurationReader.java    |  68 +++--
 .../org/apache/rat/configuration/Format.java  |  18 ++
 .../org/apache/rat/configuration/Reader.java  |  18 ++
 .../org/apache/rat/configuration/Readers.java |  18 ++
 .../resources/org/apache/rat/default.config   |  39 ++-
 .../ConfigurationReaderTest.java              |  55 ++++
 pom.xml                                       |  73 ++++--
 9 files changed, 384 insertions(+), 162 deletions(-)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index eb0e60d06..a192fec3f 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -1,122 +1,141 @@
 <?xml version='1.0'?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+contributor license agreements.  See the NOTICE file distributed with
+  this
+work for additional information regarding copyright ownership.
+  The ASF
+licenses this file to You under the Apache License, Version 2.0
+  (the
+"License"); you may not use this file except in compliance with
+  the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
+  Unless required by applicable law
+or agreed to in writing, software
+  distributed under the License is distributed
+on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied.
+  See the License for the specific language governing
+permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.rat</groupId>
-    <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
-  </parent>
-  <artifactId>apache-rat-core</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache Creadur Rat::Core</name>
-  <description>The core functionality, shared by the Ant tasks
-    and the Maven plugin.</description>
-
-  <build>
-    <resources>
-      <resource>
-        <filtering>false</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/filtered-resources</directory>
-      </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>RELEASE_NOTES.txt</include>
-        </includes>
-      </resource>
-    </resources>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-project</artifactId>
+        <version>0.16-SNAPSHOT</version>
+    </parent>
+    <artifactId>apache-rat-core</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache Creadur Rat::Core</name>
+    <description>The core functionality, shared by the Ant tasks
+        and the Maven plugin.</description>
 
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <!-- These files have bad license headers because they are used to test bad license headers -->
-              <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
-              <exclude>src/test/resources/oasis/bad/*.*</exclude>
-              <!-- These files does not have license headers because they are used to test license headers -->
-              <exclude>src/test/resources/elements/Source.java</exclude>
-              <exclude>src/test/resources/elements/ILoggerFactory.java</exclude>
-              <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
-              <exclude>src/test/resources/violations/bad.txt</exclude>
-              <exclude>src/test/resources/violations/FilterTest.cs</exclude>
-              <!-- used to test for binary files; does not work on UTF-8 (e.g. MacOSX) -->
-              <exclude>src/test/resources/binaries/Image-png.not</exclude>
-              <!-- These files have a valid license header that was not recognised by older rat versions -->
-              <exclude>src/test/resources/elements/TextHttps.txt</exclude>
-              <!-- Remove after using RAT 0.14 for dog-fooding ..... older versions do not ignore JSON -->
-              <exclude>src/test/resources/elements/plain.json</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+    <build>
+        <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/filtered-resources</directory>
+            </resource>
+            <resource>
+                <directory>..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>RELEASE_NOTES.txt</include>
+                </includes>
+            </resource>
+        </resources>
 
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.rat</groupId>
+                    <artifactId>apache-rat-plugin</artifactId>
+                    <configuration>
+                        <excludes>
+                            <!-- These files have bad license headers because
+                            they are used to test bad license headers -->
+                            <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
+                            <exclude>src/test/resources/oasis/bad/*.*</exclude>
+                            <!-- These files does not have license headers
+                            because they are used to test license headers -->
+                            <exclude>src/test/resources/elements/Source.java</exclude>
+                            <exclude>
+                                src/test/resources/elements/ILoggerFactory.java</exclude>
+                            <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
+                            <exclude>src/test/resources/violations/bad.txt</exclude>
+                            <exclude>src/test/resources/violations/FilterTest.cs</exclude>
+                            <!-- used to test for binary files; does not work on
+                            UTF-8 (e.g. MacOSX) -->
+                            <exclude>src/test/resources/binaries/Image-png.not</exclude>
+                            <!-- These files have a valid license header that
+                            was not recognised by older rat versions -->
+                            <exclude>src/test/resources/elements/TextHttps.txt</exclude>
+                            <!-- Remove after using RAT 0.14 for dog-fooding
+                            ..... older versions do not ignore JSON -->
+                            <exclude>src/test/resources/elements/plain.json</exclude>
+                        </excludes>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.rat</groupId>
-      <artifactId>apache-rat-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <exclusions>
-        <!-- Not actually used (yet) so no point including it -->
-        <exclusion>
-          <groupId>org.tukaani</groupId>
-          <artifactId>xz</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
 
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-    </dependency>
-    <dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-configuration2</artifactId></dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <exclusions>
+                <!-- Not actually used (yet) so no point including it -->
+                <exclusion>
+                    <groupId>org.tukaani</groupId>
+                    <artifactId>xz</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
index f6de73ce1..4013ac7ab 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
@@ -84,10 +84,22 @@ public static final IHeaderMatcher getDefault() {
      */
     public SPDXMatcher(final String spdxId, final MetaData.Datum licenseFamilyCategory,
             final MetaData.Datum licenseFamilyName) {
-        super(licenseFamilyCategory, licenseFamilyName, "");
-        this.regex = Pattern.compile(spdxId).asPredicate();
+        this(spdxId,licenseFamilyCategory, licenseFamilyName, "");
     }
 
+    /**
+     * Constructor.
+     * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
+     * @param licenseFamilyCategory the RAT license family category for the license.
+     * @param licenseFamilyName the RAT license family name for the license.
+     * @param notes The notes for this matcher.
+     */
+    public SPDXMatcher(final String spdxId, final MetaData.Datum licenseFamilyCategory,
+            final MetaData.Datum licenseFamilyName, String notes) {
+        super(licenseFamilyCategory, licenseFamilyName, notes);
+        this.regex = Pattern.compile(spdxId).asPredicate();
+    }
+    
     @Override
     public void reset() {
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
index 11eeca393..86767aaec 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
@@ -1,6 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.rat.configuration;
 
 import java.util.Collection;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -49,24 +70,23 @@ public void add(String fileName) {
         }
         
     }
-    
+
     public void read(String... fileNames) throws ConfigurationException {
         FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
                 PropertiesConfiguration.class);
         PropertiesBuilderParameters parameters = new Parameters().properties()
                 .setThrowExceptionOnMissing(true);
 
-                
       for (String fname : fileNames) {
           parameters.setFile(new File(fname));
           add(builder.configure(parameters).getConfiguration());
       }
     }
-    
+
     public void add(Configuration cfg) {
         configuration.addConfiguration(cfg);
     }
-    
+
     @Override
     public Map<String, MetaData> readFamilies() {
         Map<String, MetaData> licenseFamilies = new HashMap<>();
@@ -83,54 +103,62 @@ public Map<String, MetaData> readFamilies() {
         }
         return licenseFamilies;
     }
+    
+    Set<String> extractKeys(Configuration cfg) {
+        Iterator<String> iter = cfg.getKeys();
+        Set<String> ids = new TreeSet<>();
+        while (iter.hasNext()) {
+            ids.add( iter.next().split("\\.")[0]);
+        }
+        return ids;
+    }
 
     @Override
     public Collection<BaseLicense> readLicenses() {
         Map<String,MetaData> families = readFamilies();
         List<BaseLicense> licenses = new ArrayList<BaseLicense>();
         Configuration licenseConfig = configuration.subset("license");
-        Iterator<String> iter = licenseConfig.getKeys();
-        while (iter.hasNext()) {
-            String id=iter.next();
+        for (String id : extractKeys(licenseConfig)) {
             Configuration lic = licenseConfig.subset(id);
             String familyId = lic.getString("family").trim();
             MetaData family = families.get(familyId);
             if (family == null) {
                 throw new IllegalArgumentException( String.format( "license %s uses family %s which is missing", id, familyId));
             }
-            if (lic.containsKey("fullText"))
+            Set<String> keys=extractKeys(lic);
+            String notes = lic.getString("notes", "");
+            if (keys.contains("fullText"))
             {
                 licenses.add( new FullTextMatchingLicense(
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        lic.getString("notes", ""),
+                        notes,
                         lic.getString("fullText")));
             }
-            if (lic.containsKey("copyright")) {
+            if (keys.contains("copyright")) {
                 licenses.add( new CopyrightHeader(
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        lic.getString("notes", ""),
+                        notes,
                         lic.getString("copyright")));
             }
-            if (lic.containsKey("text")) {
+            if (keys.contains("text")) {
                 Configuration text = lic.subset("text");
-                List<String> texts = new ArrayList<>();
-                Iterator<String> textIter = text.getKeys();
-                while (textIter.hasNext()) {
-                    texts.add(text.getString(textIter.next()));
-                }
+                Set<String> txtKeys = extractKeys(text);
+                List<String> texts = txtKeys.stream()
+                        .map(text::getString).collect(Collectors.toList()); 
                 licenses.add( new SimplePatternBasedLicense(
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        lic.getString("notes", ""),
+                        notes,
                         texts.toArray( new String[texts.size()])));
                 //lic.get
             }
-            if (lic.containsKey("spdx")) {
+            if (keys.contains("spdx")) {
                 licenses.add( new SPDXMatcher( lic.getString("spdx"),
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME)
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
+                        notes
                         ));
             }
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index 734326613..7b8606b4c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.rat.configuration;
 
 import java.util.Arrays;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
index 1e2ae2dc4..3718e0d32 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.rat.configuration;
 
 import java.util.Collection;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
index 29ab85370..539bed4a1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.rat.configuration;
 
 import java.util.Map;
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.config b/apache-rat-core/src/main/resources/org/apache/rat/default.config
index 3e373a02c..b04effc5d 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.config
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.config
@@ -1,5 +1,6 @@
-family.GEN  ";
-family.?????";
+// SPDX-License-Identifier: Apache-2.0
+family.GEN=Generated
+family.?????=Unknown
 family.AL=Apache License Version 2.0
 family.OASIS=OASIS Open License
 family.W3CD=W3C Document Copyright
@@ -11,6 +12,7 @@ family.MIT=The MIT License
 family.CDDL1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
 family.BSD_m=Modified BSD License
 
+
 /*
    * license.id.family=famid
          * license.id.notes=
@@ -19,6 +21,7 @@ family.BSD_m=Modified BSD License
          * license.id.text=
          * license.id.spdx=
          */
+
 license.ASL2.family=AL
 license.ASL2.text.1=Licensed under the Apache License, Version 2.0 (the "License")
 license.ASL2.text.1=Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
@@ -45,6 +48,33 @@ license.DOJO.family=BSD_m
 license.DOJO.notes=Dual license AFL/BSD
 license.DOJO.text.dojo=http://dojotoolkit.org/community/licensing.shtml
 
+license.GEN.family=GEN
+license.GEN.notes=Generated text no license required
+license.GEN.text.1=generated by Cayenne
+license.GEN.text.2=Generated By:JJTree
+license.GEN.text.3=Generated By:JavaCC
+license.GEN.text.4=THIS FILE IS AUTOMATICALLY GENERATED
+license.GEN.text.5=NOTE: this file is autogenerated by XBeans
+license.GEN.text.6=This file was automatically generated by 
+license.GEN.text.7=# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+license.GEN.text.8=# Microsoft Developer Studio Generated NMAKE File
+license.GEN.text.9=# Microsoft Developer Studio Generated Build File
+license.GEN.text.10=Generated from configure.ac by autoheader
+license.GEN.text.11=generated automatically by aclocal
+license.GEN.text.12=build.xml generated by maven from project.xml
+license.GEN.text.13=This file was generated by
+license.GEN.text.14=This file has been automatically generated.
+license.GEN.text.15=Automatically generated - do not modify!
+license.GEN.text.16=Javadoc style sheet
+license.GEN.text.17=SOURCE FILE GENERATATED
+license.GEN.text.18=Generated by the Batik
+license.GEN.text.19=this file is autogenerated
+license.GEN.text.20=This class was autogenerated
+license.GEN.text.21=Generated by Maven
+license.GEN.text.22=Autogenerated by Thrift
+license.GEN.text.23=DO NOT EDIT THIS FILE - it is machine generated
+license.GEN.text.24=This class was generated by"};
+
 license.GPL1.family=GPL1
 license.GPL1.fullText=This program is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 1, or (at your option)\n any later version.
 license.GPL1.spdx=GPL-1.0-only
@@ -53,10 +83,13 @@ license.GPL2.family=GPL2
 license.GPL2.fullText=This program is free software; you can redistribute it and/or\n modify it under the terms of the GNU General Public License\n as published by the Free Software Foundation; either version 2\n of the License, or (at your option) any later version.
 license.GPL2.spdx=GPL-2.0-only
 
-license.GPL3.family=GLP3
+license.GPL3.family=GPL3
 license.GPL3.fullText=This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.
 license.GPL3.spdx=GPL-3.0-only
 
+license.JavaDoc.family=GEN
+license.JavaDoc.text.1=Generated by javadoc
+
 license.MIT.family=MIT
 license.MIT.text.first=Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 license.MIT.text.middle=The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
new file mode 100644
index 000000000..63b73f60d
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -0,0 +1,55 @@
+package org.apache.rat.configuration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.api.MetaData;
+import org.junit.Test;
+
+public class ConfigurationReaderTest {
+    
+    private static String[] FAMILIES = {"GEN", "?????", "AL", "OASIS", "W3CD", "W3C", "GPL1", "GPL2", "GPL3", "MIT", "CDDL1", "BSD_m"};
+    
+    @Test
+    public void readDefault() throws ConfigurationException {
+        ConfigurationReader reader = new ConfigurationReader();
+        URL url = ConfigurationReader.class.getResource("/org/apache/rat/default.config");
+        reader.read(url.getFile());
+        Map<String,MetaData> families = reader.readFamilies();
+        assertTrue(families.keySet().containsAll(Arrays.asList(FAMILIES)));
+        families.keySet().removeAll(Arrays.asList(FAMILIES));
+        assertTrue(families.isEmpty());
+        
+        Collection<BaseLicense> licenses = reader.readLicenses();
+        assertEquals(24, licenses.size());
+        Map<String,Integer> result = new TreeMap<>();
+        licenses.stream().map(BaseLicense::getLicenseFamilyCategory).forEach( x -> {
+            Integer i = result.get(x);
+            if (i == null) {
+                result.put(x, 1);
+            } else {
+                result.put(x, 1+i.intValue());
+            }
+        });
+        assertEquals(4,result.get("AL   ").intValue());
+        assertEquals(2,result.get("BSD_m").intValue());
+        assertEquals(3,result.get("CDDL1").intValue());
+        assertEquals(2,result.get("GEN  ").intValue());
+        assertEquals(2,result.get("GPL1 ").intValue());
+        assertEquals(2,result.get("GPL2 ").intValue());
+        assertEquals(2,result.get("GPL3 ").intValue());
+        assertEquals(2,result.get("MIT  ").intValue());
+        assertEquals(2,result.get("OASIS").intValue());
+        assertEquals(2,result.get("W3C  ").intValue());
+        assertEquals(1,result.get("W3CD ").intValue());
+    }
+
+}
diff --git a/pom.xml b/pom.xml
index e007d2d1e..45a67065f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,62 +109,83 @@
 				<artifactId>commons-configuration2</artifactId>
 				<version>2.9.0</version>
 			</dependency>
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.9.4</version>
+            </dependency>
 			<dependency>
 				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
+				<artifactId>
+                    commons-io</artifactId>
 				<version>2.11.0</version>
-			</dependency>
+            </dependency>
 			<dependency>
-				<groupId>org.apache.commons</groupId>
+				<groupId>
+                    org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
 				<version>3.12.0</version>
-			</dependency>
+            </dependency>
 			<dependency>
-				<groupId>org.apache.commons</groupId>
+				<groupId>
+                    org.apache.commons</groupId>
 				<artifactId>commons-compress</artifactId>
-				<version>1.23.0</version>
-			</dependency>
+				<version>
+                    1.23.0</version>
+            </dependency>
 			<dependency>
 				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
+				<artifactId>
+                    junit</artifactId>
 				<version>4.13.2</version>
 				<scope>test</scope>
-			</dependency>
+            </dependency>
 			<dependency>
-				<groupId>org.mockito</groupId>
+				<groupId>
+                    org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>${mockito.version}</version>
+				<version>
+                    ${mockito.version}</version>
 				<scope>test</scope>
-			</dependency>
+            </dependency>
 			<dependency>
-				<groupId>org.hamcrest</groupId>
+				<groupId>
+                    org.hamcrest</groupId>
 				<artifactId>hamcrest-library</artifactId>
 				<version>2.2</version>
-				<scope>test</scope>
-			</dependency>
+				<scope>
+                    test</scope>
+            </dependency>
 			<dependency>
 				<groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId>
+				<artifactId>
+                    ant</artifactId>
 				<version>${ant.version}</version>
 				<scope>provided</scope>
-			</dependency>
+            </dependency>
 			<dependency>
-				<groupId>org.apache.ant</groupId>
+				<groupId>
+                    org.apache.ant</groupId>
 				<artifactId>ant-antunit</artifactId>
 				<version>1.4.1</version>
-				<scope>test</scope>
-			</dependency>
+				<scope>
+                    test</scope>
+            </dependency>
 			<dependency>
 				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-testutil</artifactId>
+				<artifactId>
+                    ant-testutil</artifactId>
 				<version>${ant.version}</version>
 				<scope>test</scope>
-			</dependency>
+            </dependency>
 			<dependency>
-				<groupId>org.apache.maven.plugin-tools</groupId>
-				<artifactId>maven-plugin-annotations</artifactId>
-				<version>${mavenPluginPluginVersion}</version>
-			</dependency>
+				<groupId>
+                    org.apache.maven.plugin-tools</groupId>
+				<artifactId>
+                    maven-plugin-annotations</artifactId>
+				<version>
+                    ${mavenPluginPluginVersion}</version>
+            </dependency>
 		</dependencies>
 	</dependencyManagement>
 	<reporting>

From 546d290601e1dc3b0614c57c02ab97833a5f35f1 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Tue, 15 Aug 2023 19:12:48 +0200
Subject: [PATCH 073/299] added more tests

---
 .../org/apache/rat/configuration/Format.java  |  3 +-
 .../ConfigurationReaderTest.java              | 16 ++++++++++
 .../apache/rat/configuration/FormatTest.java  | 32 +++++++++++++++++++
 .../apache/rat/configuration/ReadersTest.java | 32 +++++++++++++++++++
 4 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index 7b8606b4c..b6700b184 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -31,11 +31,10 @@ public enum Format {
     }
     
     public static Format fromName(String name) {
-        Format.valueOf("foo");
         String[] parts = name.split("\\.");
         String suffix = parts[parts.length-1];
         for (Format f: Format.values()) {
-            if (Arrays.stream(f.suffix).allMatch( suffix::equals )) {
+            if (Arrays.stream(f.suffix).anyMatch( suffix::equals )) {
                 return f;
             }
         }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index 63b73f60d..b77646cd6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.rat.configuration;
 
 import static org.junit.Assert.assertEquals;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
new file mode 100644
index 000000000..da12da7e7
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rat.configuration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
+
+public class FormatTest {
+    @Test
+    public void fromNameTest() {
+        assertEquals(Format.CONFIG, Format.fromName("foo/x.config"));
+        assertEquals(Format.CONFIG, Format.fromName("x.cfg"));
+        assertThrows(IllegalArgumentException.class, () ->Format.fromName("junk"));
+    }
+
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
new file mode 100644
index 000000000..ec2102abf
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rat.configuration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
+
+public class ReadersTest {
+    @Test
+    public void getTest() {
+        assertEquals(ConfigurationReader.class, Readers.get("foo/x.config").getClass());
+        assertEquals(ConfigurationReader.class, Readers.get("x.cfg").getClass());
+        assertThrows( IllegalArgumentException.class, () -> Readers.get("x.junk"));
+    }
+
+}

From dd9d13919ef961384e3a64535e75f01293e58a5c Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Wed, 16 Aug 2023 17:47:03 +0000
Subject: [PATCH 074/299] Moved configuration to file and got tests working.

---
 .../main/java/org/apache/rat/Defaults.java    | 205 +++++++++++-------
 .../rat/analysis/license/BaseLicense.java     |   8 +-
 .../rat/analysis/license/CopyrightHeader.java |   4 +-
 .../license/FullTextMatchingLicense.java      |   4 +-
 .../analysis/license/MultiplexLicense.java    |  33 +++
 .../util/HeaderMatcherMultiplexer.java        |   4 +-
 .../configuration/ConfigurationReader.java    |  30 ++-
 .../org/apache/rat/configuration/Reader.java  |   5 +-
 .../org/apache/rat/configuration/Readers.java |  15 +-
 .../org/apache/rat/policy/DefaultPolicy.java  |   4 +-
 .../resources/org/apache/rat/default.config   |   4 +-
 .../java/org/apache/rat/DefaultsTest.java     |  72 ++++++
 .../test/java/org/apache/rat/ReportTest.java  |   3 +-
 .../analysis/license/MockStandardLicense.java |  13 ++
 .../ConfigurationReaderTest.java              |  24 +-
 .../apache/rat/configuration/ReadersTest.java |   7 +-
 .../apache/rat/policy/DefaultPolicyTest.java  |   3 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    |   2 +-
 18 files changed, 312 insertions(+), 128 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index be76eea11..692d48d70 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -18,109 +18,94 @@
  */
 package org.apache.rat;
 
-import org.apache.commons.configuration2.CompositeConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.apache.commons.configuration2.XMLConfiguration;
-import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration2.builder.fluent.Parameters;
-import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
-import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters;
-import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.generation.GeneratedLicenseNotRequired;
-import org.apache.rat.analysis.generation.JavaDocLicenseNotRequired;
-import org.apache.rat.analysis.license.ApacheSoftwareLicense20;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.analysis.license.CDDL1License;
-import org.apache.rat.analysis.license.CopyrightHeader;
-import org.apache.rat.analysis.license.DojoLicenseHeader;
-import org.apache.rat.analysis.license.FullTextMatchingLicense;
-import org.apache.rat.analysis.license.GPL1License;
-import org.apache.rat.analysis.license.GPL2License;
-import org.apache.rat.analysis.license.GPL3License;
-import org.apache.rat.analysis.license.MITLicense;
-import org.apache.rat.analysis.license.OASISLicense;
-import org.apache.rat.analysis.license.SPDXMatcher;
-import org.apache.rat.analysis.license.TMF854LicenseHeader;
-import org.apache.rat.analysis.license.W3CDocLicense;
-import org.apache.rat.analysis.license.W3CLicense;
-import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.api.MetaData.Datum;
-import org.apache.rat.configuration.Readers;
-import org.apache.rat.configuration.Reader;
-
-import java.io.File;
 import java.io.InputStream;
-import java.util.Arrays;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.FileHandler;
+import java.util.LinkedHashMap;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.configuration.Reader;
+import org.apache.rat.configuration.Readers;
 
 /**
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
  */
 public class Defaults {
+    static final URL DEFAULT_CONFIG_URL = Defaults.class
+            .getResource("/org/apache/rat/default.config");
+    
     /**
      * no instances
      */
     private Defaults() {
     }
+
+    private static Map<String,BaseLicense> licenses = new LinkedHashMap<>();
+    private static Map<String, MetaData> licenseFamilies = new HashMap<>();
+
+    public static Builder builder() {
+        return new Builder();
+    }
     
-    private static List<BaseLicense> licenses;
-    private static Map<String,MetaData> licenseFamilies = new HashMap<>();
-    
-    public static void readConfigFiles(String... fileNames){
-        for (String fileName : fileNames) {
-            Reader reader = Readers.get(fileName);
+    private static void readConfigFiles(Collection<URL> urls) {
+        for (URL url : urls) {
+            Reader reader = Readers.get(url);
+            reader.add(url);
             licenseFamilies.putAll(reader.readFamilies());
+            licenses.putAll(reader.readLicenses());
         }
     }
 
-    /**
-     * The standard list of licenses to include in the reports.
-     * Needs to match configuration in {@link org.apache.rat.policy.DefaultPolicy}.
-     */
-    public static final List<IHeaderMatcher> DEFAULT_MATCHERS = Collections.unmodifiableList(
-            Arrays.asList(new ApacheSoftwareLicense20(),
-                    new GPL1License(),
-                    new GPL2License(),
-                    new GPL3License(),
-                    new MITLicense(),
-                    new W3CLicense(),
-                    new W3CDocLicense(),
-                    new OASISLicense(),
-                    new JavaDocLicenseNotRequired(), // does not have a MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_... entry
-                    new GeneratedLicenseNotRequired(), // does not have a MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_... entry
-                    new DojoLicenseHeader(),
-                    new TMF854LicenseHeader(),
-                    new CDDL1License(),
-                    SPDXMatcher.Factory.getDefault()));
-
-    // all classes in license package implementing ILicenseFamily
-    public static final List<String> DEFAULT_LICENSE_FAMILIES = Collections.unmodifiableList(
-            Arrays.asList(
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT, //
-                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT
-                    //
-            ));
+//    /**
+//     * The standard list of licenses to include in the reports.
+//     * Needs to match configuration in {@link org.apache.rat.policy.DefaultPolicy}.
+//     */
+//    public static final List<IHeaderMatcher> DEFAULT_MATCHERS = Collections.unmodifiableList(
+//            Arrays.asList(new ApacheSoftwareLicense20(),
+//                    new GPL1License(),
+//                    new GPL2License(),
+//                    new GPL3License(),
+//                    new MITLicense(),
+//                    new W3CLicense(),
+//                    new W3CDocLicense(),
+//                    new OASISLicense(),
+//                    new JavaDocLicenseNotRequired(), // does not have a MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_... entry
+//                    new GeneratedLicenseNotRequired(), // does not have a MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_... entry
+//                    new DojoLicenseHeader(),
+//                    new TMF854LicenseHeader(),
+//                    new CDDL1License(),
+//                    SPDXMatcher.Factory.getDefault()));
+//
+//    // all classes in license package implementing ILicenseFamily
+//    public static final List<String> DEFAULT_LICENSE_FAMILIES = Collections.unmodifiableList(
+//            Arrays.asList(
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT, //
+//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT
+//                    //
+//            ));
 
     public static final String PLAIN_STYLESHEET = "org/apache/rat/plain-rat.xsl";
     public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
@@ -138,6 +123,62 @@ public static InputStream getDefaultStyleSheet() {
     }
 
     public static IHeaderMatcher createDefaultMatcher() {
-        return new HeaderMatcherMultiplexer(Defaults.DEFAULT_MATCHERS);
+        return new HeaderMatcherMultiplexer(getLicenses());
+    }
+
+    public static Collection<BaseLicense> getLicenses() {
+        return Collections.unmodifiableCollection(licenses.values());
+    }
+
+    public static List<String> getLicenseNames() {
+        return licenseFamilies.values().stream().map(x -> x.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue())
+                .collect(Collectors.toList());
+    }
+    
+    public static class Builder {
+        private Set<URL> fileNames = new TreeSet<>(new Comparator<URL>() {
+
+            @Override
+            public int compare(URL url1, URL url2) {
+                return url1.toString().compareTo(url2.toString());
+            }});
+
+        private Builder() {
+            fileNames.add(DEFAULT_CONFIG_URL);
+        }
+
+        public Builder add(URL url) {
+            fileNames.add(url);
+            return this;
+        }
+        
+        public Builder add(String fileName) throws MalformedURLException {
+            return add(new File(fileName));
+        }
+
+        public Builder add(File file) throws MalformedURLException {
+            return add(file.toURI().toURL());
+        }
+        
+        public Builder remove(URL url) {
+            fileNames.remove(url);
+            return this;
+        }
+        
+        public Builder remove(String fileName) throws MalformedURLException {
+            return remove(new File(fileName));
+        }
+
+        public Builder remove(File file) throws MalformedURLException {
+            return remove(file.toURI().toURL());
+        }
+        
+        public Builder noDefault() {
+            return remove(DEFAULT_CONFIG_URL);
+        }
+
+        public void build() {
+            Defaults.readConfigFiles(fileNames);
+        }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index fe55b9663..10cc995a1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -18,16 +18,17 @@
  */ 
 package org.apache.rat.analysis.license;
 
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 
-public class BaseLicense {
+public abstract class BaseLicense implements IHeaderMatcher{
     private String licenseFamilyCategory;
     private String licenseFamilyName;
     private String notes;
 
-    public BaseLicense() {
-    }
+//    public BaseLicense() {
+//    }
 
     public BaseLicense(final MetaData.Datum licenseFamilyCategory, final MetaData.Datum licenseFamilyName, final String notes)
     {
@@ -88,5 +89,4 @@ protected static final String prune(String text) {
         }
         return buffer.toString();
     }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
index 4911841d0..1dc4d6f94 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
@@ -52,8 +52,8 @@ public class CopyrightHeader extends BaseLicense implements IHeaderMatcher {
     private String copyrightOwner;
     private boolean copyrightMatch = false;
 
-    public CopyrightHeader() {
-    }
+//    public CopyrightHeader() {
+//    }
 
     protected CopyrightHeader(Datum licenseFamilyCategory, Datum licenseFamilyName, String notes) {
         super(licenseFamilyCategory, licenseFamilyName, notes);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index a34e0a888..be3daad58 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -49,8 +49,8 @@ public class FullTextMatchingLicense extends BaseLicense
 
     private final StringBuilder buffer = new StringBuilder();
 
-    public FullTextMatchingLicense() {
-    }
+//    public FullTextMatchingLicense() {
+//    }
 
     public FullTextMatchingLicense(Datum licenseFamilyCategory,
                                       Datum licenseFamilyName,
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
new file mode 100644
index 000000000..c548a1b58
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
@@ -0,0 +1,33 @@
+package org.apache.rat.analysis.license;
+
+import java.util.Collection;
+
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+
+public class MultiplexLicense extends BaseLicense {
+    
+    private Collection<BaseLicense> enclosed;
+    
+    public MultiplexLicense(final MetaData.Datum licenseFamilyCategory, final MetaData.Datum licenseFamilyName, final String notes, Collection<BaseLicense> enclosed) {
+        super(licenseFamilyCategory, licenseFamilyName, notes);
+        this.enclosed = enclosed;
+    }
+
+    @Override
+    public void reset() {
+        enclosed.stream().forEach( x -> x.reset());
+    }
+
+    @Override
+    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
+        for (BaseLicense lic : enclosed) {
+            if (lic.match(subject, line)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
index 3f3592132..8228fb0cc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
@@ -31,9 +31,9 @@
  */
 public final class HeaderMatcherMultiplexer implements IHeaderMatcher {
 
-    private final Collection<IHeaderMatcher> matchers;
+    private final Collection<? extends IHeaderMatcher> matchers;
 
-    public HeaderMatcherMultiplexer(final Collection<IHeaderMatcher> matchers) {
+    public HeaderMatcherMultiplexer(final Collection<? extends IHeaderMatcher> matchers) {
         this.matchers = matchers;
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
index 86767aaec..0d8abbb3f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
@@ -23,10 +23,12 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.List;
 import java.io.File;
+import java.net.URL;
 import java.util.ArrayList;
 
 import org.apache.commons.configuration2.CompositeConfiguration;
@@ -39,6 +41,7 @@
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.analysis.license.CopyrightHeader;
 import org.apache.rat.analysis.license.FullTextMatchingLicense;
+import org.apache.rat.analysis.license.MultiplexLicense;
 import org.apache.rat.analysis.license.SPDXMatcher;
 import org.apache.rat.analysis.license.SimplePatternBasedLicense;
 import org.apache.rat.api.MetaData;
@@ -62,23 +65,23 @@ public ConfigurationReader() {
         configuration = new CompositeConfiguration();
     }
     
-    public void add(String fileName) {
+    public void add(URL url) {
         try {
-            read( fileName );
+            read(url);
         } catch (ConfigurationException e) {
             throw new RuntimeException(e);
         }
         
     }
 
-    public void read(String... fileNames) throws ConfigurationException {
+    public void read(URL... urls) throws ConfigurationException {
         FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
                 PropertiesConfiguration.class);
         PropertiesBuilderParameters parameters = new Parameters().properties()
                 .setThrowExceptionOnMissing(true);
 
-      for (String fname : fileNames) {
-          parameters.setFile(new File(fname));
+      for (URL url : urls) {
+          parameters.setURL(url);
           add(builder.configure(parameters).getConfiguration());
       }
     }
@@ -96,9 +99,8 @@ public Map<String, MetaData> readFamilies() {
             MetaData meta = new MetaData();
             String cat = iter.next();
             String category = cat.concat("     ").substring(0, 5);
-            Configuration fam = families.subset(cat);
             meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, category));
-            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, fam.getString("name")));
+            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, families.getString(cat)));
             licenseFamilies.put(cat.trim(), meta);
         }
         return licenseFamilies;
@@ -114,8 +116,9 @@ Set<String> extractKeys(Configuration cfg) {
     }
 
     @Override
-    public Collection<BaseLicense> readLicenses() {
+    public Map<String,BaseLicense> readLicenses() {
         Map<String,MetaData> families = readFamilies();
+        Map<String,BaseLicense> result = new LinkedHashMap<>();
         List<BaseLicense> licenses = new ArrayList<BaseLicense>();
         Configuration licenseConfig = configuration.subset("license");
         for (String id : extractKeys(licenseConfig)) {
@@ -161,7 +164,16 @@ public Collection<BaseLicense> readLicenses() {
                         notes
                         ));
             }
+            if (licenses.size() == 1) {
+                result.put(id, licenses.get(0));
+                licenses.clear();
+            } else if (licenses.size() > 1) {
+                result.put(id,  new MultiplexLicense(family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
+                        notes,licenses));
+                licenses = new ArrayList<BaseLicense>();
+            }
         }
-        return licenses;
+        return result;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
index 3718e0d32..10e08605f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.configuration;
 
+import java.net.URL;
 import java.util.Collection;
 import java.util.Map;
 
@@ -25,7 +26,7 @@
 import org.apache.rat.api.MetaData;
 
 public interface Reader {
-    void add(String name);
+    void add(URL url);
 
     /**
      * Reads the configuration and extracts the Family metadata indexed by category id.
@@ -37,5 +38,5 @@ public interface Reader {
      * Reads the configuration and extracts the BaseLicenses.
      * @return A collection of Base licenses.
      */
-    Collection<BaseLicense> readLicenses();
+    Map<String,BaseLicense> readLicenses();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
index 539bed4a1..696b54778 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -19,6 +19,9 @@
 package org.apache.rat.configuration;
 
 import java.util.Map;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 
 public class Readers {
@@ -89,11 +92,19 @@ public class Readers {
         readers.put( Format.CONFIG, new ConfigurationReader());
     }
 
-    public static Reader get(String fileName) {
-        return readers.get(Format.fromName(fileName));
+    public static Reader get(URL fileName) {
+        return readers.get(Format.fromName(fileName.getFile()));
     }
     
     private Readers() {
         // do not instantiate
     }
+
+    public static Reader get(File file) throws MalformedURLException {
+        return get(file.toURI().toURL());
+    }
+    
+    public static Reader get(String fileName) throws MalformedURLException {
+        return get(new File(fileName));
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 1a329fdd4..504815ead 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -53,13 +53,13 @@ public DefaultPolicy(final List<String> approvedLicenseNames, boolean mergeWithD
         if (approvedLicenseNames == null || approvedLicenseNames.isEmpty()) {
             // used in tests only, no additional licenses given but defaults requested
             if(mergeWithDefault) {
-                this.approvedLicenseNames = new ArrayList<>(Defaults.DEFAULT_LICENSE_FAMILIES);
+                this.approvedLicenseNames.addAll(Defaults.getLicenseNames());
             }
         } else {
             // avoid duplicate entries and merge with defaults if requested
             Set<String> mergedLicenses = new HashSet<>(approvedLicenseNames);
             if(mergeWithDefault) {
-                mergedLicenses.addAll(Defaults.DEFAULT_LICENSE_FAMILIES);
+                mergedLicenses.addAll(Defaults.getLicenseNames());
             }
             this.approvedLicenseNames = new ArrayList<>(mergedLicenses);
         }
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.config b/apache-rat-core/src/main/resources/org/apache/rat/default.config
index b04effc5d..2cd4d0675 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.config
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.config
@@ -91,9 +91,7 @@ license.JavaDoc.family=GEN
 license.JavaDoc.text.1=Generated by javadoc
 
 license.MIT.family=MIT
-license.MIT.text.first=Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-license.MIT.text.middle=The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-license.MIT.text.asis=THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+license.MIT.fullText=Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 license.MIT.spdx=MIT
 
 license.OASIS.family=OASIS
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
new file mode 100644
index 000000000..c563912ba
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+import org.apache.rat.analysis.license.BaseLicense;
+import org.junit.Test;
+
+public class DefaultsTest {
+    private static String[] FAMILIES = {"GEN", "?????", "AL", "OASIS", "W3CD", "W3C", "GPL1", "GPL2", "GPL3", "MIT", "CDDL1", "BSD_m"};
+
+    @Test
+    public void defaultConfigTest() {
+        Defaults.builder().build();
+
+        Collection<BaseLicense> families = Defaults.getLicenses();
+        Set<String> names = families.stream().map(x -> x.getLicenseFamilyCategory().trim()).collect(Collectors.toSet());
+        assertEquals(FAMILIES.length-1, names.size());
+        names.removeAll(Arrays.asList(FAMILIES));
+        assertTrue(names.isEmpty());
+
+        Collection<BaseLicense> licenses = Defaults.getLicenses();
+        assertEquals(15, licenses.size());
+        Map<String,Integer> result = new TreeMap<>();
+        licenses.stream().map(BaseLicense::getLicenseFamilyCategory).forEach( x -> {
+            Integer i = result.get(x);
+            if (i == null) {
+                result.put(x, 1);
+            } else {
+                result.put(x, 1+i.intValue());
+            }
+        });
+        assertEquals(2,result.get("AL   ").intValue());
+        assertEquals(2,result.get("BSD_m").intValue());
+        assertEquals(2,result.get("CDDL1").intValue());
+        assertEquals(2,result.get("GEN  ").intValue());
+        assertEquals(1,result.get("GPL1 ").intValue());
+        assertEquals(1,result.get("GPL2 ").intValue());
+        assertEquals(1,result.get("GPL3 ").intValue());
+        assertEquals(1,result.get("MIT  ").intValue());
+        assertEquals(1,result.get("OASIS").intValue());
+        assertEquals(1,result.get("W3C  ").intValue());
+        assertEquals(1,result.get("W3CD ").intValue());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 444a61ca5..3d3107bed 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -116,8 +116,9 @@ private static String getElementsReports(String pElementsPath) {
 
     @Test
     public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
+        Defaults.builder().build();
         StringWriter out = new StringWriter();
-        HeaderMatcherMultiplexer matcherMultiplexer = new HeaderMatcherMultiplexer(Defaults.DEFAULT_MATCHERS);
+        HeaderMatcherMultiplexer matcherMultiplexer = new HeaderMatcherMultiplexer(Defaults.getLicenses());
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setApproveDefaultLicenses(true);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
index 537f69e7d..f0ee862e6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
@@ -18,6 +18,9 @@
  */ 
 package org.apache.rat.analysis.license;
 
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 
 
@@ -29,4 +32,14 @@ public MockStandardLicense() {
         super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, ""), 
                 new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, ""), "");
     }
+
+    @Override
+    public void reset() {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
+        throw new NotImplementedException();
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index b77646cd6..daa57775c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -38,16 +38,16 @@ public class ConfigurationReaderTest {
     public void readDefault() throws ConfigurationException {
         ConfigurationReader reader = new ConfigurationReader();
         URL url = ConfigurationReader.class.getResource("/org/apache/rat/default.config");
-        reader.read(url.getFile());
+        reader.read(url);
         Map<String,MetaData> families = reader.readFamilies();
         assertTrue(families.keySet().containsAll(Arrays.asList(FAMILIES)));
         families.keySet().removeAll(Arrays.asList(FAMILIES));
         assertTrue(families.isEmpty());
         
-        Collection<BaseLicense> licenses = reader.readLicenses();
-        assertEquals(24, licenses.size());
+        Map<String,BaseLicense> licenses = reader.readLicenses();
+        assertEquals(15, licenses.size());
         Map<String,Integer> result = new TreeMap<>();
-        licenses.stream().map(BaseLicense::getLicenseFamilyCategory).forEach( x -> {
+        licenses.values().stream().map(BaseLicense::getLicenseFamilyCategory).forEach( x -> {
             Integer i = result.get(x);
             if (i == null) {
                 result.put(x, 1);
@@ -55,16 +55,16 @@ public void readDefault() throws ConfigurationException {
                 result.put(x, 1+i.intValue());
             }
         });
-        assertEquals(4,result.get("AL   ").intValue());
+        assertEquals(2,result.get("AL   ").intValue());
         assertEquals(2,result.get("BSD_m").intValue());
-        assertEquals(3,result.get("CDDL1").intValue());
+        assertEquals(2,result.get("CDDL1").intValue());
         assertEquals(2,result.get("GEN  ").intValue());
-        assertEquals(2,result.get("GPL1 ").intValue());
-        assertEquals(2,result.get("GPL2 ").intValue());
-        assertEquals(2,result.get("GPL3 ").intValue());
-        assertEquals(2,result.get("MIT  ").intValue());
-        assertEquals(2,result.get("OASIS").intValue());
-        assertEquals(2,result.get("W3C  ").intValue());
+        assertEquals(1,result.get("GPL1 ").intValue());
+        assertEquals(1,result.get("GPL2 ").intValue());
+        assertEquals(1,result.get("GPL3 ").intValue());
+        assertEquals(1,result.get("MIT  ").intValue());
+        assertEquals(1,result.get("OASIS").intValue());
+        assertEquals(1,result.get("W3C  ").intValue());
         assertEquals(1,result.get("W3CD ").intValue());
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
index ec2102abf..3443d5603 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
@@ -19,14 +19,15 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 
+import java.net.MalformedURLException;
+
 import org.junit.Test;
 
 public class ReadersTest {
     @Test
-    public void getTest() {
-        assertEquals(ConfigurationReader.class, Readers.get("foo/x.config").getClass());
+    public void getTest() throws MalformedURLException {
+        assertEquals(ConfigurationReader.class, Readers.get( "foo/x.config").getClass());
         assertEquals(ConfigurationReader.class, Readers.get("x.cfg").getClass());
         assertThrows( IllegalArgumentException.class, () -> Readers.get("x.junk"));
     }
-
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index ae59f66a0..cc7e54bb7 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -32,7 +32,7 @@
 
 
 public class DefaultPolicyTest {
-    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = Defaults.DEFAULT_LICENSE_FAMILIES.size();
+    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 12;
 
     private static final ILicenseFamily JUST_A_TEST_LIC_FAMILY = new ILicenseFamily() {
         public String getFamilyName() {
@@ -45,6 +45,7 @@ public String getFamilyName() {
 
     @Before
     public void setUp() throws Exception {
+        Defaults.builder().build();
         policy = new DefaultPolicy();
         subject = new MockLocation("subject");
     }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 67ba00045..f11e73e52 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -269,7 +269,7 @@ private List<IHeaderMatcher> mergeLicenseMatchers()
 
         if (addDefaultLicenseMatchers) {
             getLog().debug("Enabled default license matchers.");
-            matchers.addAll(Defaults.DEFAULT_MATCHERS);
+            matchers.addAll(Defaults.getLicenses());
         }
         logLicenseMatchers(matchers);
 

From b52288e94566010dfd790ff48cf3a35bb44f0777 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Fri, 18 Aug 2023 08:10:31 +0100
Subject: [PATCH 075/299] Fixed up testing

---
 .../main/java/org/apache/rat/Defaults.java    | 18 +++-
 .../src/main/java/org/apache/rat/Report.java  | 80 +++++++++++++++-
 .../rat/analysis/license/BaseLicense.java     |  5 +
 .../analysis/license/MultiplexLicense.java    |  2 +-
 .../rat/analysis/license/SPDXMatcher.java     | 93 +++++++++----------
 .../configuration/ConfigurationReader.java    |  3 +-
 .../rat/analysis/license/SPDXMatcherTest.java |  9 +-
 7 files changed, 154 insertions(+), 56 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 692d48d70..8efafc103 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -22,7 +22,6 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -36,6 +35,7 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.analysis.license.SPDXMatcher;
 import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.configuration.Reader;
@@ -123,18 +123,32 @@ public static InputStream getDefaultStyleSheet() {
     }
 
     public static IHeaderMatcher createDefaultMatcher() {
-        return new HeaderMatcherMultiplexer(getLicenses());
+        List<IHeaderMatcher> matchers = getLicenses().stream()
+                .filter( x -> ! (x instanceof SPDXMatcher.Match))
+                .collect(Collectors.toList());
+        if (SPDXMatcher.INSTANCE.isActive()) {
+            matchers.add(SPDXMatcher.INSTANCE);
+        }
+        return new HeaderMatcherMultiplexer(matchers);
     }
 
     public static Collection<BaseLicense> getLicenses() {
         return Collections.unmodifiableCollection(licenses.values());
     }
 
+    public static Map<String,BaseLicense> getLicenseMap() {
+        return Collections.unmodifiableMap(licenses);
+    }
+
     public static List<String> getLicenseNames() {
         return licenseFamilies.values().stream().map(x -> x.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue())
                 .collect(Collectors.toList());
     }
     
+    public static Collection<MetaData> getLicenseFamilies() {
+        return licenseFamilies.values();
+    }
+    
     public static class Builder {
         private Set<URL> fileNames = new TreeSet<>(new Comparator<URL>() {
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 4dff5798a..d4931a644 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -22,6 +22,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.*;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.api.MetaData;
 import org.apache.rat.api.RatException;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.report.RatReport;
@@ -36,6 +37,7 @@
 import java.io.*;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.regex.PatternSyntaxException;
 
@@ -45,6 +47,12 @@ public class Report {
     private static final String EXCLUDE_FILE_CLI = "E";
     private static final String STYLESHEET_CLI = "s";
     private static final String HELP = "h";
+    private static final String LICENSES="licenses";
+    private static final String NO_DEFAULTS="no-defaults";
+    private static final String LIST_LICENSES = "list-licenses";
+    private static final String LIST_LICENSE_FAMILIES = "list-license-families";
+    private static final String LICENSE_FAMILY_FORMAT = "\t%s: %s\n";
+    private static final String LICENSE_FORMAT = "\t%s: %s\n\t\t%s\n";
 
     public static final void main(String[] args) throws Exception {
         final ReportConfiguration configuration = new ReportConfiguration();
@@ -56,6 +64,7 @@ public static final void main(String[] args) throws Exception {
         try {
             cl = new DefaultParser().parse(opts, args);
         } catch (ParseException e) {
+            System.err.println(e.getMessage());
             System.err.println("Please use the \"--help\" option to see a list of valid commands and options");
             System.exit(1);
             return; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE for "cl"
@@ -70,7 +79,7 @@ public static final void main(String[] args) throws Exception {
             printUsage(opts);
         } else {
             Report report = new Report(args[0]);
-
+            
             if (cl.hasOption('a') || cl.hasOption('A')) {
                 configuration.setAddingLicenses(true);
                 configuration.setAddingLicensesForced(cl.hasOption('f'));
@@ -90,6 +99,24 @@ public static final void main(String[] args) throws Exception {
                     report.setInputFileFilter(filter);
                 }
             }
+            
+            Defaults.Builder defaults = Defaults.builder();
+            if (cl.hasOption( NO_DEFAULTS )) {
+                defaults.noDefault();
+            }
+            if (cl.hasOption(LICENSES)) {
+                for (String fn : cl.getOptionValues(LICENSES)) {
+                    defaults.add(fn);
+                }
+            }
+            defaults.build();
+            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
+                listLicenseFamilies(System.out);
+            }
+            if (cl.hasOption(LIST_LICENSES)) {
+                listLicenses(System.out);
+            }
+            
             if (cl.hasOption('x')) {
                 report.report(System.out, configuration);
             } else {
@@ -116,6 +143,24 @@ public static final void main(String[] args) throws Exception {
         }
     }
 
+    private static void listLicenseFamilies(PrintStream out) {
+        out.println( "Families:");
+        Defaults.getLicenseFamilies().stream().forEach( x -> out.format(LICENSE_FAMILY_FORMAT, 
+                x.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue(),
+                x.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue()));
+        out.println();
+    }
+    
+    private static void listLicenses(PrintStream out) {
+        out.println( "Licenses:");
+        Defaults.getLicenseMap().entrySet().stream().forEach(  x -> out.format(LICENSE_FORMAT,
+                x.getKey(),
+                x.getValue().getLicenseFamilyName(),
+                x.getValue().getNotes()
+                ));
+        out.println();
+    }
+    
     static FilenameFilter parseExclusions(List<String> excludes) throws IOException {
         final OrFileFilter orFilter = new OrFileFilter();
         int ignoredLines = 0;
@@ -147,6 +192,11 @@ private static Options buildOptions() {
                 "Print help for the RAT command line interface and exit");
         opts.addOption(help);
 
+        opts.addOption(null,NO_DEFAULTS, false, "Ignore default configuration");
+        opts.addOption(null,LICENSES, true, "File names or URLs for license definitions" );
+        opts.addOption(null,LIST_LICENSES, false, "List all active licenses");
+        opts.addOption(null,LIST_LICENSE_FAMILIES, false, "List all defined license families");
+        
         OptionGroup addLicenseGroup = new OptionGroup();
         String addLicenseDesc = "Add the default license header to any file with an unknown license that is not in the exclusion list. " +
                 "By default new files will be created with the license header, " +
@@ -229,6 +279,7 @@ private static Options buildOptions() {
 
     private static void printUsage(Options opts) {
         HelpFormatter f = new HelpFormatter();
+        f.setOptionComparator(new OptionComparator());
         String header = "\nAvailable options";
 
         String footer = "\nNOTE:\n" +
@@ -416,4 +467,31 @@ public static ClaimStatistic report(final IReportable container, final Writer ou
         writer.closeDocument();
         return statistic;
     }
+    
+    /**
+     * This class implements the {@code Comparator} interface for comparing Options.
+     */
+    private static class OptionComparator implements Comparator<Option>, Serializable {
+        /** The serial version UID. */
+        private static final long serialVersionUID = 5305467873966684014L;
+
+        private String getKey(Option opt) {
+            String key = opt.getOpt();
+            key = key==null?opt.getLongOpt():key;
+            return key;
+        }
+        /**
+         * Compares its two arguments for order. Returns a negative integer, zero, or a positive integer as the first argument
+         * is less than, equal to, or greater than the second.
+         *
+         * @param opt1 The first Option to be compared.
+         * @param opt2 The second Option to be compared.
+         * @return a negative integer, zero, or a positive integer as the first argument is less than, equal to, or greater than
+         *         the second.
+         */
+        @Override
+        public int compare(final Option opt1, final Option opt2) {
+            return getKey(opt1).compareToIgnoreCase(getKey(opt2));
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 10cc995a1..aaed1d049 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -78,6 +78,11 @@ public final void reportOnLicense(Document subject) {
         metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, getLicenseFamilyName()));
     }
 
+    /**
+     * Removes everything except letter or digit from text.
+     * @param text The text to remove extra chars from.
+     * @return the pruned text.
+     */
     protected static final String prune(String text) {
         final int length = text.length();
         final StringBuilder buffer = new StringBuilder(length);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
index c548a1b58..2f39366e6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
@@ -17,7 +17,7 @@ public MultiplexLicense(final MetaData.Datum licenseFamilyCategory, final MetaDa
 
     @Override
     public void reset() {
-        enclosed.stream().forEach( x -> x.reset());
+        enclosed.stream().forEach(x -> x.reset());
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
index 4013ac7ab..3d9608951 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
@@ -19,6 +19,8 @@
 package org.apache.rat.analysis.license;
 
 import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
@@ -39,66 +41,37 @@
  * 
  * @see https://spdx.dev/ids/
  */
-public class SPDXMatcher extends BaseLicense implements IHeaderMatcher {
+public class SPDXMatcher implements IHeaderMatcher {
 
     /**
      * Creates IHeaderMatcher instances that are a collection of SPDXMatcher instances.  Used in the
      * default matcher construction.
      */
-    public static class Factory {
-        static Map<String, IHeaderMatcher> getDefaultMatchers() {
-            Map<String, IHeaderMatcher> matchers = new HashMap<>();
-            matchers.put("CDDL-1.0", new SPDXMatcher("CDDL-1.0", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1));
-            matchers.put("GPL-1.0-only",
-                    new SPDXMatcher("GPL-1.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL1,
-                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1));
-            matchers.put("GPL-2.0-only",
-                    new SPDXMatcher("GPL-2.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL2,
-                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2));
-            matchers.put("GPL-3.0-only",
-                    new SPDXMatcher("GPL-3.0-only", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL3,
-                            MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_3));
-            matchers.put("MIT", new SPDXMatcher("MIT", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MIT));
-            matchers.put("Apache-2.0", new SPDXMatcher("Apache-2.0", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0));
-            matchers.put("W3C", new SPDXMatcher("W3C", MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD,
-                    MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT));
-            return matchers;
-        }
-
-        public static final IHeaderMatcher getDefault() {
-            return new HeaderMatcherMultiplexer(getDefaultMatchers().values());
-        }
-    }
+    private static final Map<String,SPDXMatcher.Match> matchers = new HashMap<>();
+    
+    public static final SPDXMatcher INSTANCE = new SPDXMatcher();
 
     private static Pattern groupSelector = Pattern.compile(".*SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)");
-    private Predicate<String> regex;
-
+  
     /**
      * Constructor.
      * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
      * @param licenseFamilyCategory the RAT license family category for the license.
      * @param licenseFamilyName the RAT license family name for the license.
      */
-    public SPDXMatcher(final String spdxId, final MetaData.Datum licenseFamilyCategory,
-            final MetaData.Datum licenseFamilyName) {
-        this(spdxId,licenseFamilyCategory, licenseFamilyName, "");
+    private SPDXMatcher() {};
+    
+    public BaseLicense register(final String spdxId, final MetaData.Datum licenseFamilyCategory,
+            final MetaData.Datum licenseFamilyName, String notes) {
+        Match matcher = new Match(spdxId, licenseFamilyCategory, licenseFamilyName, notes);
+        matchers.put(spdxId, matcher);
+        return matcher;
     }
 
-    /**
-     * Constructor.
-     * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
-     * @param licenseFamilyCategory the RAT license family category for the license.
-     * @param licenseFamilyName the RAT license family name for the license.
-     * @param notes The notes for this matcher.
-     */
-    public SPDXMatcher(final String spdxId, final MetaData.Datum licenseFamilyCategory,
-            final MetaData.Datum licenseFamilyName, String notes) {
-        super(licenseFamilyCategory, licenseFamilyName, notes);
-        this.regex = Pattern.compile(spdxId).asPredicate();
+    public boolean isActive() {
+        return !matchers.isEmpty();
     }
+
     
     @Override
     public void reset() {
@@ -108,12 +81,38 @@ public void reset() {
     public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
         Matcher matcher = groupSelector.matcher(line);
         if (matcher.find()) {
-            String name = matcher.group(1);
-            if (regex.test(name)) {
-                reportOnLicense(subject);
+            BaseLicense data = matchers.get(matcher.group(1));
+            if (data != null) {
+                data.reportOnLicense(subject);
                 return true;
             }
         }
         return false;
     }
+    
+    public class Match extends BaseLicense {
+        String spdx;
+        
+        /**
+         * Constructor.
+         * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
+         * @param licenseFamilyCategory the RAT license family category for the license.
+         * @param licenseFamilyName the RAT license family name for the license.
+         * @param notes The notes for this matcher.
+         */
+        Match(final String spdxId, final MetaData.Datum licenseFamilyCategory,
+            final MetaData.Datum licenseFamilyName, String notes) {
+            super( licenseFamilyCategory,licenseFamilyName, notes);
+            spdx = spdxId;
+        }
+
+        @Override
+        public void reset() {
+        }
+
+        @Override
+        public boolean match(Document subject, String line) {
+            return false;
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
index 0d8abbb3f..8e12d16f1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
@@ -155,10 +155,9 @@ public Map<String,BaseLicense> readLicenses() {
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
                         notes,
                         texts.toArray( new String[texts.size()])));
-                //lic.get
             }
             if (keys.contains("spdx")) {
-                licenses.add( new SPDXMatcher( lic.getString("spdx"),
+                licenses.add(SPDXMatcher.INSTANCE.register(lic.getString("spdx"),
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
                         family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
                         notes
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
index b3a057a79..b64296182 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.rat.Defaults;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
@@ -31,13 +32,15 @@
 
 public class SPDXMatcherTest {
 
-    private IHeaderMatcher defaults = SPDXMatcher.Factory.getDefault();
+    private IHeaderMatcher defaults;
     private Document testDocument;
 
     @Before
     public void setup() {
         testDocument = new MockDocument("SPDXMatcher test");
-    }
+        Defaults.builder().build();
+        defaults = SPDXMatcher.INSTANCE;
+        }
     
     private String getTag(String shortName) {
         return String.format("Some text\n  SPDX-License-Identifier:\t%s \nSome more text", shortName);
@@ -87,6 +90,6 @@ public void testApache2() throws RatHeaderAnalysisException {
     @Test
     public void testW3C() throws RatHeaderAnalysisException {
         assertTrue( defaults.match( testDocument, getTag("W3C")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3CD, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT);
+        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3C, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT);
     }
 }

From ac911cd340e81159dd3f5c06e3221ff6b6d48db5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 00:05:39 +0000
Subject: [PATCH 076/299] Bump ant.version from 1.10.13 to 1.10.14

Bumps `ant.version` from 1.10.13 to 1.10.14.

Updates `org.apache.ant:ant` from 1.10.13 to 1.10.14

Updates `org.apache.ant:ant-testutil` from 1.10.13 to 1.10.14

---
updated-dependencies:
- dependency-name: org.apache.ant:ant
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.ant:ant-testutil
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 713cd240e..9d3cbcee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@ agnostic home for software distribution comprehension and audit tools.
   <properties>
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
-    <ant.version>1.10.13</ant.version>
+    <ant.version>1.10.14</ant.version>
     <mockito.version>4.11.0</mockito.version>
     <javaVersion>1.8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>

From ab0c5c42bf755a0296220eec036c99d7f86d4d79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 00:42:03 +0000
Subject: [PATCH 077/299] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 50f5ef0bf..9d04f75ac 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configura artifact caching
         uses: actions/cache@v3.3.1

From f79c68cd42d03077c45b5cad9163df8734883f4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Sep 2023 10:57:51 +0000
Subject: [PATCH 078/299] Bump actions/cache from 3.3.1 to 3.3.2

Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.3.1...v3.3.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9d04f75ac..caee25ef7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Configura artifact caching
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.3.2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

From 7e88824b18fc35343ecdb11ac41a2e57598a0ba6 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 9 Sep 2023 19:27:04 +0200
Subject: [PATCH 079/299] major refactoring to remove MetaData from high level
 classes.\n\nMoved UI report configuration into separate class.  Moved
 reporter code into new Reporter class.  Removed hard coded license
 definitions, reworked test for configuration file defined license definitions

---
 apache-rat-core/pom.xml                       |   5 +
 .../apache/rat/ConfigurationException.java    |  17 +
 .../main/java/org/apache/rat/Defaults.java    | 102 ++--
 .../src/main/java/org/apache/rat/Report.java  | 495 ++++++------------
 .../org/apache/rat/ReportConfiguration.java   | 179 +++++--
 .../main/java/org/apache/rat/Reporter.java    | 123 +++++
 .../apache/rat/analysis/IHeaderMatcher.java   |  28 +
 .../GeneratedLicenseNotRequired.java          |  18 +-
 .../generation/JavaDocLicenseNotRequired.java |  49 --
 .../license/ApacheSoftwareLicense20.java      |  47 --
 .../AppliedApacheSoftwareLicense20.java       |  73 ---
 .../rat/analysis/license/BaseLicense.java     |  92 ++--
 .../rat/analysis/license/CDDL1License.java    |  67 ---
 .../rat/analysis/license/CopyrightHeader.java |  18 +-
 .../analysis/license/DojoLicenseHeader.java   |  41 --
 .../license/FullTextMatchingLicense.java      |  49 +-
 .../rat/analysis/license/GPL1License.java     |  37 --
 .../rat/analysis/license/GPL2License.java     |  37 --
 .../rat/analysis/license/GPL3License.java     |  37 --
 .../rat/analysis/license/MITLicense.java      |  36 --
 .../analysis/license/MultiplexLicense.java    |  40 +-
 .../rat/analysis/license/OASISLicense.java    |  66 ---
 .../rat/analysis/license/SPDXMatcher.java     | 102 ++--
 .../license/SimplePatternBasedLicense.java    |  43 +-
 .../analysis/license/TMF854LicenseHeader.java |  35 --
 .../rat/analysis/license/W3CDocLicense.java   |  35 --
 .../rat/analysis/license/W3CLicense.java      |  36 --
 .../util/HeaderMatcherMultiplexer.java        |  59 ---
 .../apache/rat/config/ConfigurationUtil.java  |  18 +-
 .../configuration/ConfigurationReader.java    | 106 ++--
 .../org/apache/rat/configuration/Reader.java  |   9 +-
 .../license/AcademicFree21LicenseFamily.java  |  27 -
 .../rat/license/Apache20LicenseFamily.java    |  27 -
 .../rat/license/CDDL1LicenseFamily.java       |  31 --
 .../apache/rat/license/GPL1LicenseFamily.java |  31 --
 .../apache/rat/license/GPL2LicenseFamily.java |  31 --
 .../apache/rat/license/GPL3LicenseFamily.java |  31 --
 .../apache/rat/license/ILicenseFamily.java    |  37 +-
 .../apache/rat/license/MITLicenseFamily.java  |  31 --
 .../rat/license/ModifiedBSDLicenseFamily.java |  27 -
 .../rat/license/OASISLicenseFamily.java       |  27 -
 .../rat/license/SimpleLicenseFamily.java      |  14 +-
 .../rat/license/W3CDocumentLicenseFamily.java |  27 -
 .../rat/license/W3CSoftwareLicenseFamily.java |  27 -
 .../org/apache/rat/policy/DefaultPolicy.java  |  47 +-
 .../resources/org/apache/rat/default.config   |   5 +-
 .../java/org/apache/rat/DefaultsTest.java     |  60 ++-
 .../test/java/org/apache/rat/ReportTest.java  | 179 ++++---
 .../rat/analysis/AnalyserFactoryTest.java     |  91 ++--
 .../rat/analysis/HeaderCheckWorkerTest.java   |  17 +-
 .../rat/analysis/MockLicenseMatcher.java      |  41 --
 .../JavaDocLicenseNotRequiredTest.java        |  82 ---
 .../analysis/license/AbstractMatcherTest.java | 299 +++++++++++
 .../ApacheSoftwareLicense20ShortTest.java     |  55 --
 .../license/ApacheSoftwareLicense20Test.java  |  70 ---
 .../license/ApacheSoftwareLicenseTest.java    |  87 +++
 .../analysis/license/CDDL1LicenseTest.java    |  74 +--
 .../analysis/license/CopyrightHeaderTest.java |   2 +-
 .../analysis/license/GPL123LicenseTest.java   |  93 ++--
 .../rat/analysis/license/MITLicenseTest.java  |  61 +--
 .../analysis/license/MockStandardLicense.java |  45 --
 .../license/MultiplexLicenseTest.java         | 102 ++++
 .../analysis/license/OASISLicenseTest.java    |  86 +--
 .../rat/analysis/license/SPDXMatcherTest.java |  95 ----
 .../rat/analysis/license/W3CLicenseTest.java  |  53 +-
 .../analysis/util/MatcherMultiplexerTest.java |  78 ---
 .../rat/config/ConfigurationUtilTest.java     |  27 +-
 .../ConfigurationReaderTest.java              |  54 +-
 .../apache/rat/report/xml/MockXmlWriter.java  | 122 -----
 .../rat/report/xml/XmlReportFactoryTest.java  |  35 +-
 .../apache/rat/report/xml/XmlReportTest.java  |  16 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    |   4 +-
 .../rat/anttasks/FullTextLicenseMatcher.java  |   5 +
 .../java/org/apache/rat/anttasks/Report.java  | 217 +++-----
 .../rat/anttasks/SubstringLicenseMatcher.java |   6 +
 .../src/test/java/org/example/Matcher.java    |   5 +-
 76 files changed, 1839 insertions(+), 2841 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/Reporter.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/CDDL1License.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL1License.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL2License.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL3License.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/CDDL1LicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/GPL1LicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/GPL2LicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/GPL3LicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20ShortTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/MultiplexLicenseTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index a192fec3f..bf212bdc7 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -137,5 +137,10 @@ permissions and
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.mockito</groupId>
+          <artifactId>mockito-core</artifactId>
+          <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
new file mode 100644
index 000000000..98519e83f
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
@@ -0,0 +1,17 @@
+package org.apache.rat;
+
+public class ConfigurationException extends Exception {
+
+    public ConfigurationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ConfigurationException(String message) {
+        super(message);
+    }
+
+    public ConfigurationException(Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 8efafc103..22394be08 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -18,95 +18,60 @@
  */
 package org.apache.rat;
 
-import java.io.InputStream;
 import java.io.File;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.LinkedHashMap;
 import java.util.Set;
+import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.analysis.license.MultiplexLicense;
 import org.apache.rat.analysis.license.SPDXMatcher;
-import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.configuration.Reader;
 import org.apache.rat.configuration.Readers;
+import org.apache.rat.license.ILicenseFamily;
 
 /**
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
  */
 public class Defaults {
-    static final URL DEFAULT_CONFIG_URL = Defaults.class
-            .getResource("/org/apache/rat/default.config");
-    
+    static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.config");
+
     /**
      * no instances
      */
     private Defaults() {
     }
 
-    private static Map<String,BaseLicense> licenses = new LinkedHashMap<>();
-    private static Map<String, MetaData> licenseFamilies = new HashMap<>();
+    private static Collection<IHeaderMatcher> licenses = new ArrayList<>();
+    private static SortedSet<ILicenseFamily> licenseFamilies = new TreeSet<>();
 
     public static Builder builder() {
         return new Builder();
     }
     
+    public static void clear() {
+        licenses.clear();
+        licenseFamilies.clear();
+    }
+
     private static void readConfigFiles(Collection<URL> urls) {
         for (URL url : urls) {
             Reader reader = Readers.get(url);
             reader.add(url);
-            licenseFamilies.putAll(reader.readFamilies());
-            licenses.putAll(reader.readLicenses());
+            licenseFamilies.addAll(reader.readFamilies());
+            licenses.addAll(reader.readLicenses());
         }
     }
 
-//    /**
-//     * The standard list of licenses to include in the reports.
-//     * Needs to match configuration in {@link org.apache.rat.policy.DefaultPolicy}.
-//     */
-//    public static final List<IHeaderMatcher> DEFAULT_MATCHERS = Collections.unmodifiableList(
-//            Arrays.asList(new ApacheSoftwareLicense20(),
-//                    new GPL1License(),
-//                    new GPL2License(),
-//                    new GPL3License(),
-//                    new MITLicense(),
-//                    new W3CLicense(),
-//                    new W3CDocLicense(),
-//                    new OASISLicense(),
-//                    new JavaDocLicenseNotRequired(), // does not have a MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_... entry
-//                    new GeneratedLicenseNotRequired(), // does not have a MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_... entry
-//                    new DojoLicenseHeader(),
-//                    new TMF854LicenseHeader(),
-//                    new CDDL1License(),
-//                    SPDXMatcher.Factory.getDefault()));
-//
-//    // all classes in license package implementing ILicenseFamily
-//    public static final List<String> DEFAULT_LICENSE_FAMILIES = Collections.unmodifiableList(
-//            Arrays.asList(
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT, //
-//                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT
-//                    //
-//            ));
-
     public static final String PLAIN_STYLESHEET = "org/apache/rat/plain-rat.xsl";
     public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
 
@@ -123,39 +88,34 @@ public static InputStream getDefaultStyleSheet() {
     }
 
     public static IHeaderMatcher createDefaultMatcher() {
-        List<IHeaderMatcher> matchers = getLicenses().stream()
-                .filter( x -> ! (x instanceof SPDXMatcher.Match))
+        List<IHeaderMatcher> matchers = getLicenses().stream().filter(x -> !(x instanceof SPDXMatcher.Match))
                 .collect(Collectors.toList());
         if (SPDXMatcher.INSTANCE.isActive()) {
             matchers.add(SPDXMatcher.INSTANCE);
         }
-        return new HeaderMatcherMultiplexer(matchers);
+        return new MultiplexLicense("Default matcher", matchers);
     }
 
-    public static Collection<BaseLicense> getLicenses() {
-        return Collections.unmodifiableCollection(licenses.values());
+    public static Collection<IHeaderMatcher> getLicenses() {
+        return Collections.unmodifiableCollection(licenses);
     }
 
-    public static Map<String,BaseLicense> getLicenseMap() {
-        return Collections.unmodifiableMap(licenses);
+    public static Set<String> getLicenseNames() {
+        return licenseFamilies.stream().map(ILicenseFamily::getFamilyName).collect(Collectors.toSet());
     }
 
-    public static List<String> getLicenseNames() {
-        return licenseFamilies.values().stream().map(x -> x.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue())
-                .collect(Collectors.toList());
+    public static SortedSet<ILicenseFamily> getLicenseFamilies() {
+        return Collections.unmodifiableSortedSet(licenseFamilies);
     }
-    
-    public static Collection<MetaData> getLicenseFamilies() {
-        return licenseFamilies.values();
-    }
-    
+
     public static class Builder {
         private Set<URL> fileNames = new TreeSet<>(new Comparator<URL>() {
 
             @Override
             public int compare(URL url1, URL url2) {
                 return url1.toString().compareTo(url2.toString());
-            }});
+            }
+        });
 
         private Builder() {
             fileNames.add(DEFAULT_CONFIG_URL);
@@ -165,7 +125,7 @@ public Builder add(URL url) {
             fileNames.add(url);
             return this;
         }
-        
+
         public Builder add(String fileName) throws MalformedURLException {
             return add(new File(fileName));
         }
@@ -173,12 +133,12 @@ public Builder add(String fileName) throws MalformedURLException {
         public Builder add(File file) throws MalformedURLException {
             return add(file.toURI().toURL());
         }
-        
+
         public Builder remove(URL url) {
             fileNames.remove(url);
             return this;
         }
-        
+
         public Builder remove(String fileName) throws MalformedURLException {
             return remove(new File(fileName));
         }
@@ -186,7 +146,7 @@ public Builder remove(String fileName) throws MalformedURLException {
         public Builder remove(File file) throws MalformedURLException {
             return remove(file.toURI().toURL());
         }
-        
+
         public Builder noDefault() {
             return remove(DEFAULT_CONFIG_URL);
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index d4931a644..dbd2acc87 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -18,166 +18,172 @@
  */
 package org.apache.rat;
 
-import org.apache.commons.cli.*;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.api.RatException;
-import org.apache.rat.report.IReportable;
-import org.apache.rat.report.RatReport;
-import org.apache.rat.report.claim.ClaimStatistic;
-import org.apache.rat.report.xml.XmlReportFactory;
-import org.apache.rat.report.xml.writer.IXmlWriter;
-import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
-import org.apache.rat.walker.ArchiveWalker;
-import org.apache.rat.walker.DirectoryWalker;
-
-import javax.xml.transform.TransformerConfigurationException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.regex.PatternSyntaxException;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionGroup;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.NameFileFilter;
+import org.apache.commons.io.filefilter.NotFileFilter;
+import org.apache.commons.io.filefilter.OrFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.report.IReportable;
+import org.apache.rat.walker.ArchiveWalker;
+import org.apache.rat.walker.DirectoryWalker;
 
 public class Report {
     private static final String EXCLUDE_CLI = "e";
     private static final String EXCLUDE_FILE_CLI = "E";
     private static final String STYLESHEET_CLI = "s";
     private static final String HELP = "h";
-    private static final String LICENSES="licenses";
-    private static final String NO_DEFAULTS="no-defaults";
+    private static final String LICENSES = "licenses";
+    private static final String NO_DEFAULTS = "no-defaults";
     private static final String LIST_LICENSES = "list-licenses";
     private static final String LIST_LICENSE_FAMILIES = "list-license-families";
     private static final String LICENSE_FAMILY_FORMAT = "\t%s: %s\n";
-    private static final String LICENSE_FORMAT = "\t%s: %s\n\t\t%s\n";
+    private static final String LICENSE_FORMAT = "%s:\t%s\n\t\t%s\n";
 
     public static final void main(String[] args) throws Exception {
-        final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.setHeaderMatcher(Defaults.createDefaultMatcher());
-        configuration.setApproveDefaultLicenses(true);
-        Options opts = buildOptions();
+        try (final ReportConfiguration configuration = new ReportConfiguration()) {
+            configuration.addHeaderMatcher(Defaults.createDefaultMatcher());
+            configuration.setApproveDefaultLicenses(true);
+            Options opts = buildOptions();
 
-        CommandLine cl = null;
-        try {
-            cl = new DefaultParser().parse(opts, args);
-        } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            System.err.println("Please use the \"--help\" option to see a list of valid commands and options");
-            System.exit(1);
-            return; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE for "cl"
-        }
-
-        if (cl.hasOption(HELP)) {
-            printUsage(opts);
-        }
+            CommandLine cl = null;
+            try {
+                cl = new DefaultParser().parse(opts, args);
+            } catch (ParseException e) {
+                System.err.println(e.getMessage());
+                System.err.println("Please use the \"--help\" option to see a list of valid commands and options");
+                System.exit(1);
+                return; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE
+                        // for "cl"
+            }
 
-        args = cl.getArgs();
-        if (args == null || args.length != 1) {
-            printUsage(opts);
-        } else {
-            Report report = new Report(args[0]);
-            
-            if (cl.hasOption('a') || cl.hasOption('A')) {
-                configuration.setAddingLicenses(true);
-                configuration.setAddingLicensesForced(cl.hasOption('f'));
-                configuration.setCopyrightMessage(cl.getOptionValue("c"));
+            if (cl.hasOption(HELP)) {
+                printUsage(opts);
             }
 
-            if (cl.hasOption(EXCLUDE_CLI)) {
-                String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
-                if (excludes != null) {
-                    final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
-                    report.setInputFileFilter(filter);
+            args = cl.getArgs();
+            if (args == null || args.length != 1) {
+                printUsage(opts);
+            } else {
+
+                if (cl.hasOption('a') || cl.hasOption('A')) {
+                    configuration.setAddingLicenses(true);
+                    configuration.setAddingLicensesForced(cl.hasOption('f'));
+                    configuration.setCopyrightMessage(cl.getOptionValue("c"));
                 }
-            } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
-                String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
-                if (excludeFileName != null) {
-                    final FilenameFilter filter = parseExclusions(FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
-                    report.setInputFileFilter(filter);
+
+                if (cl.hasOption(EXCLUDE_CLI)) {
+                    String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
+                    if (excludes != null) {
+                        final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
+                        configuration.setInputFileFilter(filter);
+                    }
+                } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
+                    String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
+                    if (excludeFileName != null) {
+                        final FilenameFilter filter = parseExclusions(
+                                FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
+                        configuration.setInputFileFilter(filter);
+                    }
                 }
-            }
-            
-            Defaults.Builder defaults = Defaults.builder();
-            if (cl.hasOption( NO_DEFAULTS )) {
-                defaults.noDefault();
-            }
-            if (cl.hasOption(LICENSES)) {
-                for (String fn : cl.getOptionValues(LICENSES)) {
-                    defaults.add(fn);
+
+                Defaults.Builder defaults = Defaults.builder();
+                if (cl.hasOption(NO_DEFAULTS)) {
+                    defaults.noDefault();
                 }
-            }
-            defaults.build();
-            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-                listLicenseFamilies(System.out);
-            }
-            if (cl.hasOption(LIST_LICENSES)) {
-                listLicenses(System.out);
-            }
-            
-            if (cl.hasOption('x')) {
-                report.report(System.out, configuration);
-            } else {
-                if (!cl.hasOption(STYLESHEET_CLI)) {
-                    report.styleReport(System.out, configuration);
-                } else {
-                    String[] style = cl.getOptionValues(STYLESHEET_CLI);
-                    if (style.length != 1) {
-                        System.err.println("please specify a single stylesheet");
-                        System.exit(1);
+                if (cl.hasOption(LICENSES)) {
+                    for (String fn : cl.getOptionValues(LICENSES)) {
+                        defaults.add(fn);
                     }
-                    try {
-                        report(System.out,
-                                report.getDirectory(System.out),
-                                new FileInputStream(style[0]),
-                                configuration);
-                    } catch (FileNotFoundException fnfe) {
-                        System.err.println("stylesheet " + style[0]
-                                + " doesn't exist");
-                        System.exit(1);
+                }
+                defaults.build();
+                if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
+                    listLicenseFamilies(System.out);
+                }
+                if (cl.hasOption(LIST_LICENSES)) {
+                    listLicenses(System.out);
+                }
+
+                if (cl.hasOption('x')) {
+                    configuration.setStyleReport(false);
+                } else {
+                    configuration.setStyleReport(true);
+                    if (cl.hasOption(STYLESHEET_CLI)) {
+                        String[] style = cl.getOptionValues(STYLESHEET_CLI);
+                        if (style.length != 1) {
+                            System.err.println("please specify a single stylesheet");
+                            System.exit(1);
+                        }
+                        try {
+                            configuration.setStyleSheet(new FileInputStream(style[0]));
+                        } catch (FileNotFoundException fnfe) {
+                            System.err.println("stylesheet " + style[0] + " doesn't exist");
+                            System.exit(1);
+                        }
                     }
                 }
+                configuration.setReportable(getDirectory(args[0], configuration));
+                configuration.validate(s -> System.err.println(s));
+                Reporter.report(configuration);
             }
         }
     }
 
     private static void listLicenseFamilies(PrintStream out) {
-        out.println( "Families:");
-        Defaults.getLicenseFamilies().stream().forEach( x -> out.format(LICENSE_FAMILY_FORMAT, 
-                x.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue(),
-                x.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue()));
+        out.println("Families:");
+        Defaults.getLicenseFamilies()
+                .forEach(x -> out.format(LICENSE_FAMILY_FORMAT, x.getFamilyCategory(), x.getFamilyName()));
         out.println();
     }
-    
+
     private static void listLicenses(PrintStream out) {
-        out.println( "Licenses:");
-        Defaults.getLicenseMap().entrySet().stream().forEach(  x -> out.format(LICENSE_FORMAT,
-                x.getKey(),
-                x.getValue().getLicenseFamilyName(),
-                x.getValue().getNotes()
-                ));
+        out.println("Licenses:");
+        Defaults.getLicenses().stream().filter(lic -> lic instanceof BaseLicense).map(BaseLicense.class::cast)
+                .forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
+                        lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
         out.println();
     }
-    
+
     static FilenameFilter parseExclusions(List<String> excludes) throws IOException {
         final OrFileFilter orFilter = new OrFileFilter();
         int ignoredLines = 0;
         for (String exclude : excludes) {
             try {
                 // skip comments
-                if(exclude.startsWith("#") || StringUtils.isEmpty(exclude)) {
+                if (exclude.startsWith("#") || StringUtils.isEmpty(exclude)) {
                     ignoredLines++;
                     continue;
                 }
 
                 String exclusion = exclude.trim();
-                // interpret given patterns as regular expression, direct file names or wildcards to give users more choices to configure exclusions
+                // interpret given patterns as regular expression, direct file names or
+                // wildcards to give users more choices to configure exclusions
                 orFilter.addFileFilter(new RegexFileFilter(exclusion));
                 orFilter.addFileFilter(new NameFileFilter(exclusion));
                 orFilter.addFileFilter(new WildcardFileFilter(exclusion));
-            } catch(PatternSyntaxException e) {
+            } catch (PatternSyntaxException e) {
                 System.err.println("Will skip given exclusion '" + exclude + "' due to " + e);
             }
         }
@@ -188,89 +194,57 @@ static FilenameFilter parseExclusions(List<String> excludes) throws IOException
     private static Options buildOptions() {
         Options opts = new Options();
 
-        Option help = new Option(HELP, "help", false,
-                "Print help for the RAT command line interface and exit");
+        Option help = new Option(HELP, "help", false, "Print help for the RAT command line interface and exit");
         opts.addOption(help);
 
-        opts.addOption(null,NO_DEFAULTS, false, "Ignore default configuration");
-        opts.addOption(null,LICENSES, true, "File names or URLs for license definitions" );
-        opts.addOption(null,LIST_LICENSES, false, "List all active licenses");
-        opts.addOption(null,LIST_LICENSE_FAMILIES, false, "List all defined license families");
-        
+        opts.addOption(null, NO_DEFAULTS, false, "Ignore default configuration");
+        opts.addOption(null, LICENSES, true, "File names or URLs for license definitions");
+        opts.addOption(null, LIST_LICENSES, false, "List all active licenses");
+        opts.addOption(null, LIST_LICENSE_FAMILIES, false, "List all defined license families");
+
         OptionGroup addLicenseGroup = new OptionGroup();
-        String addLicenseDesc = "Add the default license header to any file with an unknown license that is not in the exclusion list. " +
-                "By default new files will be created with the license header, " +
-                "to force the modification of existing files use the --force option.";
-
-        // RAT-85/RAT-203: Deprecated! added only for convenience and for backwards compatibility
-        Option addLicence = new Option(
-                "a",
-                "addLicence",
-                false,
-                addLicenseDesc);
+        String addLicenseDesc = "Add the default license header to any file with an unknown license that is not in the exclusion list. "
+                + "By default new files will be created with the license header, "
+                + "to force the modification of existing files use the --force option.";
+
+        // RAT-85/RAT-203: Deprecated! added only for convenience and for backwards
+        // compatibility
+        Option addLicence = new Option("a", "addLicence", false, addLicenseDesc);
         addLicenseGroup.addOption(addLicence);
-        Option addLicense = new Option(
-                "A",
-                "addLicense",
-                false,
-                addLicenseDesc);
+        Option addLicense = new Option("A", "addLicense", false, addLicenseDesc);
         addLicenseGroup.addOption(addLicense);
         opts.addOptionGroup(addLicenseGroup);
 
-        Option write = new Option(
-                "f",
-                "force",
-                false,
+        Option write = new Option("f", "force", false,
                 "Forces any changes in files to be written directly to the source files (i.e. new files are not created)");
         opts.addOption(write);
 
-        Option copyright = new Option(
-                "c",
-                "copyright",
-                true,
+        Option copyright = new Option("c", "copyright", true,
                 "The copyright message to use in the license headers, usually in the form of \"Copyright 2008 Foo\"");
         opts.addOption(copyright);
 
-        final Option exclude = Option.builder(EXCLUDE_CLI)
-                .argName("expression")
-                .longOpt("exclude")
-                .hasArgs()
-                .desc("Excludes files matching wildcard <expression>. " +
-                        "Note that --dir is required when using this parameter. " +
-                        "Allows multiple arguments.")
+        final Option exclude = Option.builder(EXCLUDE_CLI).argName("expression").longOpt("exclude").hasArgs()
+                .desc("Excludes files matching wildcard <expression>. "
+                        + "Note that --dir is required when using this parameter. " + "Allows multiple arguments.")
                 .build();
         opts.addOption(exclude);
 
-        final Option excludeFile = Option.builder(EXCLUDE_FILE_CLI)
-                .argName("fileName")
-                .longOpt("exclude-file")
-                .hasArgs()
-                .desc("Excludes files matching regular expression in <file> " +
-                        "Note that --dir is required when using this parameter. ")
+        final Option excludeFile = Option.builder(EXCLUDE_FILE_CLI).argName("fileName").longOpt("exclude-file")
+                .hasArgs().desc("Excludes files matching regular expression in <file> "
+                        + "Note that --dir is required when using this parameter. ")
                 .build();
         opts.addOption(excludeFile);
 
-        Option dir = new Option(
-                "d",
-                "dir",
-                false,
-                "Used to indicate source when using --exclude");
+        Option dir = new Option("d", "dir", false, "Used to indicate source when using --exclude");
         opts.addOption(dir);
 
         OptionGroup outputType = new OptionGroup();
 
-        Option xml = new Option(
-                "x",
-                "xml",
-                false,
-                "Output the report in raw XML format.  Not compatible with -s");
+        Option xml = new Option("x", "xml", false, "Output the report in raw XML format.  Not compatible with -s");
         outputType.addOption(xml);
 
-        Option xslt = new Option(STYLESHEET_CLI,
-                "stylesheet",
-                true,
-                "XSLT stylesheet to use when creating the"
-                        + " report.  Not compatible with -x");
+        Option xslt = new Option(STYLESHEET_CLI, "stylesheet", true,
+                "XSLT stylesheet to use when creating the" + " report.  Not compatible with -x");
         outputType.addOption(xslt);
         opts.addOptionGroup(outputType);
 
@@ -282,69 +256,23 @@ private static void printUsage(Options opts) {
         f.setOptionComparator(new OptionComparator());
         String header = "\nAvailable options";
 
-        String footer = "\nNOTE:\n" +
-                "Rat is really little more than a grep ATM\n" +
-                "Rat is also rather memory hungry ATM\n" +
-                "Rat is very basic ATM\n" +
-                "Rat highlights possible issues\n" +
-                "Rat reports require interpretation\n" +
-                "Rat often requires some tuning before it runs well against a project\n" +
-                "Rat relies on heuristics: it may miss issues\n";
-
-        f.printHelp("java -jar apache-rat/target/apache-rat-CURRENT-VERSION.jar [options] [DIR|TARBALL]",
-                header, opts, footer, false);
-        System.exit(0);
-    }
-
-    private final String baseDirectory;
-
-    private FilenameFilter inputFileFilter = null;
-
-    private Report(String baseDirectory) {
-        this.baseDirectory = baseDirectory;
-    }
-
-    /**
-     * Sets the current filter used to select files.
-     *
-     * @param inputFileFilter filter, or null when no filter has been set
-     */
-    public void setInputFileFilter(FilenameFilter inputFileFilter) {
-        this.inputFileFilter = inputFileFilter;
-    }
+        String footer = "\nNOTE:\n" + "Rat is really little more than a grep ATM\n"
+                + "Rat is also rather memory hungry ATM\n" + "Rat is very basic ATM\n"
+                + "Rat highlights possible issues\n" + "Rat reports require interpretation\n"
+                + "Rat often requires some tuning before it runs well against a project\n"
+                + "Rat relies on heuristics: it may miss issues\n";
 
-    /**
-     * @param out - the output stream to receive the styled report
-     * @return the currently collected numerical statistics.
-     * @throws Exception in case of errors.
-     * @deprecated use {@link #report(PrintStream, ReportConfiguration)} instead
-     */
-    @Deprecated
-    public ClaimStatistic report(PrintStream out) throws Exception {
-        final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.setHeaderMatcher(Defaults.createDefaultMatcher());
-        configuration.setApproveDefaultLicenses(true);
-        return report(out, configuration);
+        f.printHelp("java -jar apache-rat/target/apache-rat-CURRENT-VERSION.jar [options] [DIR|TARBALL]", header, opts,
+                footer, false);
+        System.exit(0);
     }
 
-    /**
-     * @param out           - the output stream to receive the styled report
-     * @param configuration - current configuration options.
-     * @return the currently collected numerical statistics.
-     * @throws Exception in case of errors.
-     * @since Rat 0.8
-     */
-    public ClaimStatistic report(PrintStream out,
-                                 ReportConfiguration configuration)
-            throws Exception {
-        final IReportable base = getDirectory(out);
-        if (base != null) {
-            return report(base, new OutputStreamWriter(out), configuration);
-        }
-        return null;
+    private Report() {
+        // do not instantiate
     }
 
-    private IReportable getDirectory(PrintStream out) {
+    public static IReportable getDirectory(String baseDirectory, ReportConfiguration config) {
+        PrintStream out = new PrintStream(config.getOutput());
         File base = new File(baseDirectory);
         if (!base.exists()) {
             out.print("ERROR: ");
@@ -354,11 +282,11 @@ private IReportable getDirectory(PrintStream out) {
         }
 
         if (base.isDirectory()) {
-            return new DirectoryWalker(base, inputFileFilter);
+            return new DirectoryWalker(base, config.getInputFileFilter());
         }
 
         try {
-            return new ArchiveWalker(base, inputFileFilter);
+            return new ArchiveWalker(base, config.getInputFileFilter());
         } catch (IOException ex) {
             out.print("ERROR: ");
             out.print(baseDirectory);
@@ -367,107 +295,6 @@ private IReportable getDirectory(PrintStream out) {
         }
     }
 
-    /**
-     * Output a report in the default style and default license
-     * header matcher.
-     *
-     * @param out - the output stream to receive the styled report
-     * @throws Exception in case of errors.
-     * @deprecated use {@link #styleReport(PrintStream, ReportConfiguration)} instead
-     */
-    @Deprecated
-    public void styleReport(PrintStream out) throws Exception {
-        final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.setHeaderMatcher(Defaults.createDefaultMatcher());
-        configuration.setApproveDefaultLicenses(true);
-        styleReport(out, configuration);
-    }
-
-    /**
-     * Output a report in the default style and default license
-     * header matcher.
-     *
-     * @param out           - the output stream to receive the styled report
-     * @param configuration the configuration to use
-     * @throws Exception in case of errors.
-     * @since Rat 0.8
-     */
-    public void styleReport(PrintStream out,
-                            ReportConfiguration configuration)
-            throws Exception {
-        final IReportable base = getDirectory(out);
-        if (base != null) {
-            InputStream style = Defaults.getDefaultStyleSheet();
-            report(out, base, style, configuration);
-        }
-    }
-
-    /**
-     * Output a report that is styled using a defined stylesheet.
-     *
-     * @param out            the stream to write the report to
-     * @param base           the files or directories to report on
-     * @param style          an input stream representing the stylesheet to use for styling the report
-     * @param pConfiguration current report configuration.
-     * @throws IOException                       in case of I/O errors.
-     * @throws TransformerConfigurationException in case of XML errors.
-     * @throws InterruptedException              in case of threading errors.
-     * @throws RatException                      in case of internal errors.
-     */
-    public static void report(PrintStream out, IReportable base, final InputStream style,
-                              ReportConfiguration pConfiguration)
-            throws IOException, TransformerConfigurationException, InterruptedException, RatException {
-        report(new OutputStreamWriter(out), base, style, pConfiguration);
-    }
-
-    /**
-     * Output a report that is styled using a defined stylesheet.
-     *
-     * @param out            the writer to write the report to
-     * @param base           the files or directories to report on
-     * @param style          an input stream representing the stylesheet to use for styling the report
-     * @param pConfiguration current report configuration.
-     * @return the currently collected numerical statistics.
-     * @throws IOException                       in case of I/O errors.
-     * @throws TransformerConfigurationException in case of XML errors.
-     * @throws InterruptedException              in case of threading errors.
-     * @throws RatException                      in case of internal errors.
-     */
-    public static ClaimStatistic report(Writer out, IReportable base, final InputStream style,
-                                        ReportConfiguration pConfiguration)
-            throws IOException, TransformerConfigurationException, InterruptedException, RatException {
-        PipedReader reader = new PipedReader();
-        PipedWriter writer = new PipedWriter(reader);
-        ReportTransformer transformer = new ReportTransformer(out, style, reader);
-        Thread transformerThread = new Thread(transformer);
-        transformerThread.start();
-        final ClaimStatistic statistic = report(base, writer, pConfiguration);
-        writer.flush();
-        writer.close();
-        transformerThread.join();
-        return statistic;
-    }
-
-    /**
-     * @param container      the files or directories to report on
-     * @param out            the writer to write the report to
-     * @param pConfiguration current report configuration.
-     * @return the currently collected numerical statistics.
-     * @throws IOException  in case of I/O errors.
-     * @throws RatException in case of internal errors.
-     */
-    public static ClaimStatistic report(final IReportable container, final Writer out,
-                                        ReportConfiguration pConfiguration) throws IOException, RatException {
-        IXmlWriter writer = new XmlWriter(out);
-        final ClaimStatistic statistic = new ClaimStatistic();
-        RatReport report = XmlReportFactory.createStandardReport(writer, statistic, pConfiguration);
-        report.startReport();
-        container.run(report);
-        report.endReport();
-        writer.closeDocument();
-        return statistic;
-    }
-    
     /**
      * This class implements the {@code Comparator} interface for comparing Options.
      */
@@ -477,17 +304,19 @@ private static class OptionComparator implements Comparator<Option>, Serializabl
 
         private String getKey(Option opt) {
             String key = opt.getOpt();
-            key = key==null?opt.getLongOpt():key;
+            key = key == null ? opt.getLongOpt() : key;
             return key;
         }
+
         /**
-         * Compares its two arguments for order. Returns a negative integer, zero, or a positive integer as the first argument
-         * is less than, equal to, or greater than the second.
+         * Compares its two arguments for order. Returns a negative integer, zero, or a
+         * positive integer as the first argument is less than, equal to, or greater
+         * than the second.
          *
          * @param opt1 The first Option to be compared.
          * @param opt2 The second Option to be compared.
-         * @return a negative integer, zero, or a positive integer as the first argument is less than, equal to, or greater than
-         *         the second.
+         * @return a negative integer, zero, or a positive integer as the first argument
+         * is less than, equal to, or greater than the second.
          */
         @Override
         public int compare(final Option opt1, final Option opt2) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index f4043c881..72f570657 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -18,24 +18,94 @@
  */
 package org.apache.rat;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.license.ILicenseFamily;
-
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.license.MultiplexLicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.report.IReportable;
 
 /**
- * A configuration object is used by the frontend to invoke the
- * {@link Report}. Basically, the sole purpose of the frontends is
- * to create the configuration and invoke the {@link Report}.
+ * A configuration object is used by the frontend to invoke the {@link Report}.
+ * Basically, the sole purpose of the frontends is to create the configuration
+ * and invoke the {@link Report}.
  */
-public class ReportConfiguration {
-    private IHeaderMatcher headerMatcher;
-    private ILicenseFamily[] approvedLicenseNames;
+public class ReportConfiguration implements AutoCloseable {
+    private List<IHeaderMatcher> headerMatcher = new ArrayList<>();
+    private List<ILicenseFamily> approvedLicenseNames = new ArrayList<>();
     private boolean addingLicenses;
     private boolean addingLicensesForced;
     private String copyrightMessage;
     private boolean approveDefaultLicenses = true;
+    private OutputStream out = null;
+    private boolean styleReport = true;
+    private InputStream styleSheet = null;
+    private IReportable reportable = null;
+    private FilenameFilter inputFileFilter = null;
+
+    public FilenameFilter getInputFileFilter() {
+        return inputFileFilter;
+    }
+
+    public void setInputFileFilter(FilenameFilter inputFileFilter) {
+        this.inputFileFilter = inputFileFilter;
+    }
+
+    public IReportable getReportable() {
+        return reportable;
+    }
+
+    public void setReportable(IReportable reportable) {
+        this.reportable = reportable;
+    }
+
+    public InputStream getStyleSheet() {
+        return styleSheet;
+    }
+
+    public void setStyleSheet(InputStream styleSheet) {
+        this.styleSheet = styleSheet;
+    }
+
+    public boolean isStyleReport() {
+        return styleReport;
+    }
+
+    public void setStyleReport(boolean styleReport) {
+        this.styleReport = styleReport;
+    }
+
+    public void setOut(OutputStream out) {
+        this.out = out;
+    }
+
+    /**
+     * Returns the output stream. If no stream has been set returns System.out.
+     * 
+     * @return The output stream to write to.
+     */
+    public OutputStream getOutput() {
+        return out == null ? System.out : out;
+    }
+
+    /**
+     * Returns a PrintWriter that wraps the output stream.
+     * 
+     * @return A PrintWriter that wraps the output stream.
+     */
+    public PrintWriter getWriter() {
+        return new PrintWriter(new OutputStreamWriter(getOutput(), Charset.forName("UTF-8")));
+    }
 
     /**
      * @return whether default licenses shall be approved by default.
@@ -54,7 +124,13 @@ public void setApproveDefaultLicenses(boolean approveDefaultLicenses) {
      * @return the header matcher.
      */
     public IHeaderMatcher getHeaderMatcher() {
-        return headerMatcher;
+        if (headerMatcher.isEmpty()) {
+            return null;
+        }
+        if (headerMatcher.size() == 1) {
+            return headerMatcher.get(0);
+        }
+        return new MultiplexLicense("Report matchers", headerMatcher);
     }
 
     /**
@@ -62,8 +138,8 @@ public IHeaderMatcher getHeaderMatcher() {
      *
      * @param headerMatcher header matcher.
      */
-    public void setHeaderMatcher(IHeaderMatcher headerMatcher) {
-        this.headerMatcher = headerMatcher;
+    public void addHeaderMatcher(IHeaderMatcher headerMatcher) {
+        this.headerMatcher.add(headerMatcher);
     }
 
     /**
@@ -72,33 +148,39 @@ public void setHeaderMatcher(IHeaderMatcher headerMatcher) {
      * @return the set of approved license names.
      */
     public ILicenseFamily[] getApprovedLicenseNames() {
-        return approvedLicenseNames;
+        return approvedLicenseNames.toArray(new ILicenseFamily[approvedLicenseNames.size()]);
     }
 
     /**
-     * Sets the set of approved license names.
+     * Adds to the set of approved license names.
      *
      * @param approvedLicenseNames set of approved license names.
      */
-    public void setApprovedLicenseNames(ILicenseFamily[] approvedLicenseNames) {
-        this.approvedLicenseNames = approvedLicenseNames;
+    public void addApprovedLicenseNames(ILicenseFamily[] approvedLicenseNames) {
+        addApprovedLicenseNames(Arrays.asList(approvedLicenseNames));
     }
 
     /**
-     * Sets the set of approved license names (convenience).
+     * Adds a license to the list of approved license names.
      *
      * @param approvedLicenseNames set of approved license names.
      */
-    public void setApprovedLicenseNames(List<ILicenseFamily> approvedLicenseNames) {
-        if (approvedLicenseNames != null && approvedLicenseNames.size() > 0) {
-            setApprovedLicenseNames(approvedLicenseNames.toArray(new ILicenseFamily[approvedLicenseNames.size()]));
-        }
+    public void addApprovedLicenseName(ILicenseFamily approvedLicenseName) {
+        approvedLicenseNames.add(approvedLicenseName);
+    }
+
+    /**
+     * Adds to the set of approved license names (convenience).
+     *
+     * @param approvedLicenseNames set of approved license names.
+     */
+    public void addApprovedLicenseNames(List<ILicenseFamily> approvedLicenseNames) {
+        this.approvedLicenseNames.addAll(approvedLicenseNames);
     }
 
     /**
-     * @return If Rat is adding license headers: Returns the optional
-     * copyright message. This value is ignored, if no
-     * license headers are added.
+     * @return If Rat is adding license headers: Returns the optional copyright
+     * message. This value is ignored, if no license headers are added.
      * @see #isAddingLicenses()
      */
     public String getCopyrightMessage() {
@@ -106,9 +188,8 @@ public String getCopyrightMessage() {
     }
 
     /**
-     * If Rat is adding license headers: Sets the optional
-     * copyright message. This value is ignored, if no
-     * license headers are added.
+     * If Rat is adding license headers: Sets the optional copyright message. This
+     * value is ignored, if no license headers are added.
      *
      * @param copyrightMessage message to set.
      * @see #setAddingLicenses(boolean)
@@ -118,9 +199,8 @@ public void setCopyrightMessage(String copyrightMessage) {
     }
 
     /**
-     * @return If Rat is adding license headers: Returns, whether adding
-     * license headers is enforced. This value is ignored, if no
-     * license headers are added.
+     * @return If Rat is adding license headers: Returns, whether adding license
+     * headers is enforced. This value is ignored, if no license headers are added.
      * @see #isAddingLicenses()
      */
     public boolean isAddingLicensesForced() {
@@ -128,9 +208,8 @@ public boolean isAddingLicensesForced() {
     }
 
     /**
-     * If Rat is adding license headers: Sets, whether adding
-     * license headers is enforced. This value is ignored, if no
-     * license headers are added.
+     * If Rat is adding license headers: Sets, whether adding license headers is
+     * enforced. This value is ignored, if no license headers are added.
      *
      * @param addingLicensesForced enable/disable forcibly adding licenses.
      * @see #isAddingLicenses()
@@ -159,4 +238,38 @@ public void setAddingLicenses(boolean addingLicenses) {
         this.addingLicenses = addingLicenses;
     }
 
+    public void validate(Consumer<String> logger) throws ConfigurationException {
+        if (reportable == null) {
+            throw new ConfigurationException("Reportable may not be null");
+        }
+        if (headerMatcher.size() == 0) {
+            throw new ConfigurationException("You must specify at least one license" + " matcher");
+        }
+        if (styleSheet != null && !isStyleReport()) {
+            logger.accept("Ignoring stylesheet '%s' because styling is not selected");
+        }
+    }
+
+    @Override
+    public void close() {
+        if (styleSheet != null) {
+            try {
+                styleSheet.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                styleSheet = null;
+            }
+        }
+        if (out != null) {
+            if (out != System.out && out != System.err) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            out = null;
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
new file mode 100644
index 000000000..da92bd8ce
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat;
+
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.PipedReader;
+import java.io.PipedWriter;
+import java.io.PrintStream;
+import java.io.Writer;
+import java.util.List;
+import java.util.regex.PatternSyntaxException;
+
+import org.apache.commons.io.filefilter.NameFileFilter;
+import org.apache.commons.io.filefilter.NotFileFilter;
+import org.apache.commons.io.filefilter.OrFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.api.RatException;
+import org.apache.rat.report.RatReport;
+import org.apache.rat.report.claim.ClaimStatistic;
+import org.apache.rat.report.xml.XmlReportFactory;
+import org.apache.rat.report.xml.writer.IXmlWriter;
+import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
+
+public class Reporter {
+
+    static FilenameFilter parseExclusions(List<String> excludes) throws IOException {
+        final OrFileFilter orFilter = new OrFileFilter();
+        int ignoredLines = 0;
+        for (String exclude : excludes) {
+            try {
+                // skip comments
+                if (exclude.startsWith("#") || StringUtils.isEmpty(exclude)) {
+                    ignoredLines++;
+                    continue;
+                }
+
+                String exclusion = exclude.trim();
+                // interpret given patterns as regular expression, direct file names or
+                // wildcards to give users more choices to configure exclusions
+                orFilter.addFileFilter(new RegexFileFilter(exclusion));
+                orFilter.addFileFilter(new NameFileFilter(exclusion));
+                orFilter.addFileFilter(new WildcardFileFilter(exclusion));
+            } catch (PatternSyntaxException e) {
+                System.err.println("Will skip given exclusion '" + exclude + "' due to " + e);
+            }
+        }
+        System.err.println("Ignored " + ignoredLines + " lines in your exclusion files as comments or empty lines.");
+        return new NotFileFilter(orFilter);
+    }
+
+    private Reporter() {
+        // Do not instantiate
+    }
+
+    /**
+     * @param out - the output stream to receive the styled report
+     * @param configuration - current configuration options.
+     * @return the currently collected numerical statistics.
+     * @throws Exception in case of errors.
+     * @since Rat 0.8
+     */
+    public static ClaimStatistic report(ReportConfiguration configuration) throws Exception {
+        if (configuration.getReportable() != null) {
+            if (configuration.isStyleReport()) {
+                if (configuration.getStyleSheet() == null) {
+                    configuration.setStyleSheet(Defaults.getDefaultStyleSheet());
+                }
+                PipedReader reader = new PipedReader();
+                PipedWriter writer = new PipedWriter();
+                ReportTransformer transformer = new ReportTransformer(configuration.getWriter(),
+                        configuration.getStyleSheet(), reader);
+                Thread transformerThread = new Thread(transformer);
+                transformerThread.start();
+                final ClaimStatistic statistic = report(writer, configuration);
+                writer.flush();
+                writer.close();
+                transformerThread.join();
+                return statistic;
+            }
+            return report(configuration.getWriter(), configuration);
+        }
+        return null;
+    }
+
+    /**
+     * @param container the files or directories to report on
+     * @param out the writer to write the report to
+     * @param configuration current report configuration.
+     * @return the currently collected numerical statistics.
+     * @throws IOException in case of I/O errors.
+     * @throws RatException in case of internal errors.
+     */
+    private static ClaimStatistic report(Writer outputWriter, ReportConfiguration configuration)
+            throws IOException, RatException {
+        IXmlWriter writer = new XmlWriter(outputWriter);
+        final ClaimStatistic statistic = new ClaimStatistic();
+        RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
+        report.startReport();
+        configuration.getReportable().run(report);
+        report.endReport();
+        writer.closeDocument();
+        return statistic;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 3ec499dcd..e0480c4eb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -18,13 +18,23 @@
  */ 
 package org.apache.rat.analysis;
 
+import java.util.Collection;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
 import org.apache.rat.api.Document;
 
+import org.apache.rat.license.ILicenseFamily;
 /**
  * Matches text headers to known licenses.
  */
 public interface IHeaderMatcher {
 
+    /**
+     * Get the identifier for this matcher.
+     * @return the Identifier for this matcher.
+     */
+    String getId();
     /**
      * Resets this matches.
      * Subsequent calls to {@link #match} will accumulate new text.
@@ -42,4 +52,22 @@ public interface IHeaderMatcher {
      * @throws RatHeaderAnalysisException in case of internal RAT errors.
      */
     boolean match(Document subject, String line) throws RatHeaderAnalysisException;
+    
+    /**
+     * Report the license family for this and any contained implementations.
+     * @param consumer the consumer to report to.
+     */
+    void reportFamily(Consumer<ILicenseFamily> consumer);
+    
+    /**
+     * If this HeaderMatcher has an associated LicenseFamily and it matches the comparator then call
+     * the consumer. If this HeaderMatcher is a collection of HeaderMatchers then make the call on each of the 
+     * enclosed HeaderMatchers.
+     * 
+     * @param consumer The consumer for the HeaderMatcher.
+     * @param comparator the test for calling the consumer.
+     */
+    void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator);
+    
+    
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
index 9003fbd0b..e801de3b7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
@@ -20,12 +20,13 @@
 
 import java.util.regex.Pattern;
 
-import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.SimpleLicenseFamily;
 
-public class GeneratedLicenseNotRequired implements IHeaderMatcher {
+public class GeneratedLicenseNotRequired extends BaseLicense {
 
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
@@ -55,7 +56,8 @@ public class GeneratedLicenseNotRequired implements IHeaderMatcher {
         "Generated by Maven",
         "Autogenerated by Thrift",
         "DO NOT EDIT THIS FILE - it is machine generated",
-        "This class was generated by"};
+        "This class was generated by",
+        "Generated by javadoc"};
     
     
     // Uses either patterns or strings currently (not both)
@@ -67,15 +69,18 @@ public GeneratedLicenseNotRequired() {
     }
     
     public GeneratedLicenseNotRequired(final Pattern[] linePatterns) {
+        super(new SimpleLicenseFamily(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN, "Generated Code"), "");
         this.linePatterns = linePatterns;
         this.phrases = EMPTY_STRING_ARRAY;
     }
 
     public GeneratedLicenseNotRequired(final String[] lines) {
+        super(new SimpleLicenseFamily(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN, "Generated Code"), "");
         this.linePatterns = EMPTY_PATTERN_ARRAY;
         this.phrases = lines;
     }
 
+    @Override
     public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
         boolean result = false;
         for (Pattern pat : linePatterns) {
@@ -95,12 +100,11 @@ public boolean match(Document subject, String line) throws RatHeaderAnalysisExce
         return result;
     }
 
-    private void reportOnLicense(Document subject) {
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN);
-    }
+//    public void reportOnLicense(Document subject) {
+//        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN);
+//    }
 
     public void reset() {
         // stateless
     }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java
deleted file mode 100644
index d165b8ea4..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequired.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.generation;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
-/**
- * JavaDocs are generated and so no license is required.
- * It is useful to note these separately.
- */
-public class JavaDocLicenseNotRequired implements IHeaderMatcher {
-
-    private static final String JAVADOC_REGEX_DEFN = "Generated by javadoc";
-    
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        boolean result = line.contains(JAVADOC_REGEX_DEFN);
-        if (result) {
-            reportOnLicense(subject);
-        }
-        return result;
-    }
-
-    private void reportOnLicense(Document subject) {
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN);
-    }
-    
-    public void reset() {
-        // stateless
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
deleted file mode 100644
index 34b6ab934..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * Matches Apache License, Version 2.0
- *
- */
-public final class ApacheSoftwareLicense20 extends SimplePatternBasedLicense {
-    public static final String FIRST_LICENSE_LINE = "Licensed under the Apache License, Version 2.0 (the \"License\")";
-    public static final String FIRST_LICENSE_LINE_SHORT = "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.";
-    public static final String LICENSE_REFERENCE_LINE = "http://www.apache.org/licenses/LICENSE-2.0";
-
-    // These are all allowed variants as mentioned in https://issues.apache.org/jira/browse/LEGAL-265
-    public static final String LICENSE_URL_HTTP       = LICENSE_REFERENCE_LINE;
-    public static final String LICENSE_URL_HTTPS      = "https://www.apache.org/licenses/LICENSE-2.0";
-    public static final String LICENSE_URL_HTTP_HTML  = "http://www.apache.org/licenses/LICENSE-2.0.html";
-    public static final String LICENSE_URL_HTTPS_HTML = "https://www.apache.org/licenses/LICENSE-2.0.html";
-    public static final String LICENSE_URL_HTTP_TXT   = "http://www.apache.org/licenses/LICENSE-2.0.txt";
-    public static final String LICENSE_URL_HTTPS_TXT  = "https://www.apache.org/licenses/LICENSE-2.0.txt";
-    public ApacheSoftwareLicense20() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL, MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,
-                "", new String[]{FIRST_LICENSE_LINE, FIRST_LICENSE_LINE_SHORT,
-                        LICENSE_URL_HTTP,       LICENSE_URL_HTTPS,
-                        LICENSE_URL_HTTP_HTML,  LICENSE_URL_HTTPS_HTML,
-                        LICENSE_URL_HTTP_TXT,   LICENSE_URL_HTTPS_TXT,});
-    }
-}
-
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
deleted file mode 100644
index 65da0f92f..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
-/**
- * Matches an applied AL 2.0 License header, including a <em>required</em>
- * initial copyright header line, conforming the <a href="https://apache.org/licenses/LICENSE-2.0.html#apply">template</a>
- * from the AL 2.0 license itself.
- *
- * @since Rat 0.9
- */
-public class AppliedApacheSoftwareLicense20 extends CopyrightHeader {
-
-    public static final String ASL20_LICENSE_DEFN
-            = "Licensed under the Apache License, Version 2.0 (the \"License\");\n"
-            + "you may not use this file except in compliance with the License.\n"
-            + "You may obtain a copy of the License at\n"
-            + "http://www.apache.org/licenses/LICENSE-2.0\n"
-            + "Unless required by applicable law or agreed to in writing, software\n"
-            + "distributed under the License is distributed on an \"AS IS\" BASIS,\n"
-            + "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
-            + "See the License for the specific language governing permissions and\n"
-            + "limitations under the License.\n";
-
-    private final FullTextMatchingLicense textMatcher;
-
-    public AppliedApacheSoftwareLicense20() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL, MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,"");
-        textMatcher = new FullTextMatchingLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL, MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,"",ASL20_LICENSE_DEFN);
-    }
-
-    public AppliedApacheSoftwareLicense20(String copyrightOwner) {
-        this();
-        setCopyrightOwner(copyrightOwner);
-    }
-
-    @Override
-    public boolean match(Document subject, String s) throws RatHeaderAnalysisException {
-        if (isCopyrightMatch()) {
-            return textMatcher.match(subject, s); // will report the match if it has occurred
-        }
-        else {
-            matchCopyright(s);
-        }
-        return false;
-    }
-
-    @Override
-    public void reset() {
-        super.reset();
-        textMatcher.reset();
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index aaed1d049..fd880912c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -18,47 +18,66 @@
  */ 
 package org.apache.rat.analysis.license;
 
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
 
-public abstract class BaseLicense implements IHeaderMatcher{
-    private String licenseFamilyCategory;
-    private String licenseFamilyName;
-    private String notes;
+/*
+ * Todo move to bulder pattern
+ */
 
-//    public BaseLicense() {
-//    }
+public abstract class BaseLicense implements IHeaderMatcher {
+    private ILicenseFamily family;
+    private String notes;
+    private String idPrefix;
 
-    public BaseLicense(final MetaData.Datum licenseFamilyCategory, final MetaData.Datum licenseFamilyName, final String notes)
-    {
-        if (!MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY.equals(licenseFamilyCategory.getName())) {
-            throw new IllegalStateException("Expected " + MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY
-                    + ", got " + licenseFamilyCategory.getName());
-        }
-        setLicenseFamilyCategory(licenseFamilyCategory.getValue());
-        if (!MetaData.RAT_URL_LICENSE_FAMILY_NAME.equals(licenseFamilyName.getName())) {
-            throw new IllegalStateException("Expected " + MetaData.RAT_URL_LICENSE_FAMILY_NAME
-                    + ", got " + licenseFamilyName.getName());
-        }
-        setLicenseFamilyName(licenseFamilyName.getValue());
-        setNotes(notes);
+    public BaseLicense(ILicenseFamily family, String notes) {
+        this(family, notes, null);
+    }
+    
+    public BaseLicense(ILicenseFamily family, String notes, String idPrefix) {
+        this.family = family;
+        this.notes = notes;
+        this.idPrefix = idPrefix;
+    }
+    
+    @Override
+    public String toString() {
+        return getId();
+    }
+    
+    public String getId() {
+        return String.format( "%s:%s:%s", idPrefix==null?"":idPrefix, family.getFamilyCategory(), this.getClass().getSimpleName());
     }
 
-    public String getLicenseFamilyCategory() {
-        return licenseFamilyCategory;
+    public String getIdPrefix() {
+        return idPrefix;
     }
 
-    public void setLicenseFamilyCategory(String pDocumentCategory) {
-        licenseFamilyCategory = pDocumentCategory;
+    public void setIdPrefix(String idPrefix) {
+        this.idPrefix = idPrefix;
     }
 
-    public String getLicenseFamilyName() {
-        return licenseFamilyName;
+    public ILicenseFamily getLicenseFamily() {
+        return family;
     }
 
-    public void setLicenseFamilyName(String pLicenseFamilyCategory) {
-        licenseFamilyName = pLicenseFamilyCategory;
+    public void setLicenseFamilyCategory(String category) {
+        this.family = new SimpleLicenseFamily(category, family == null? null : family.getFamilyName());
+    }
+    
+    public void setLicenseFamilyName(String name) {
+        this.family = new SimpleLicenseFamily(family == null? null : family.getFamilyCategory(), name);
     }
 
     public String getNotes() {
@@ -72,10 +91,9 @@ public void setNotes(String pNotes) {
     public final void reportOnLicense(Document subject) {
         final MetaData metaData = subject.getMetaData();
         metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
-        final String licFamilyCategory = getLicenseFamilyCategory();
-        metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, licFamilyCategory));
-        metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, licFamilyCategory));
-        metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, getLicenseFamilyName()));
+        metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, family.getFamilyCategory()));
+        metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, family.getFamilyCategory()));
+        metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, family.getFamilyName()));
     }
 
     /**
@@ -94,4 +112,16 @@ protected static final String prune(String text) {
         }
         return buffer.toString();
     }
+
+    @Override
+    public void reportFamily(Consumer<ILicenseFamily> consumer) {
+        consumer.accept(family);
+    }
+
+    @Override
+    public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
+        if (comparator.test(family)) {
+            consumer.accept(this);
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CDDL1License.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CDDL1License.java
deleted file mode 100644
index d731ef5cc..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CDDL1License.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
-/**
- * Base CDDL 1.0 license.
- */
-public class CDDL1License extends BaseLicense implements IHeaderMatcher {
-
-    public static final String CDDL1_LICENSE_DEFN
-            = "The contents of this file are subject to the terms of the Common Development\n"
-            + "and Distribution License(\"CDDL\") (the \"License\"). You may not use this file\n"
-            + "except in compliance with the License.\n\n";
-
-    public static final String CDDL1_LICENSE_DEFN_ILLUMOS_STYLE
-            = "The contents of this file are subject to the terms of the\n"
-            + "Common Development and Distribution License (the \"License\")\n"
-            + "You may not use this file except in compliance with the License.\n";
-
-    private final FullTextMatchingLicense textMatcherBase;
-    private final FullTextMatchingLicense textMatcherIllumosStyle;
-
-
-    public CDDL1License() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1,
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1,
-                "");
-        textMatcherBase = new FullTextMatchingLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1,
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1,
-                "", CDDL1_LICENSE_DEFN);
-        textMatcherIllumosStyle = new FullTextMatchingLicense(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1,
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1,
-                "", CDDL1_LICENSE_DEFN_ILLUMOS_STYLE);
-    }
-
-    public boolean match(Document subject, String s) throws RatHeaderAnalysisException {
-        return textMatcherBase.match(subject, s) ||
-                textMatcherIllumosStyle.match(subject, s);
-    }
-
-    public void reset() {
-        textMatcherBase.reset();
-        textMatcherIllumosStyle.reset();
-    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
index 1dc4d6f94..553b67a1b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
@@ -22,6 +22,7 @@
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.license.ILicenseFamily;
 
 import java.util.regex.Pattern;
 
@@ -44,7 +45,7 @@
  *
  * @since Rat 0.9
  */
-public class CopyrightHeader extends BaseLicense implements IHeaderMatcher {
+public class CopyrightHeader extends BaseLicense {
 
     public static final String COPYRIGHT_PREFIX_PATTERN_DEFN = ".*Copyright [0-9]{4}(\\-[0-9]{4})? ";
 
@@ -52,17 +53,18 @@ public class CopyrightHeader extends BaseLicense implements IHeaderMatcher {
     private String copyrightOwner;
     private boolean copyrightMatch = false;
 
-//    public CopyrightHeader() {
-//    }
-
-    protected CopyrightHeader(Datum licenseFamilyCategory, Datum licenseFamilyName, String notes) {
-        super(licenseFamilyCategory, licenseFamilyName, notes);
+    protected CopyrightHeader(ILicenseFamily licenseFamily, String notes) {
+        super(licenseFamily, notes);
     }
 
-    public CopyrightHeader(Datum licenseFamilyCategory, Datum licenseFamilyName, String notes, String copyrightOwner) {
-        this(licenseFamilyCategory, licenseFamilyName, notes);
+    public CopyrightHeader(String idPrefix, ILicenseFamily licenseFamily, String notes, String copyrightOwner) {
+        super(licenseFamily, notes, idPrefix);
         setCopyrightOwner(copyrightOwner);
     }
+    
+    public CopyrightHeader(ILicenseFamily licenseFamily, String notes, String copyrightOwner) {
+        this(null, licenseFamily, notes, copyrightOwner);
+    }
 
     // Called by ctor, so must not be overridden
     public final void setCopyrightOwner(String copyrightOwner) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java
deleted file mode 100644
index a5c00d5ba..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DojoLicenseHeader.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-
-public class DojoLicenseHeader extends SimplePatternBasedLicense {
-    private static final String LICENSE_URL  = "http://dojotoolkit.org/community/licensing.shtml";
-    
-    //  Copyright (c) 2004-2006, The Dojo Foundation
-    // All Rights Reserved.
-    //
-    // Licensed under the Academic Free License version 2.1 or above OR the
-    // modified BSD license. For more information on Dojo licensing, see:
-    //
-    //    http://dojotoolkit.org/community/licensing.shtml
-
-    public DojoLicenseHeader() {
-        // TODO: support for dual licensing
-        // TODO: support for or higher clauses
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_DOJO, MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE, "Dual license AFL/BSD",
-                new String[]{LICENSE_URL});
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index be3daad58..d16d8a033 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -23,7 +23,7 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.license.ILicenseFamily;
 
 /**
  * Accumulates all letters and numbers contained inside the header and
@@ -35,8 +35,7 @@
  *
  * @since Rat 0.9
  */
-public class FullTextMatchingLicense extends BaseLicense
-    implements IHeaderMatcher {
+public class FullTextMatchingLicense extends BaseLicense {
 
     // Number of match characters assumed to be present on first line
     private static final int DEFAULT_INITIAL_LINE_LENGTH = 20;
@@ -48,15 +47,29 @@ public class FullTextMatchingLicense extends BaseLicense
     private boolean seenFirstLine = false;
 
     private final StringBuilder buffer = new StringBuilder();
+    
+    public FullTextMatchingLicense(ILicenseFamily licenseFamily) {
+        this(licenseFamily, null);
+    }
+    
+    public FullTextMatchingLicense(ILicenseFamily licenseFamily, String notes) {
+        this(null, licenseFamily, notes);
+    }
+    
+    public FullTextMatchingLicense(String idPrefix, ILicenseFamily licenseFamily, String notes) {
+        super(licenseFamily, notes, idPrefix);
+    }
+    
+    public FullTextMatchingLicense(ILicenseFamily family,
+            String notes,
+            String fullText) {
+        this(null, family, notes, fullText);
+    }
 
-//    public FullTextMatchingLicense() {
-//    }
-
-    public FullTextMatchingLicense(Datum licenseFamilyCategory,
-                                      Datum licenseFamilyName,
+    public FullTextMatchingLicense(String idPrefix, ILicenseFamily family,
                                       String notes,
                                       String fullText) {
-        super(licenseFamilyCategory, licenseFamilyName, notes);
+        super(family, notes, idPrefix);
         setFullText(fullText);
     }
 
@@ -74,6 +87,7 @@ public final boolean hasFullText() {
         return fullText != null;
     }
 
+    @Override
     public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
         final String inputToMatch = prune(line).toLowerCase(Locale.ENGLISH);
         if (seenFirstLine) { // Accumulate more input
@@ -95,19 +109,20 @@ public boolean match(Document subject, String line) throws RatHeaderAnalysisExce
             if (buffer.toString().contains(fullText)) {
                 reportOnLicense(subject);
                 return true; // we found a match
-            } else { // buffer contains first line but does not contain full text
-                // It's possible that the buffer contains the first line again
-                int offset = buffer.substring(1).indexOf(firstLine);
-                if (offset >= 0) { // first line found again
-                    buffer.delete(0,offset); // reset buffer to the new start
-                } else { // buffer does not even contain first line, so cannot be used to match full text
-                    init();
-                }
+            } 
+            // buffer contains first line but does not contain full text
+            // It's possible that the buffer contains the first line again
+            int offset = buffer.substring(1).indexOf(firstLine);
+            if (offset >= 0) { // first line found again
+                buffer.delete(0,offset); // reset buffer to the new start
+            } else { // buffer does not even contain first line, so cannot be used to match full text
+                init();
             }
         }
         return false;
     }
 
+    @Override
     public void reset() {
         init();
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL1License.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL1License.java
deleted file mode 100644
index 5c9409292..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL1License.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * License matches GPL1 or later.
- */
-public class GPL1License extends FullTextMatchingLicense {
-    public static final String FIRST_LICENSE_LINE = "This program is free software; you can redistribute it and/or modify\n" +
-            " it under the terms of the GNU General Public License as published by\n" +
-            " the Free Software Foundation; either version 1, or (at your option)\n" +
-            " any later version.";
-
-    public GPL1License() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL1,
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1,
-                "", FIRST_LICENSE_LINE);
-    }
-}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL2License.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL2License.java
deleted file mode 100644
index ed9259235..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL2License.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * License matches GPL2 or later.
- */
-public class GPL2License extends FullTextMatchingLicense {
-    public static final String FIRST_LICENSE_LINE = "This program is free software; you can redistribute it and/or\n" +
-            " modify it under the terms of the GNU General Public License\n" +
-            " as published by the Free Software Foundation; either version 2\n" +
-            " of the License, or (at your option) any later version.";
-
-    public GPL2License() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL2,
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2,
-                "", FIRST_LICENSE_LINE);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL3License.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL3License.java
deleted file mode 100644
index c9a84fdce..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/GPL3License.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * License matches GPL3 or later.
- */
-public class GPL3License extends FullTextMatchingLicense {
-    public static final String FIRST_LICENSE_LINE = "This program is free software: you can redistribute it and/or modify\n" +
-            " it under the terms of the GNU General Public License as published by\n" +
-            " the Free Software Foundation, either version 3 of the License, or\n" +
-            " (at your option) any later version.";
-
-    public GPL3License() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL3,
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_3,
-                "", FIRST_LICENSE_LINE);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java
deleted file mode 100644
index d622470b9..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * Base MIT license (all 3 parts).
- */
-public class MITLicense extends FullTextMatchingLicense {
-    public static final String FIRST_LICENSE_LINE = "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:";
-    public static final String MIDDLE_LICENSE_LINE = "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.";
-    public static final String AS_IS_LICENSE_LINE = "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.";
-
-    public MITLicense() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT,
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MIT,
-                "", FIRST_LICENSE_LINE + MIDDLE_LICENSE_LINE + AS_IS_LICENSE_LINE);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
index 2f39366e6..f203d0d96 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
@@ -1,20 +1,34 @@
 package org.apache.rat.analysis.license;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
 
-public class MultiplexLicense extends BaseLicense {
+public class MultiplexLicense implements IHeaderMatcher {
     
-    private Collection<BaseLicense> enclosed;
+    private Collection<IHeaderMatcher> enclosed;
+    private String id;
     
-    public MultiplexLicense(final MetaData.Datum licenseFamilyCategory, final MetaData.Datum licenseFamilyName, final String notes, Collection<BaseLicense> enclosed) {
-        super(licenseFamilyCategory, licenseFamilyName, notes);
-        this.enclosed = enclosed;
+    public MultiplexLicense(String id, Collection<IHeaderMatcher> enclosed) {
+        this.id = id;
+        this.enclosed = new ArrayList<>(enclosed);
     }
 
+    @Override
+    public String toString() {
+        return getId();
+    }
+    
+    public String getId() {
+        return id;
+    }
+    
     @Override
     public void reset() {
         enclosed.stream().forEach(x -> x.reset());
@@ -22,12 +36,22 @@ public void reset() {
 
     @Override
     public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        for (BaseLicense lic : enclosed) {
-            if (lic.match(subject, line)) {
+        for (IHeaderMatcher matcher : enclosed) {
+            if (matcher.match(subject, line)) {
                 return true;
             }
         }
         return false;
     }
 
+    @Override
+    public void reportFamily(Consumer<ILicenseFamily> consumer) {
+        enclosed.forEach(x -> x.reportFamily(consumer));
+    }
+    
+    @Override
+    public void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
+        enclosed.forEach(x -> x.extractMatcher(matchers, comparator));
+    }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
deleted file mode 100644
index 234dfefc8..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/OASISLicense.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import java.util.regex.Pattern;
-
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
-/**
- * Looks for documents contain the OASIS copyright claim plus derivative work clause.
- * Perhaps need to match more.
- */
-public class OASISLicense extends FullTextMatchingLicense {
-
-    private static final String COPYRIGHT_PATTERN_DEFN = ".*Copyright\\s.*OASIS Open.*";
-    private static final String CLAUSE_DEFN
-    = "This document and translations of it may be copied and furnished to others and derivative works" +
-            "that comment on or otherwise explain it or assist in its implementation may be prepared" +
-            "copied published and distributed";
-    
-    private static final Pattern COPYRIGHT_PATTERN = Pattern.compile(COPYRIGHT_PATTERN_DEFN);
-
-    boolean copyrightMatch = false;
-    
-    public OASISLicense() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS,
-              MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE,
-              "No modifications allowed",
-              CLAUSE_DEFN);
-    }
-
-    @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        boolean result = false;
-        if (copyrightMatch) {
-            result = super.match(subject, line);
-        } else {
-            copyrightMatch = COPYRIGHT_PATTERN.matcher(line).matches();
-        }
-        return result;
-    }
-
-    @Override
-    public void reset() {
-        copyrightMatch = false;
-        super.reset();
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
index 3d9608951..49baffba3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
@@ -15,64 +15,75 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis.license;
 
 import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
 import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
 
 /**
- * Defines a matcher for an SPDX tag.  SPDX tag is of the format
- * {@code SPDX-License-Identifier: short-name} where {@code short-name} matches the regex pattern
- * [A-Za-z0-9\.\-]+
- * <p>SPDX identifiers are specified by the Software Package Data Exchange(R) also known as SPDX(R) project
- * from the Linux foundation.</p>
+ * Defines a matcher for an SPDX tag. SPDX tag is of the format
+ * {@code SPDX-License-Identifier: short-name} where {@code short-name} matches
+ * the regex pattern [A-Za-z0-9\.\-]+
+ * <p>
+ * SPDX identifiers are specified by the Software Package Data Exchange(R) also
+ * known as SPDX(R) project from the Linux foundation.
+ * </p>
  * 
  * @see https://spdx.dev/ids/
  */
 public class SPDXMatcher implements IHeaderMatcher {
 
     /**
-     * Creates IHeaderMatcher instances that are a collection of SPDXMatcher instances.  Used in the
-     * default matcher construction.
+     * Creates IHeaderMatcher instances that are a collection of SPDXMatcher
+     * instances. Used in the default matcher construction.
      */
-    private static final Map<String,SPDXMatcher.Match> matchers = new HashMap<>();
-    
+    private static final Map<String, SPDXMatcher.Match> matchers = new HashMap<>();
+
     public static final SPDXMatcher INSTANCE = new SPDXMatcher();
 
     private static Pattern groupSelector = Pattern.compile(".*SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)");
-  
+
     /**
      * Constructor.
-     * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
+     * 
+     * @param spdxId A regular expression that matches the @{short-name} of the SPDX
+     * Identifier.
      * @param licenseFamilyCategory the RAT license family category for the license.
      * @param licenseFamilyName the RAT license family name for the license.
      */
-    private SPDXMatcher() {};
-    
-    public BaseLicense register(final String spdxId, final MetaData.Datum licenseFamilyCategory,
-            final MetaData.Datum licenseFamilyName, String notes) {
-        Match matcher = new Match(spdxId, licenseFamilyCategory, licenseFamilyName, notes);
+    private SPDXMatcher() {
+    };
+
+    public BaseLicense register(String idPrefix, final ILicenseFamily licenseFamily, String notes, final String spdxId) {
+        Match matcher = new Match(idPrefix, licenseFamily, notes, spdxId);
         matchers.put(spdxId, matcher);
         return matcher;
     }
 
+    @Override
+    public String toString() {
+        return getId();
+    }
+    
+    @Override
+    public String getId() {
+        return "SPDXMatcher";
+    }
+
     public boolean isActive() {
         return !matchers.isEmpty();
     }
 
-    
     @Override
     public void reset() {
     }
@@ -81,28 +92,39 @@ public void reset() {
     public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
         Matcher matcher = groupSelector.matcher(line);
         if (matcher.find()) {
-            BaseLicense data = matchers.get(matcher.group(1));
-            if (data != null) {
-                data.reportOnLicense(subject);
+            Match match = matchers.get(matcher.group(1));
+            if (match != null) {
+                match.reportOnLicense(subject);
                 return true;
             }
         }
         return false;
     }
-    
+
+    @Override
+    public void reportFamily(Consumer<ILicenseFamily> consumer) {
+        matchers.values().forEach(x -> x.reportFamily(consumer));
+    }
+
+    @Override
+    public void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
+        SPDXMatcher.matchers.values().forEach(x -> x.extractMatcher(matchers, comparator));
+    }
+
     public class Match extends BaseLicense {
         String spdx;
-        
+
         /**
          * Constructor.
-         * @param spdxId A regular expression that matches the @{short-name} of the SPDX Identifier.
+         * 
+         * @param spdxId A regular expression that matches the @{short-name} of the SPDX
+         * Identifier.
          * @param licenseFamilyCategory the RAT license family category for the license.
          * @param licenseFamilyName the RAT license family name for the license.
          * @param notes The notes for this matcher.
          */
-        Match(final String spdxId, final MetaData.Datum licenseFamilyCategory,
-            final MetaData.Datum licenseFamilyName, String notes) {
-            super( licenseFamilyCategory,licenseFamilyName, notes);
+        Match(String idPrefix, final ILicenseFamily licenseFamily, String notes, final String spdxId ) {
+            super(licenseFamily, notes, idPrefix);
             spdx = spdxId;
         }
 
@@ -110,9 +132,23 @@ public class Match extends BaseLicense {
         public void reset() {
         }
 
+        /*
+         * This method only gets called during testing and othe cases where individual matchers are executed.
+         * In this case we need to call the SPDXMatcher match method.
+         */
+        @Override
+        public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
+            return SPDXMatcher.this.match(subject, line);
+        }
+
+        @Override
+        public String getId() {
+            return String.format("%s: %s", SPDXMatcher.this.getId(), spdx);
+        }
+        
         @Override
-        public boolean match(Document subject, String line) {
-            return false;
+        public String toString() {
+            return getId();
         }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
index 110723e3f..aafdcbde1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -15,27 +15,47 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData.Datum;
-
+import org.apache.rat.license.ILicenseFamily;
 
 /**
  * @since Rat 0.8
  */
-public class SimplePatternBasedLicense extends BaseLicense implements IHeaderMatcher {
+public class SimplePatternBasedLicense extends BaseLicense {
     private String[] patterns;
 
-    public SimplePatternBasedLicense(Datum pLicenseFamilyCategory, Datum pLicenseFamilyName,
-            String pNotes, String[] pPatterns) {
-        super(pLicenseFamilyCategory, pLicenseFamilyName, pNotes);
-        setPatterns(pPatterns);
+    /**
+     * Creates a pattern based license with full documentation.
+     * 
+     * @param pLicenseFamilyCategory
+     * @param pLicenseFamilyName
+     * @param pNotes
+     * @param pPatterns
+     */
+    public SimplePatternBasedLicense(ILicenseFamily licenseFamily, String notes, String[] patterns) {
+        this(null,licenseFamily, notes, patterns);
     }
     
+    public SimplePatternBasedLicense(String idPrefix, ILicenseFamily licenseFamily, String notes, String[] patterns) {
+        super(licenseFamily, notes, idPrefix);
+        setPatterns(patterns);
+    }
+
+    /**
+     * Creates a pattern based license without patterns.
+     * 
+     * @param pLicenseFamilyCategory
+     * @param pLicenseFamilyName
+     * @param pNotes
+     */
+    protected SimplePatternBasedLicense(ILicenseFamily licenseFamily, String notes) {
+        super(licenseFamily, notes);
+    }
+
     public String[] getPatterns() {
         return patterns;
     }
@@ -57,11 +77,13 @@ protected boolean matches(String pLine) {
         }
         return false;
     }
-    
+
+    @Override
     public void reset() {
         // Nothing to do
     }
 
+    @Override
     public boolean match(Document pSubject, String pLine) throws RatHeaderAnalysisException {
         final boolean result = matches(pLine);
         if (result) {
@@ -69,4 +91,5 @@ public boolean match(Document pSubject, String pLine) throws RatHeaderAnalysisEx
         }
         return result;
     }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java
deleted file mode 100644
index 3b4959581..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/TMF854LicenseHeader.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-
-public class TMF854LicenseHeader extends SimplePatternBasedLicense {
-    
-    private static final String COPYRIGHT_HEADER = "TMF854 Version 1.0 - Copyright TeleManagement Forum";
-    
-    //  TMF854 Version 1.0 - Copyright TeleManagement Forum 
-
-    public TMF854LicenseHeader() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_TMF, 
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE, "BSD",
-                new String[]{COPYRIGHT_HEADER});
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java
deleted file mode 100644
index af51a0354..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CDocLicense.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-public class W3CDocLicense extends SimplePatternBasedLicense {
-
-    private static final String NOTES 
-        = "Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";
-    private static final String COPYRIGHT_URL 
-    = "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231";
-    
-    public W3CDocLicense() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD, 
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT,  NOTES,
-                new String[]{COPYRIGHT_URL});
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java
deleted file mode 100644
index 4325397ef..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/W3CLicense.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.MetaData;
-
-public class W3CLicense extends SimplePatternBasedLicense {
-
-    private static final String NOTES 
-        = "Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.";
-    private static final String COPYRIGHT_URL 
-    = "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231";
-    
-    public W3CLicense() {
-        super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3C, 
-                MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_SOFTWARE_COPYRIGHT,  NOTES,
-                new String[]{COPYRIGHT_URL});
-        
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
deleted file mode 100644
index 8228fb0cc..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/util/HeaderMatcherMultiplexer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.util;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Delegates to an ordered set of matchers.
- *
- */
-public final class HeaderMatcherMultiplexer implements IHeaderMatcher {
-
-    private final Collection<? extends IHeaderMatcher> matchers;
-
-    public HeaderMatcherMultiplexer(final Collection<? extends IHeaderMatcher> matchers) {
-        this.matchers = matchers;
-    }
-
-    @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        boolean result = false;
-        for (IHeaderMatcher matcher : matchers) {
-            result = matcher.match(subject, line);
-            if (result) {
-                break;
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public void reset() {
-        for (IHeaderMatcher matcher : matchers) {
-            matcher.reset();
-        }
-    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java b/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java
index e7e73fc93..5bdb6831f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java
@@ -31,14 +31,14 @@ public class ConfigurationUtil {
      * @param approvedLicenses list of license family implementations.
      * @return extracted names of given license families.
      */
-    public static final List<String> toNames(final ILicenseFamily[] approvedLicenses) {
-        List<String> names = new ArrayList<>();
-        if (approvedLicenses != null && approvedLicenses.length > 0) {
-            for (ILicenseFamily approvedFamily : approvedLicenses) {
-                names.add(approvedFamily.getFamilyName());
-            }
-        }
-        return names;
-    }
+//    public static final List<String> toNames(final ILicenseFamily[] approvedLicenses) {
+//        List<String> names = new ArrayList<>();
+//        if (approvedLicenses != null && approvedLicenses.length > 0) {
+//            for (ILicenseFamily approvedFamily : approvedLicenses) {
+//                names.add(approvedFamily.getFamilyName());
+//            }
+//        }
+//        return names;
+//    }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
index 8e12d16f1..fe1507596 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
@@ -18,18 +18,15 @@
  */
 package org.apache.rat.configuration;
 
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
+import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.List;
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
 
 import org.apache.commons.configuration2.CompositeConfiguration;
 import org.apache.commons.configuration2.Configuration;
@@ -38,13 +35,14 @@
 import org.apache.commons.configuration2.builder.fluent.Parameters;
 import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
 import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.CopyrightHeader;
 import org.apache.rat.analysis.license.FullTextMatchingLicense;
 import org.apache.rat.analysis.license.MultiplexLicense;
 import org.apache.rat.analysis.license.SPDXMatcher;
 import org.apache.rat.analysis.license.SimplePatternBasedLicense;
-import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
 
 /*
  *          *  
@@ -64,26 +62,26 @@ public class ConfigurationReader implements Reader {
     public ConfigurationReader() {
         configuration = new CompositeConfiguration();
     }
-    
+
+    @Override
     public void add(URL url) {
         try {
             read(url);
         } catch (ConfigurationException e) {
             throw new RuntimeException(e);
         }
-        
+
     }
 
     public void read(URL... urls) throws ConfigurationException {
         FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
                 PropertiesConfiguration.class);
-        PropertiesBuilderParameters parameters = new Parameters().properties()
-                .setThrowExceptionOnMissing(true);
+        PropertiesBuilderParameters parameters = new Parameters().properties().setThrowExceptionOnMissing(true);
 
-      for (URL url : urls) {
-          parameters.setURL(url);
-          add(builder.configure(parameters).getConfiguration());
-      }
+        for (URL url : urls) {
+            parameters.setURL(url);
+            add(builder.configure(parameters).getConfiguration());
+        }
     }
 
     public void add(Configuration cfg) {
@@ -91,86 +89,64 @@ public void add(Configuration cfg) {
     }
 
     @Override
-    public Map<String, MetaData> readFamilies() {
-        Map<String, MetaData> licenseFamilies = new HashMap<>();
+    public SortedSet<ILicenseFamily> readFamilies() {
+        SortedSet<ILicenseFamily> licenseFamilies = new TreeSet<>();
         Configuration families = configuration.subset("family");
         Iterator<String> iter = families.getKeys();
         while (iter.hasNext()) {
-            MetaData meta = new MetaData();
             String cat = iter.next();
-            String category = cat.concat("     ").substring(0, 5);
-            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, category));
-            meta.add(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, families.getString(cat)));
-            licenseFamilies.put(cat.trim(), meta);
+            ILicenseFamily fam = new SimpleLicenseFamily(cat, families.getString(cat));
+            licenseFamilies.add(new SimpleLicenseFamily(cat, families.getString(cat)));
         }
         return licenseFamilies;
     }
-    
+
     Set<String> extractKeys(Configuration cfg) {
         Iterator<String> iter = cfg.getKeys();
         Set<String> ids = new TreeSet<>();
         while (iter.hasNext()) {
-            ids.add( iter.next().split("\\.")[0]);
+            ids.add(iter.next().split("\\.")[0]);
         }
         return ids;
     }
 
     @Override
-    public Map<String,BaseLicense> readLicenses() {
-        Map<String,MetaData> families = readFamilies();
-        Map<String,BaseLicense> result = new LinkedHashMap<>();
-        List<BaseLicense> licenses = new ArrayList<BaseLicense>();
+    public Collection<IHeaderMatcher> readLicenses() {
+        SortedSet<ILicenseFamily> families = readFamilies();
+        Collection<IHeaderMatcher> result = new ArrayList<>();
+        List<IHeaderMatcher> licenses = new ArrayList<>();
         Configuration licenseConfig = configuration.subset("license");
         for (String id : extractKeys(licenseConfig)) {
             Configuration lic = licenseConfig.subset(id);
-            String familyId = lic.getString("family").trim();
-            MetaData family = families.get(familyId);
-            if (family == null) {
-                throw new IllegalArgumentException( String.format( "license %s uses family %s which is missing", id, familyId));
+            ILicenseFamily licenseFamily = ILicenseFamily.searchSet(families, lic.getString("family"));
+            if (licenseFamily == null) {
+                throw new IllegalArgumentException(
+                        String.format("license %s uses family %s which is missing", id, lic.getString("family")));
             }
-            Set<String> keys=extractKeys(lic);
+            Set<String> keys = extractKeys(lic);
             String notes = lic.getString("notes", "");
-            if (keys.contains("fullText"))
-            {
-                licenses.add( new FullTextMatchingLicense(
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        notes,
-                        lic.getString("fullText")));
+            if (keys.contains("fullText")) {
+                licenses.add(new FullTextMatchingLicense(id, licenseFamily, notes, lic.getString("fullText")));
             }
             if (keys.contains("copyright")) {
-                licenses.add( new CopyrightHeader(
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        notes,
-                        lic.getString("copyright")));
+                licenses.add(new CopyrightHeader(id, licenseFamily, notes, lic.getString("copyright")));
             }
             if (keys.contains("text")) {
                 Configuration text = lic.subset("text");
                 Set<String> txtKeys = extractKeys(text);
-                List<String> texts = txtKeys.stream()
-                        .map(text::getString).collect(Collectors.toList()); 
-                licenses.add( new SimplePatternBasedLicense(
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        notes,
-                        texts.toArray( new String[texts.size()])));
+                List<String> texts = txtKeys.stream().map(text::getString).collect(Collectors.toList());
+                licenses.add(
+                        new SimplePatternBasedLicense(id, licenseFamily, notes, texts.toArray(new String[texts.size()])));
             }
             if (keys.contains("spdx")) {
-                licenses.add(SPDXMatcher.INSTANCE.register(lic.getString("spdx"),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        notes
-                        ));
+                licenses.add(SPDXMatcher.INSTANCE.register(id, licenseFamily, notes, lic.getString("spdx")));
             }
             if (licenses.size() == 1) {
-                result.put(id, licenses.get(0));
+                result.add(licenses.get(0));
                 licenses.clear();
             } else if (licenses.size() > 1) {
-                result.put(id,  new MultiplexLicense(family.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                        family.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME),
-                        notes,licenses));
-                licenses = new ArrayList<BaseLicense>();
+                result.add(new MultiplexLicense(id, licenses));
+                licenses = new ArrayList<>();
             }
         }
         return result;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
index 10e08605f..7d6a9389b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
@@ -21,22 +21,25 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.Map;
+import java.util.SortedSet;
 
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
 
 public interface Reader {
     void add(URL url);
 
     /**
      * Reads the configuration and extracts the Family metadata indexed by category id.
-     * @return Map of Category id to associated Metadata.
+     * @return SortedSet of ILicenseFamily objects
      */
-    Map<String,MetaData> readFamilies();
+    SortedSet<ILicenseFamily> readFamilies();
     
     /**
      * Reads the configuration and extracts the BaseLicenses.
      * @return A collection of Base licenses.
      */
-    Map<String,BaseLicense> readLicenses();
+    Collection<IHeaderMatcher> readLicenses();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java
deleted file mode 100644
index bc870c306..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/AcademicFree21LicenseFamily.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-public class AcademicFree21LicenseFamily extends SimpleLicenseFamily {
-    public AcademicFree21LicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
deleted file mode 100644
index 17abbcdd0..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-public final class Apache20LicenseFamily extends SimpleLicenseFamily {
-    public Apache20LicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/CDDL1LicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/CDDL1LicenseFamily.java
deleted file mode 100644
index 6bf01c0bd..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/CDDL1LicenseFamily.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * Base implementation for CDDL 1.0 licenses.
- */
-public class CDDL1LicenseFamily extends SimpleLicenseFamily {
-
-    public CDDL1LicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/GPL1LicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/GPL1LicenseFamily.java
deleted file mode 100644
index bdfd86e7b..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/GPL1LicenseFamily.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * Base implementation for GPLv1 or later.
- */
-public class GPL1LicenseFamily extends SimpleLicenseFamily {
-    public GPL1LicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1);
-    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/GPL2LicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/GPL2LicenseFamily.java
deleted file mode 100644
index e2d252201..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/GPL2LicenseFamily.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * Base implementation for GPLv2 or later.
- */
-public class GPL2LicenseFamily extends SimpleLicenseFamily {
-    public GPL2LicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2);
-    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/GPL3LicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/GPL3LicenseFamily.java
deleted file mode 100644
index 9d91466c1..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/GPL3LicenseFamily.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * Base implementation for GPLv3 or later.
- */
-public class GPL3LicenseFamily extends SimpleLicenseFamily {
-    public GPL3LicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3);
-    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index 97ef9a954..ae454d8b0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -18,7 +18,42 @@
  */ 
 package org.apache.rat.license;
 
+import java.util.SortedSet;
 
-public interface ILicenseFamily {
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+public interface ILicenseFamily extends Comparable<ILicenseFamily> {
     String getFamilyName();
+    
+    String getFamilyCategory();
+
+    static String makeCategory(String cat) {
+        return cat == null ? "     " : cat.concat("     ").substring(0, 5);
+    }
+    
+    @Override
+    default int compareTo(ILicenseFamily other) {
+        return getFamilyCategory().compareTo(other.getFamilyCategory());
+    }
+    
+    public static ILicenseFamily searchSet(SortedSet<ILicenseFamily> set, String category) {
+        ILicenseFamily target = new ILicenseFamily() {
+
+            @Override
+            public String getFamilyName() {
+                return "";
+            }
+
+            @Override
+            public String getFamilyCategory() {
+               return makeCategory(category);
+            }};
+            
+        SortedSet<ILicenseFamily> partialSet = set.tailSet(target );
+        if (partialSet.isEmpty()) {
+            return null;
+        }
+        ILicenseFamily candidate = partialSet.first();
+        return candidate.compareTo(target) == 0 ? candidate : null;
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java
deleted file mode 100644
index c6453d01e..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-/**
- * Base implementation for MIT licenses.
- */
-public class MITLicenseFamily extends SimpleLicenseFamily {
-    public MITLicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT);
-    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java
deleted file mode 100644
index d94de9719..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ModifiedBSDLicenseFamily.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-public class ModifiedBSDLicenseFamily extends SimpleLicenseFamily {
-    public ModifiedBSDLicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
deleted file mode 100644
index 17c270929..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/OASISLicenseFamily.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-public final class OASISLicenseFamily extends SimpleLicenseFamily {
-    public OASISLicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
index 24231dd15..bc6ca019a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
@@ -24,13 +24,14 @@
  */
 public class SimpleLicenseFamily implements ILicenseFamily {
     private String familyName;
+    private String familyCategory;
 
-    public SimpleLicenseFamily(String familyName) {
+    public SimpleLicenseFamily(String familyId, String familyName) {
+        setFamilyCategory(familyId);
         setFamilyName(familyName);
     }
 
     public SimpleLicenseFamily() {
-        this(null);
     }
 
     public final void setFamilyName(String familyName) {
@@ -40,4 +41,13 @@ public final void setFamilyName(String familyName) {
     public final String getFamilyName() {
         return familyName;
     }
+
+    public String getFamilyCategory() {
+        return familyCategory;
+    }
+
+    public void setFamilyCategory(String familyId) {
+        this.familyCategory = ILicenseFamily.makeCategory(familyId);
+    }
 }
+
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java
deleted file mode 100644
index c3d2101be..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/W3CDocumentLicenseFamily.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-public class W3CDocumentLicenseFamily extends SimpleLicenseFamily {
-    public W3CDocumentLicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java
deleted file mode 100644
index 42a6dc901..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/W3CSoftwareLicenseFamily.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.license;
-
-import org.apache.rat.api.MetaData;
-
-public class W3CSoftwareLicenseFamily extends SimpleLicenseFamily {
-    public W3CSoftwareLicenseFamily() {
-        super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 504815ead..4dc45ce56 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -25,55 +25,52 @@
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 public class DefaultPolicy implements IDocumentAnalyser {
-    private List<String> approvedLicenseNames;
+    private SortedSet<ILicenseFamily> approvedLicenseNames;
 
     /**
      * Creates a policy that matches the default licenses.
      * Mainly used for testing purposes.
      */
     DefaultPolicy() {
-        this(new ArrayList<String>(0), true);
+        this(new ArrayList<ILicenseFamily>(0), true);
     }
 
     public DefaultPolicy(final ILicenseFamily[] approvedLicenses, boolean mergeWithDefault) {
-        this(ConfigurationUtil.toNames(approvedLicenses), mergeWithDefault);
+        this(Arrays.asList(approvedLicenses), mergeWithDefault);
     }
 
-    public DefaultPolicy(final List<String> approvedLicenseNames, boolean mergeWithDefault) {
-        this.approvedLicenseNames = new ArrayList<>();
+    public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseNames, boolean mergeWithDefault) {
+        this.approvedLicenseNames = new TreeSet<>();
 
-        if (approvedLicenseNames == null || approvedLicenseNames.isEmpty()) {
-            // used in tests only, no additional licenses given but defaults requested
-            if(mergeWithDefault) {
-                this.approvedLicenseNames.addAll(Defaults.getLicenseNames());
-            }
-        } else {
-            // avoid duplicate entries and merge with defaults if requested
-            Set<String> mergedLicenses = new HashSet<>(approvedLicenseNames);
-            if(mergeWithDefault) {
-                mergedLicenses.addAll(Defaults.getLicenseNames());
-            }
-            this.approvedLicenseNames = new ArrayList<>(mergedLicenses);
+        if (mergeWithDefault) {
+            this.approvedLicenseNames.addAll(Defaults.getLicenseFamilies());
+        }
+        if (approvedLicenseNames != null) {
+            this.approvedLicenseNames.addAll(approvedLicenseNames);
         }
-        Collections.sort(this.approvedLicenseNames);
     }
 
     @Override
     public void analyse(final Document subject) throws RatDocumentAnalysisException {
         if (subject != null) {
-            final String name = subject.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME);
-            if (name != null) {
-                final boolean isApproved = Collections.binarySearch(approvedLicenseNames, name) >= 0;
-                reportLicenseApprovalClaim(subject, isApproved);
-            }
+            final ILicenseFamily licenseFamily = new SimpleLicenseFamily( 
+                    subject.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                    subject.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
+           
+            reportLicenseApprovalClaim(subject, approvedLicenseNames.contains(licenseFamily));
         }
     }
 
@@ -82,7 +79,7 @@ public void reportLicenseApprovalClaim(final Document subject, final boolean isA
          isAcceptable ? MetaData.RAT_APPROVED_LICENSE_DATIM_TRUE: MetaData.RAT_APPROVED_LICENSE_DATIM_FALSE);
     }
 
-    public List<String> getApprovedLicenseNames() {
-        return Collections.unmodifiableList(approvedLicenseNames);
+    public SortedSet<ILicenseFamily> getApprovedLicenseNames() {
+        return Collections.unmodifiableSortedSet(approvedLicenseNames);
     }
 }
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.config b/apache-rat-core/src/main/resources/org/apache/rat/default.config
index 2cd4d0675..849b9f7a0 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.config
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.config
@@ -24,7 +24,7 @@ family.BSD_m=Modified BSD License
 
 license.ASL2.family=AL
 license.ASL2.text.1=Licensed under the Apache License, Version 2.0 (the "License")
-license.ASL2.text.1=Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
+license.ASL2.text.2=Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
 license.ASL2.text.http=http://www.apache.org/licenses/LICENSE-2.0
 license.ASL2.text.https=https://www.apache.org/licenses/LICENSE-2.0
 license.ASL2.text.html=http://www.apache.org/licenses/LICENSE-2.0.html
@@ -34,7 +34,6 @@ license.ASL2.text.txts=https://www.apache.org/licenses/LICENSE-2.0.txt
 license.ASL2.spdx=Apache-2.0
 
 license.ASL_Applied.family=AL
-license.ASL_Applied.copyright=UNKNOWN
 license.ASL_Applied.fullText=Licensed under the Apache License, Version 2.0 (the "License")\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an "AS IS" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n
 
 license.CDDL1.family=CDDL1
@@ -109,6 +108,6 @@ license.W3C.notes=Note that W3C requires a NOTICE. All modifications require not
 license.W3C.text.copy=http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 license.W3CD.family=W3CD
-license.W3CD.notes=Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";
+license.W3CD.notes=Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.
 license.W3CD.text.copy=http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
             
\ No newline at end of file
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index c563912ba..502e932c3 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -21,52 +21,56 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
-import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.junit.Test;
 
 public class DefaultsTest {
-    private static String[] FAMILIES = {"GEN", "?????", "AL", "OASIS", "W3CD", "W3C", "GPL1", "GPL2", "GPL3", "MIT", "CDDL1", "BSD_m"};
+    private static String[] FAMILIES = { "GEN  ", "?????", "AL   ", "OASIS", "W3CD ", "W3C  ", "GPL1 ", "GPL2 ",
+            "GPL3 ", "MIT  ", "CDDL1", "BSD_m" };
 
     @Test
     public void defaultConfigTest() {
         Defaults.builder().build();
 
-        Collection<BaseLicense> families = Defaults.getLicenses();
-        Set<String> names = families.stream().map(x -> x.getLicenseFamilyCategory().trim()).collect(Collectors.toSet());
-        assertEquals(FAMILIES.length-1, names.size());
+        Collection<IHeaderMatcher> families = Defaults.getLicenses();
+
+        Set<String> names = new HashSet<>();
+        families.forEach(x -> x.reportFamily(y -> names.add(y.getFamilyCategory())));
+        assertEquals(FAMILIES.length - 1, names.size());
         names.removeAll(Arrays.asList(FAMILIES));
         assertTrue(names.isEmpty());
 
-        Collection<BaseLicense> licenses = Defaults.getLicenses();
+        Collection<IHeaderMatcher> licenses = Defaults.getLicenses();
         assertEquals(15, licenses.size());
-        Map<String,Integer> result = new TreeMap<>();
-        licenses.stream().map(BaseLicense::getLicenseFamilyCategory).forEach( x -> {
-            Integer i = result.get(x);
-            if (i == null) {
-                result.put(x, 1);
-            } else {
-                result.put(x, 1+i.intValue());
-            }
+        Map<String, Integer> result = new TreeMap<>();
+        licenses.forEach(x -> {
+            x.reportFamily(y -> {
+                String cat = y.getFamilyCategory();
+                Integer i = result.get(cat);
+                if (i == null) {
+                    result.put(cat, 1);
+                } else {
+                    result.put(cat, 1 + i.intValue());
+                }
+            });
         });
-        assertEquals(2,result.get("AL   ").intValue());
-        assertEquals(2,result.get("BSD_m").intValue());
-        assertEquals(2,result.get("CDDL1").intValue());
-        assertEquals(2,result.get("GEN  ").intValue());
-        assertEquals(1,result.get("GPL1 ").intValue());
-        assertEquals(1,result.get("GPL2 ").intValue());
-        assertEquals(1,result.get("GPL3 ").intValue());
-        assertEquals(1,result.get("MIT  ").intValue());
-        assertEquals(1,result.get("OASIS").intValue());
-        assertEquals(1,result.get("W3C  ").intValue());
-        assertEquals(1,result.get("W3CD ").intValue());
+        assertEquals(4, result.get("AL   ").intValue());
+        assertEquals(2, result.get("BSD_m").intValue());
+        assertEquals(3, result.get("CDDL1").intValue());
+        assertEquals(2, result.get("GEN  ").intValue());
+        assertEquals(2, result.get("GPL1 ").intValue());
+        assertEquals(2, result.get("GPL2 ").intValue());
+        assertEquals(2, result.get("GPL3 ").intValue());
+        assertEquals(2, result.get("MIT  ").intValue());
+        assertEquals(2, result.get("OASIS").intValue());
+        assertEquals(2, result.get("W3C  ").intValue());
+        assertEquals(1, result.get("W3CD ").intValue());
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 3d3107bed..93f84554b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -18,129 +18,126 @@
  */
 package org.apache.rat;
 
-import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
-import org.apache.rat.test.utils.Resources;
-import org.apache.rat.walker.DirectoryWalker;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.StringWriter;
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.rat.analysis.license.MultiplexLicense;
+import org.apache.rat.test.utils.Resources;
+import org.apache.rat.walker.DirectoryWalker;
+import org.junit.Test;
 
 public class ReportTest {
     private static final String NL = System.getProperty("line.separator");
     private static final String PARAGRAPH = "*****************************************************";
     private static final String FILE_PARAGRAPH = "=====================================================";
 
-    private static final String HEADER =
-            NL +
-                    PARAGRAPH + NL +//
-                    "Summary" + NL +//
-                    "-------" + NL +//
-                    "Generated at: ";
+    private static final String HEADER = NL + PARAGRAPH + NL + //
+            "Summary" + NL + //
+            "-------" + NL + //
+            "Generated at: ";
 
     private static String getElementsReports(String pElementsPath) {
-        return
-                NL + "Notes: 2" + NL +//
-                        "Binaries: 2" + NL +//
-                        "Archives: 1" + NL +//
-                        "Standards: 7" + NL +//
-                        "" + NL +//
-                        "Apache Licensed: 4" + NL +//
-                        "Generated Documents: 0" + NL +//
-                        "" + NL +//
-                        "JavaDocs are generated, thus a license header is optional." + NL +//
-                        "Generated files do not require license headers." + NL +//
-                        "" + NL +//
-                        "2 Unknown Licenses" + NL +//
-                        "" + NL +//
-                        PARAGRAPH + NL +//
-                        "" + NL +//
-                        "Files with unapproved licenses:" + NL +//
-                        "" + NL +//
-                        "  " + pElementsPath + "/Source.java" + NL +//
-                        "  " + pElementsPath + "/sub/Empty.txt" + NL +//
-                        "" + NL +//
-                        PARAGRAPH + NL +//
-                        "" + NL +//
-                        "Archives:" + NL +//
-                        "" + NL +//
-                        " + " + pElementsPath + "/dummy.jar" + NL +//
-                        " " + NL +//
-                        PARAGRAPH + NL +//
-                        "  Files with Apache License headers will be marked AL" + NL +//
-                        "  Binary files (which do not require any license headers) will be marked B" + NL +//
-                        "  Compressed archives will be marked A" + NL +//
-                        "  Notices, licenses etc. will be marked N" + NL +//
-                        "  MIT   " + pElementsPath + "/ILoggerFactory.java" + NL +//
-                        "  B     " + pElementsPath + "/Image.png" + NL +//
-                        "  N     " + pElementsPath + "/LICENSE" + NL +//
-                        "  N     " + pElementsPath + "/NOTICE" + NL +//
-                        " !????? " + pElementsPath + "/Source.java" + NL +//
-                        "  AL    " + pElementsPath + "/Text.txt" + NL +//
-                        "  AL    " + pElementsPath + "/TextHttps.txt" + NL +//
-                        "  AL    " + pElementsPath + "/Xml.xml" + NL +//
-                        "  AL    " + pElementsPath + "/buildr.rb" + NL +//
-                        "  A     " + pElementsPath + "/dummy.jar" + NL +//
-                        "  B     " + pElementsPath + "/plain.json" + NL +//
-                        " !????? " + pElementsPath + "/sub/Empty.txt" + NL +//
-                        " " + NL +//
-                        PARAGRAPH + NL +//
-                        NL +//
-                        " Printing headers for text files without a valid license header..." + NL +//
-                        " " + NL +//
-                        FILE_PARAGRAPH + NL +//
-                        "== File: " + pElementsPath + "/Source.java" + NL +//
-                        FILE_PARAGRAPH + NL + //
-                        "package elements;" + NL +//
-                        "" + NL +//
-                        "/*" + NL +//
-                        " * This file does intentionally *NOT* contain an AL license header," + NL +//
-                        " * because it is used in the test suite." + NL +//
-                        " */" + NL +//
-                        "public class Source {" + NL +//
-                        "" + NL +//
-                        "}" + NL +//
-                        "" + NL +//
-                        FILE_PARAGRAPH + NL +//
-                        "== File: " + pElementsPath + "/sub/Empty.txt" + NL +//
-                        FILE_PARAGRAPH + NL +//
-                        NL;
+        return NL + "Notes: 2" + NL + //
+                "Binaries: 2" + NL + //
+                "Archives: 1" + NL + //
+                "Standards: 7" + NL + //
+                "" + NL + //
+                "Apache Licensed: 4" + NL + //
+                "Generated Documents: 0" + NL + //
+                "" + NL + //
+                "JavaDocs are generated, thus a license header is optional." + NL + //
+                "Generated files do not require license headers." + NL + //
+                "" + NL + //
+                "2 Unknown Licenses" + NL + //
+                "" + NL + //
+                PARAGRAPH + NL + //
+                "" + NL + //
+                "Files with unapproved licenses:" + NL + //
+                "" + NL + //
+                "  " + pElementsPath + "/Source.java" + NL + //
+                "  " + pElementsPath + "/sub/Empty.txt" + NL + //
+                "" + NL + //
+                PARAGRAPH + NL + //
+                "" + NL + //
+                "Archives:" + NL + //
+                "" + NL + //
+                " + " + pElementsPath + "/dummy.jar" + NL + //
+                " " + NL + //
+                PARAGRAPH + NL + //
+                "  Files with Apache License headers will be marked AL" + NL + //
+                "  Binary files (which do not require any license headers) will be marked B" + NL + //
+                "  Compressed archives will be marked A" + NL + //
+                "  Notices, licenses etc. will be marked N" + NL + //
+                "  MIT   " + pElementsPath + "/ILoggerFactory.java" + NL + //
+                "  B     " + pElementsPath + "/Image.png" + NL + //
+                "  N     " + pElementsPath + "/LICENSE" + NL + //
+                "  N     " + pElementsPath + "/NOTICE" + NL + //
+                " !????? " + pElementsPath + "/Source.java" + NL + //
+                "  AL    " + pElementsPath + "/Text.txt" + NL + //
+                "  AL    " + pElementsPath + "/TextHttps.txt" + NL + //
+                "  AL    " + pElementsPath + "/Xml.xml" + NL + //
+                "  AL    " + pElementsPath + "/buildr.rb" + NL + //
+                "  A     " + pElementsPath + "/dummy.jar" + NL + //
+                "  B     " + pElementsPath + "/plain.json" + NL + //
+                " !????? " + pElementsPath + "/sub/Empty.txt" + NL + //
+                " " + NL + //
+                PARAGRAPH + NL + //
+                NL + //
+                " Printing headers for text files without a valid license header..." + NL + //
+                " " + NL + //
+                FILE_PARAGRAPH + NL + //
+                "== File: " + pElementsPath + "/Source.java" + NL + //
+                FILE_PARAGRAPH + NL + //
+                "package elements;" + NL + //
+                "" + NL + //
+                "/*" + NL + //
+                " * This file does intentionally *NOT* contain an AL license header," + NL + //
+                " * because it is used in the test suite." + NL + //
+                " */" + NL + //
+                "public class Source {" + NL + //
+                "" + NL + //
+                "}" + NL + //
+                "" + NL + //
+                FILE_PARAGRAPH + NL + //
+                "== File: " + pElementsPath + "/sub/Empty.txt" + NL + //
+                FILE_PARAGRAPH + NL + //
+                NL;
     }
 
     @Test
     public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         Defaults.builder().build();
-        StringWriter out = new StringWriter();
-        HeaderMatcherMultiplexer matcherMultiplexer = new HeaderMatcherMultiplexer(Defaults.getLicenses());
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        MultiplexLicense matcherMultiplexer = new MultiplexLicense(Defaults.getLicenses());
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setApproveDefaultLicenses(true);
-        configuration.setHeaderMatcher(matcherMultiplexer);
-        Report.report(out, new DirectoryWalker(new File(elementsPath)),
-                Defaults.getPlainStyleSheet(), configuration);
+        configuration.addHeaderMatcher(matcherMultiplexer);
+        configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
+        configuration.setOut(out);
+        Reporter.report(configuration);
 
-        String result = out.getBuffer().toString();
-        assertTrue("'Generated at' is present in " + result,
-                result.startsWith(HEADER));
+        String result = out.toString();
+        assertTrue("'Generated at' is present in " + result, result.startsWith(HEADER));
 
         final int generatedAtLineEnd = result.indexOf(NL, HEADER.length());
 
         final String elementsReports = getElementsReports(elementsPath);
-        assertEquals("Report created was: " + result,
-                elementsReports,
+        assertEquals("Report created was: " + result, elementsReports,
                 result.substring(generatedAtLineEnd + NL.length()));
     }
 
     @Test
     public void parseExclusionsForCLIUsage() throws IOException {
-        final FilenameFilter filter = Report.parseExclusions(Arrays.asList("", " # foo/bar", "foo", "##", " ./foo/bar"));
+        final FilenameFilter filter = Report
+                .parseExclusions(Arrays.asList("", " # foo/bar", "foo", "##", " ./foo/bar"));
         assertNotNull(filter);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index 30d3365f7..5309a9de2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -18,7 +18,13 @@
  */
 package org.apache.rat.analysis;
 
-import org.apache.rat.api.Document;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.StringWriter;
+
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.impl.MonolithicFileDocument;
 import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
@@ -27,20 +33,18 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.StringWriter;
-
-import static org.junit.Assert.assertEquals;
-
 public class AnalyserFactoryTest {
 
-    private static final IHeaderMatcher MATCHES_NOTHING_MATCHER = new IHeaderMatcher() {
-        public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-            return false;
-        }
+    private static IHeaderMatcher MATCHES_NOTHING_MATCHER = mock(IHeaderMatcher.class);
 
-        public void reset() {
+    static {
+        try {
+            when(MATCHES_NOTHING_MATCHER.match(any(), any())).thenReturn(false);
+        } catch (RatHeaderAnalysisException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
         }
-    };
+    }
 
     private StringWriter out;
     private SimpleXmlClaimReporter reporter;
@@ -56,62 +60,67 @@ public void setUp() throws Exception {
 
     @Test
     public void standardTypeAnalyser() throws Exception {
-        final MonolithicFileDocument document = new MonolithicFileDocument(Resources.getResourceFile("/elements/Text.txt"));
+        final MonolithicFileDocument document = new MonolithicFileDocument(
+                Resources.getResourceFile("/elements/Text.txt"));
         analyser.analyse(document);
         reporter.report(document);
         assertEquals("Open standard element", //
-                "<resource name='src/test/resources/elements/Text.txt'><header-sample>/*\n" +
-                        " * Licensed to the Apache Software Foundation (ASF) under one\n" +
-                        " * or more contributor license agreements.  See the NOTICE file\n" +
-                        " * distributed with this work for additional information\n" +
-                        " * regarding copyright ownership.  The ASF licenses this file\n" +
-                        " * to you under the Apache License, Version 2.0 (the \"License\");\n" +
-                        " * you may not use this file except in compliance with the License.\n" +
-                        " * You may obtain a copy of the License at\n" +
-                        " *\n" +
-                        " *    http://www.apache.org/licenses/LICENSE-2.0\n" +
-                        " *\n" +
-                        " * Unless required by applicable law or agreed to in writing,\n" +
-                        " * software distributed under the License is distributed on an\n" +
-                        " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
-                        " * KIND, either express or implied.  See the License for the\n" +
-                        " * specific language governing permissions and limitations\n" +
-                        " * under the License.    \n" +
-                        " */\n" +
-                        "\n" +
-                        "            \n" +
-                        "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/>", out.toString());
+                "<resource name='src/test/resources/elements/Text.txt'><header-sample>/*\n"
+                        + " * Licensed to the Apache Software Foundation (ASF) under one\n"
+                        + " * or more contributor license agreements.  See the NOTICE file\n"
+                        + " * distributed with this work for additional information\n"
+                        + " * regarding copyright ownership.  The ASF licenses this file\n"
+                        + " * to you under the Apache License, Version 2.0 (the \"License\");\n"
+                        + " * you may not use this file except in compliance with the License.\n"
+                        + " * You may obtain a copy of the License at\n" + " *\n"
+                        + " *    http://www.apache.org/licenses/LICENSE-2.0\n" + " *\n"
+                        + " * Unless required by applicable law or agreed to in writing,\n"
+                        + " * software distributed under the License is distributed on an\n"
+                        + " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+                        + " * KIND, either express or implied.  See the License for the\n"
+                        + " * specific language governing permissions and limitations\n" + " * under the License.    \n"
+                        + " */\n" + "\n" + "            \n"
+                        + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/>",
+                out.toString());
     }
 
     @Test
     public void noteTypeAnalyser() throws Exception {
-        final MonolithicFileDocument document = new MonolithicFileDocument(Resources.getResourceFile("/elements/LICENSE"));
+        final MonolithicFileDocument document = new MonolithicFileDocument(
+                Resources.getResourceFile("/elements/LICENSE"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open note element", "<resource name='src/test/resources/elements/LICENSE'><type name='notice'/>", out.toString());
+        assertEquals("Open note element", "<resource name='src/test/resources/elements/LICENSE'><type name='notice'/>",
+                out.toString());
     }
 
     @Test
     public void binaryTypeAnalyser() throws Exception {
-        final MonolithicFileDocument document = new MonolithicFileDocument(Resources.getResourceFile("/elements/Image.png"));
+        final MonolithicFileDocument document = new MonolithicFileDocument(
+                Resources.getResourceFile("/elements/Image.png"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open binary element", "<resource name='src/test/resources/elements/Image.png'><type name='binary'/>", out.toString());
+        assertEquals("Open binary element",
+                "<resource name='src/test/resources/elements/Image.png'><type name='binary'/>", out.toString());
     }
 
     @Test
     public void archiveTypeAnalyser() throws Exception {
-        final MonolithicFileDocument document = new MonolithicFileDocument(Resources.getResourceFile("/elements/dummy.jar"));
+        final MonolithicFileDocument document = new MonolithicFileDocument(
+                Resources.getResourceFile("/elements/dummy.jar"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open archive element", "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString());
+        assertEquals("Open archive element",
+                "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString());
     }
 
     @Test
     public void archiveTypeAnalyserIntelliJ() throws Exception {
-        final MonolithicFileDocument document = new MonolithicFileDocument(Resources.getResourceFile("/elements/dummy.jar"));
+        final MonolithicFileDocument document = new MonolithicFileDocument(
+                Resources.getResourceFile("/elements/dummy.jar"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open archive element", "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString());
+        assertEquals("Open archive element",
+                "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString());
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
index e7ad80976..53a1b4677 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
@@ -15,26 +15,27 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 
 package org.apache.rat.analysis;
 
-import org.apache.rat.analysis.license.ApacheSoftwareLicense20;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.io.StringReader;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.rat.api.Document;
+import org.apache.rat.document.MockLocation;
+import org.junit.Test;
 
 public class HeaderCheckWorkerTest {
 
     @Test
     public void isFinished() throws Exception {
         final Document subject = new MockLocation("subject");
-        HeaderCheckWorker worker = new HeaderCheckWorker(new StringReader(""), new ApacheSoftwareLicense20(), subject);
+        IHeaderMatcher matcher = mock(IHeaderMatcher.class);
+        HeaderCheckWorker worker = new HeaderCheckWorker(new StringReader(""), matcher, subject);
         assertFalse(worker.isFinished());
         worker.read();
         assertTrue(worker.isFinished());
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java
deleted file mode 100644
index 75da1c6a2..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/MockLicenseMatcher.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis;
-
-import org.apache.rat.api.Document;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MockLicenseMatcher implements IHeaderMatcher {
-
-    public final List<String> lines = new ArrayList<>();
-    public int resets = 0;
-    public boolean result = true;
-
-    public boolean match(Document subject, String line) {
-        lines.add(line);
-        return result;
-    }
-
-    public void reset() {
-        resets++;
-    }
-
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
deleted file mode 100644
index 2f22cdc84..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.generation;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.apache.rat.test.utils.Resources;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class JavaDocLicenseNotRequiredTest {
-
-    private MockClaimReporter reporter;
-    private JavaDocLicenseNotRequired license;
-
-    @Before
-    public void setUp() throws Exception {
-        license = new JavaDocLicenseNotRequired();
-        reporter = new MockClaimReporter();
-    }
-
-    @Test
-    public void matchIndexDoc() throws Exception {
-        boolean result = readAndMatch("index.html");
-        assertTrue("Is a javadoc", result);
-    }
-
-    @Test
-    public void matchClassDoc() throws Exception {
-        boolean result = readAndMatch("ArchiveElement.html");
-        assertTrue("Is a javadoc", result);
-    }
-
-    @Test
-    public void matchNonJavaDoc() throws Exception {
-        boolean result = readAndMatch("notjavadoc.html");
-        assertFalse("Not javadocs and so should return null", result);
-    }
-
-    boolean readAndMatch(String name) throws Exception {
-        File file = Resources.getResourceFile("javadocs/" + name);
-        boolean result = false;
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new FileReader(file));
-            String line = in.readLine();
-            final Document subject = new MockLocation("subject");
-            while (line != null && !result) {
-                result = license.match(subject, line);
-                line = in.readLine();
-            }
-        } finally {
-                IOUtils.closeQuietly(in);
-        }
-            return result;
-        }
-    }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
new file mode 100644
index 000000000..4f0c03caa
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
@@ -0,0 +1,299 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.license;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.apache.rat.Defaults;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.document.MockLocation;
+import org.apache.rat.license.SimpleLicenseFamily;
+import org.apache.rat.license.ILicenseFamily;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Test to see if short form license information will be recognized correctly.
+ *
+ */
+abstract public class AbstractMatcherTest {
+    private static int NAME=0;
+    private static int NOTES=1;
+    private static int TEXT=2;
+	protected MetaData data;
+	protected Document document;
+	protected static Collection<IHeaderMatcher> instrumented;
+	private final String category;
+	private final String name;
+	private final String[][]targets;
+    
+    @BeforeClass
+    public static void init() {
+        Defaults.builder().build();
+        instrumented = Defaults.getLicenses().stream().map( Instrumentation::wrap ).collect(Collectors.toList());
+    }
+    
+    @AfterClass
+    public static void shutdown() {
+        Defaults.clear();
+        instrumented = null;
+    }
+    
+    protected AbstractMatcherTest(String cat, String name, String[][]targets) {
+        this.category = ILicenseFamily.makeCategory(cat);
+        this.name = name;
+        this.targets = targets;
+    }
+    
+	@Before
+	public void setup() {
+	    data = new MetaData();
+        document = mock(Document.class);
+        when(document.getMetaData()).thenReturn(data);
+	}
+	
+	protected static Collection<IHeaderMatcher> extractCategory(String category) {
+	    String cat = ILicenseFamily.makeCategory(category);
+	    List<IHeaderMatcher> matchers = new ArrayList<>();
+	    instrumented.forEach( x -> x.extractMatcher(matchers::add, 
+                target -> target.getFamilyCategory().equals(cat)));
+	    if (matchers.isEmpty()) {
+	        fail("No machers for category: "+category);
+	    }
+	    return matchers;
+	}
+	
+	@Test
+	public void testMatchProcessing() throws RatHeaderAnalysisException, IOException {
+        Collection<IHeaderMatcher> matchers = extractCategory(category);
+        for (IHeaderMatcher matcher : matchers) {
+            for (String[] target : targets) {
+                if (processText(matcher, target[TEXT])) {
+                    assertEquals(matcher.toString(), category, data.get(MetaData.RAT_URL_HEADER_CATEGORY).getValue());
+                    assertEquals(matcher.toString(), category, data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue());
+                    assertEquals(matcher.toString(), target[NOTES], data.get(MetaData.RAT_URL_HEADER_SAMPLE).getValue());
+                    assertEquals(matcher.toString(), name, data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue());
+                    data.clear();
+                }
+                matcher.reset();
+            }
+        }
+        List<String> notMatched = new ArrayList<>();
+        List<String> notReset = new ArrayList<>();
+        for (IHeaderMatcher matcher : matchers) {
+            if (!(matcher instanceof Instrumentation))
+            {
+                fail( "Matcher was not instrumented: "+matcher);
+            } else {
+                Instrumentation instrumented = (Instrumentation) matcher;
+                if (!instrumented.wasMatched())
+                {
+                    notMatched.add( instrumented.toString() );
+                }
+                if (!instrumented.wasReset()) {
+                    notReset.add( instrumented.toString() );
+                }
+            }
+        }
+        if (!(notMatched.isEmpty() && notReset.isEmpty())) {
+            StringBuilder failMsg = new StringBuilder();
+            if (! notMatched.isEmpty()) {
+                failMsg.append("The following matchers were not matched:\n");
+                notMatched.forEach( t -> failMsg.append("\t").append(t).append("\n"));
+                failMsg.append("\n");
+            }
+            if (! notReset.isEmpty()) {
+                failMsg.append("The following matchers were not reset:\n");
+                notReset.forEach( t -> failMsg.append("\t").append(t).append("\n"));
+                failMsg.append("\n");
+            }
+            fail(failMsg.toString());
+        }
+	}
+	
+	private boolean processText(IHeaderMatcher matcher, String text) throws IOException, RatHeaderAnalysisException {
+	    BufferedReader in = new BufferedReader(new StringReader(text));
+        String line = in.readLine();
+        boolean found = false;
+        while (line != null) {
+            found |= matcher.match(document, line);
+            line = in.readLine();
+        }
+        return found;
+	}
+	@Test
+	public void testEmbeddedStrings() throws RatHeaderAnalysisException, IOException {
+	    String formats[] = { "%s", "now is not the time %s for copyright",
+	        "#%s", "##%s", "## %s", "##%s##", "## %s ##", "/*%s*/","/* %s */"};
+
+        Collection<IHeaderMatcher> matchers = extractCategory(category);
+        for (String[] target : targets) {
+            for (String fmt : formats) {
+                boolean found = false;
+                for (IHeaderMatcher matcher : matchers) {
+                    found |= processText(matcher, String.format(fmt, target[TEXT]));
+                    matcher.reset();
+                }
+                assertTrue( String.format( "%s %s did not match pattern '%s' for target string %s", category, name, fmt, target[NAME]), found);
+            }
+        }
+	}
+	
+	@Test
+	public void testReportFamily() {
+	    Collection<IHeaderMatcher> matchers = extractCategory(category);
+	    ILicenseFamily lst[] = { null }; 
+	    for (IHeaderMatcher matcher : matchers) {
+	        matcher.reportFamily(x -> lst[0] = x);
+	        assertEquals( "Error with "+matcher.getId(), category, lst[0].getFamilyCategory());
+	        assertEquals( "Error with "+matcher.getId(), name, lst[0].getFamilyName());
+	    }
+	}
+	
+	//void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator);
+	@Test
+    public void testExtractMatcher() {
+	    
+        Collection<IHeaderMatcher> matchers = extractCategory(category);
+        Collection<IHeaderMatcher> found = new ArrayList<>();
+        for (IHeaderMatcher matcher : matchers) {
+            matcher.extractMatcher( found::add,  target -> target.getFamilyCategory().equals(category));
+        }
+        assertEquals( matchers.size(), found.size());
+        
+        found.clear();
+        for (IHeaderMatcher matcher : matchers) {
+            matcher.extractMatcher( found::add,  target -> target.getFamilyCategory().equals("not a valid category"));
+        }
+        assertEquals( 0, found.size());
+    }
+	
+	public static class Instrumentation implements IHeaderMatcher {
+        private IHeaderMatcher wrapped;
+        private int resetCount = 0;
+        private int matchCount = 0;
+        private int matchCalled = 0;
+        
+	    public int getMatchCalled() {
+            return matchCalled;
+        }
+
+        public IHeaderMatcher getWrapped() {
+	        return wrapped;
+	    }
+
+	    @Override
+	    public String toString() {
+	        return getId();
+	    }
+	    
+	    @Override
+	    public String getId() {
+	        return String.format("[Instrumented] %s", wrapped.getId());
+	    }
+
+	    public boolean wasReset() {
+	        return resetCount > 0;
+	    }
+
+	    public boolean wasMatched() {
+	        return matchCount > 0;
+	    }
+
+	    public void setWrapped(IHeaderMatcher wrapped) {
+	        this.wrapped = wrapped;
+	    }
+
+	    public int getResetCount() {
+	        return resetCount;
+	    }
+
+	    public void setResetCount(int resetCount) {
+	        this.resetCount = resetCount;
+	    }
+
+	    public int getMatchCount() {
+	        return matchCount;
+	    }
+
+	    public void setMatchCount(int matchCount) {
+	        this.matchCount = matchCount;
+	    }
+
+	    static Instrumentation wrap(IHeaderMatcher target) {
+	        if (target instanceof Instrumentation) {
+	            return (Instrumentation) target;
+	        }
+	        return new Instrumentation(target);
+	    }
+
+	    private Instrumentation(IHeaderMatcher target) {
+	        this.wrapped = target;
+	    }
+
+	    @Override
+	    public void reset() {
+	        resetCount++;
+	        wrapped.reset();
+	    }
+
+	    @Override
+	    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
+	        matchCalled++;
+	        if (wrapped.match(subject, line)) {
+	            matchCount++;
+	            return true;
+	        }
+	        return false;
+	    }
+
+	    @Override
+	    public void reportFamily(Consumer<ILicenseFamily> consumer) {
+	        wrapped.reportFamily(consumer);
+	    }
+
+	    @Override
+	    public void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
+	        Collection<IHeaderMatcher> captured = new ArrayList<>();
+	        wrapped.extractMatcher(captured::add, comparator);
+	        captured.stream().map(Instrumentation::wrap).forEach(matchers::accept);
+	    }
+
+	}
+
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20ShortTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20ShortTest.java
deleted file mode 100644
index 5cdde45a9..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20ShortTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * Test to see if short form license information will be recognized correctly.
- * 
- * @see  <a href="https://www.apache.org/legal/src-headers.html#is-a-short-form-of-the-source-header-available">https://www.apache.org/legal/src-headers.html#is-a-short-form-of-the-source-header-available</a>
- * 
- * @author Karl Heinz Marbaise
- *
- */
-public class ApacheSoftwareLicense20ShortTest {
-
-	private static final String SHORT_LICENSE = "Licensed to the Apache Software Foundation (ASF) "
-			+ "under one or more contributor license agreements; and to You under the Apache License, Version 2.0.";
-
-	@Test
-	public void apacheShortLicenseShouldBeIdentified() {
-		ApacheSoftwareLicense20 worker = new ApacheSoftwareLicense20();
-		assertTrue(worker.matches(ApacheSoftwareLicense20.FIRST_LICENSE_LINE_SHORT));
-	}
-
-	@Test
-	public void apacheShortLicenseShouldBeIdentifiedWithDifferentPreAndPostFixes() {
-		ApacheSoftwareLicense20 worker = new ApacheSoftwareLicense20();
-		assertTrue(worker.matches(SHORT_LICENSE));
-		assertTrue(worker.matches("# " + SHORT_LICENSE));
-		assertTrue(worker.matches("##" + SHORT_LICENSE));
-		assertTrue(worker.matches("##" + SHORT_LICENSE + "##"));
-		assertTrue(worker.matches("/* " + SHORT_LICENSE + "*/"));
-		assertTrue(worker.matches("/* " + SHORT_LICENSE + "*/"));
-	}
-
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
deleted file mode 100644
index 838ae0b8f..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class ApacheSoftwareLicense20Test {
-
-    private MockClaimReporter reporter;
-
-    @Before
-    public void setUp() throws Exception {
-        reporter = new MockClaimReporter();
-    }
-
-    @Test
-    public void matches() throws Exception {
-        ApacheSoftwareLicense20 worker = new ApacheSoftwareLicense20();
-        assertTrue(worker.matches(ApacheSoftwareLicense20.FIRST_LICENSE_LINE));
-        assertTrue(worker.matches("    Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.matches("Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.matches(" * Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.matches(" // Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.matches(" /* Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.matches("    Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.matches(" ## Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.matches(" ## Licensed under the Apache License, Version 2.0 (the \"License\") ##);"));
-        assertFalse(worker.matches("'Behold, Telemachus! (nor fear the sight,)"));
-    }
-
-    @Test
-    public void match() throws Exception {
-        ApacheSoftwareLicense20 worker = new ApacheSoftwareLicense20();
-        final Document subject = new MockLocation("subject");
-        assertTrue(worker.match(subject, ApacheSoftwareLicense20.FIRST_LICENSE_LINE));
-        assertTrue(worker.match(subject, "    Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.match(subject, "Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.match(subject, " * Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.match(subject, " // Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.match(subject, " /* Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.match(subject, "    Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.match(subject, " ## Licensed under the Apache License, Version 2.0 (the \"License\");"));
-        assertTrue(worker.match(subject, " ## Licensed under the Apache License, Version 2.0 (the \"License\") ##);"));
-        assertFalse(worker.match(subject, "'Behold, Telemachus! (nor fear the sight,)"));
-    }
-
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
new file mode 100644
index 000000000..e77bb188d
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.license;
+
+import org.junit.Test;
+import org.apache.rat.analysis.IHeaderMatcher;
+
+/**
+ * Apache Software License detection tests.
+ *
+ */
+public class ApacheSoftwareLicenseTest extends AbstractMatcherTest {
+
+    private static String category = "AL";
+    private static String name = "Apache License Version 2.0";
+    private static String[][] targets = {
+            { "short", "", "Licensed under the Apache License, Version 2.0 (the \"License\")" },
+            { "short2", "",
+                    "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0." },
+            { "http", "", "http://www.apache.org/licenses/LICENSE-2.0" },
+            { "https", "", "https://www.apache.org/licenses/LICENSE-2.0" },
+            { "html", "", "http://www.apache.org/licenses/LICENSE-2.0.html" },
+            { "htmls", "", "https://www.apache.org/licenses/LICENSE-2.0.html" },
+            { "txt", "", "http://www.apache.org/licenses/LICENSE-2.0.txt" },
+            { "txts", "", "https://www.apache.org/licenses/LICENSE-2.0.txt" },
+            { "fullTxt", "",
+                    "Licensed under the Apache License, Version 2.0 (the \"License\")\nyou may not use this file except "
+                            + "in compliance with the License.\nYou may obtain a copy of the License at\n"
+                            + "http://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable "
+                            + "law or agreed to in writing, software\ndistributed under the License is "
+                            + "distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either "
+                            + "express or implied.\nSee the License for the specific language governing permissions and\n"
+                            + "limitations under the License.\n" },
+            { "spdx-tab", "", "SPDX-License-Identifier:\tApache-2.0" },
+            { "spdx-space", "", "SPDX-License-Identifier: Apache-2.0" },
+            { "long text", "", "/*\n"
+                    + " *  Copyright 2012-2013 FooBar.\n"
+                    + " *\n"
+                    + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
+                    + " *  you may not use this file except in compliance with the License.\n"
+                    + " *\n"
+                    + " *  You may obtain a copy of the License at\n"
+                    + " *       http://www.apache.org/licenses/LICENSE-2.0\n"
+                    + " *\n"
+                    + " *  Unless required by applicable law or agreed to in writing, software\n"
+                    + " *  distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+                    + " *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+                    + " *  See the License for the specific language governing permissions and\n"
+                    + " *  limitations under the License.\n"
+                    + " */\n"}
+    
+    };
+
+    public ApacheSoftwareLicenseTest() {
+        super(category, name, targets);
+    }
+    
+//
+//    @Test(timeout = 2000) // may need to be adjusted if many more files are added
+//    public void goodFiles() throws Exception {
+//        IHeaderMatcher matcher = new MultiplexLicense("goodFiles", AbstractMatcherTest.extractCategory(category));
+//        DirectoryScanner.testFilesInDir("appliedAL20/good", matcher, true);
+//    }
+//
+//    @Test(timeout = 2000) // may need to be adjusted if many more files are added
+//    public void badFiles() throws Exception {
+//        IHeaderMatcher matcher = new MultiplexLicense("badFiles", AbstractMatcherTest.extractCategory(category));
+//        DirectoryScanner.testFilesInDir("appliedAL20/bad", matcher, false);
+//    }
+
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
index 3afe377e2..677c37769 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
@@ -32,57 +32,31 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class CDDL1LicenseTest {
-
-    private static final String LICENSE_LINE =
-            " DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.\n\n"
-                    + "Copyright 2011-2013 Tirasa. All rights reserved.\n\n"
-                    + "The contents of this file are subject to the terms of the Common Development\n"
+public class CDDL1LicenseTest extends AbstractMatcherTest {
+    private static String category = "CDDL1";
+    private static String name = "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
+    private static String[][] targets = {
+            { "fullTxt", "", "The contents of this file are subject to the terms of the Common Development\n"
                     + "and Distribution License(\"CDDL\") (the \"License\"). You may not use this file\n"
-                    + "except in compliance with the License.\n\n"
-                    + "You can obtain a copy of the License at https://oss.oracle.com/licenses/CDDL\n"
-                    + "See the License for the specific language governing permissions and limitations\n"
-                    + "under the License.";
-
-    /**
-     * To ease testing provide a map with a given license version and the string to test for.
-     */
-    private static Map<IHeaderMatcher, String> licenseStringMap;
-
-    private Document subject;
-
-    @BeforeClass
-    public static void initLicensesUnderTest() {
-        licenseStringMap = new HashMap<>();
-        licenseStringMap.put(new CDDL1License(), LICENSE_LINE);
-        assertEquals(1, licenseStringMap.entrySet().size());
+                    + "except in compliance with the License.\n\n"},
+            { "longerTxt", "",
+                " DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.\n\n"
+                        + "Copyright 2011-2013 Tirasa. All rights reserved.\n\n"
+                        + "The contents of this file are subject to the terms of the Common Development\n"
+                        + "and Distribution License(\"CDDL\") (the \"License\"). You may not use this file\n"
+                        + "except in compliance with the License.\n\n"
+                        + "You can obtain a copy of the License at https://oss.oracle.com/licenses/CDDL\n"
+                        + "See the License for the specific language governing permissions and limitations\n"
+                        + "under the License." },
+            { "spdx-tab", "", "SPDX-License-Identifier:\tCDDL-1.0" },
+            { "spdx-space", "", "SPDX-License-Identifier: CDDL-1.0" },
+            { "illumos", "", "The contents of this file are subject to the terms of the\n"
+                    + "Common Development and Distribution License (the \"License\")\n"
+                    + "You may not use this file except in compliance with the License.\n"}
+    };
+    
+    public CDDL1LicenseTest() {
+        super(category, name, targets);
     }
 
-    @Before
-    public final void initSubject() {
-        this.subject = new MockLocation("subject");
-    }
-
-    @Test
-    public void testNegativeMatches() throws Exception {
-        for (Map.Entry<IHeaderMatcher, String> licenseUnderTest : licenseStringMap.entrySet()) {
-            assertFalse(licenseUnderTest.getKey().match(subject, "'Behold, Telemachus! (nor fear the sight,)"));
-        }
-    }
-
-    @Test
-    public void testPositiveMatchInDocument() throws Exception {
-        for (Map.Entry<IHeaderMatcher, String> licenseUnderTest : licenseStringMap.entrySet()) {
-            assertTrue(licenseUnderTest.getKey().match(subject, "\t" + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, "     " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " * " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " // " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " /* " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " /** " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, "    " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " ## " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " ## " + licenseUnderTest.getValue() + " ##"));
-        }
-    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
index 5699cf589..bb960857d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
@@ -49,7 +49,7 @@ public class CopyrightHeaderTest {
 
     @Before
     public void setUp() throws Exception {
-        header = new CopyrightHeader(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,"","FooBar");
+        header = new CopyrightHeader(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL,MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0,"","FooBar");
         reporter = new MockClaimReporter();
         subject = new MockLocation("subject");
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPL123LicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPL123LicenseTest.java
index 9c4fd80e8..58b60a867 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPL123LicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPL123LicenseTest.java
@@ -18,70 +18,53 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.junit.Before;
-import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collection;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 /**
- * Tests GPL license occurrences within comments and other characters.
- * Works for GPL1 to GPL3.
+ * Tests GPL license occurrences within comments and other characters. Works for
+ * GPL1 to GPL3.
  */
-public class GPL123LicenseTest {
-    MockClaimReporter reporter;
-    Document subject;
+@RunWith(Parameterized.class)
+public class GPL123LicenseTest extends AbstractMatcherTest {
 
-    /**
-     * To ease testing provide a map with a given license version and the string to test for.
-     */
-    private static Map<IHeaderMatcher, String> licenseStringMap;
+    private static Object[] GPL1 = { "GPL1", "GNU General Public License, version 1", new String[][] {
+            { "fulltext", "", "This program is free software; you can redistribute it and/or modify\n "
+                    + "it under the terms of the GNU General Public License as published by\n "
+                    + "the Free Software Foundation; either version 1, or (at your option)\n " + "any later version." },
+            { "spdx-tab", "", "SPDX-License-Identifier:\tGPL-1.0-only" },
+            { "spdx-space", "", "SPDX-License-Identifier: GPL-1.0-only" }, } };
 
-    /**
-     * If you replace this with BeforeClass and make this method static the build fails at line 67.
-     */
-    @Before
-    public void initLicensesUnderTest() {
-        licenseStringMap = new HashMap<>();
-        licenseStringMap.put(new GPL1License(), GPL1License.FIRST_LICENSE_LINE);
-        licenseStringMap.put(new GPL2License(), GPL2License.FIRST_LICENSE_LINE);
-        licenseStringMap.put(new GPL3License(), GPL3License.FIRST_LICENSE_LINE);
-    }
+    private static Object[] GPL2 = { "GPL2", "GNU General Public License, version 2",
+            new String[][] {
+                    { "fulltext", "",
+                            "This program is free software; you can redistribute it and/or\n"
+                                    + "modify it under the terms of the GNU General Public License\n"
+                                    + "as published by the Free Software Foundation; either version 2\n"
+                                    + "of the License, or (at your option) any later version." },
+                    { "spdx-tab", "", "SPDX-License-Identifier:\tGPL-2.0-only" },
+                    { "spdx-space", "", "SPDX-License-Identifier: GPL-2.0-only" }, } };
 
-    @Before
-    public final void initReporter() {
-        this.reporter = new MockClaimReporter();
-        this.subject = new MockLocation("subject");
-    }
+    private static Object[] GPL3 = { "GPL3", "GNU General Public License, version 3",
+            new String[][] {
+                    { "fulltext", "",
+                            "This program is free software: you can redistribute it and/or modify\n"
+                                    + "    it under the terms of the GNU General Public License as published by\n"
+                                    + "    the Free Software Foundation, either version 3 of the License, or\n"
+                                    + "    (at your option) any later version." },
+                    { "spdx-tab", "", "SPDX-License-Identifier:\tGPL-3.0-only" },
+                    { "spdx-space", "", "SPDX-License-Identifier: GPL-3.0-only" }, } };
 
-    @Test
-    public void testNegativeMatches() throws Exception {
-        for (Map.Entry<IHeaderMatcher, String> licenseUnderTest : licenseStringMap.entrySet()) {
-            assertFalse(licenseUnderTest.getKey().match(subject, "'Behold, Telemachus! (nor fear the sight,)"));
-        }
+    @Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(GPL1, GPL2, GPL3);
     }
 
-    @Test
-    public void testPositiveMatchInDocument() throws Exception {
-        for (Map.Entry<IHeaderMatcher, String> licenseUnderTest : licenseStringMap.entrySet()) {
-            assertTrue(licenseUnderTest.getKey().match(subject, "\t" + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, "     " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " * " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " // " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " /* " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " /** " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, "    " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " ## " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " ## " + licenseUnderTest.getValue() + " ##"));
-        }
+    public GPL123LicenseTest(String cat, String name, String[][] targets) {
+        super(cat, name, targets);
     }
-
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
index 9635aa6c4..b8617016b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
@@ -31,54 +31,17 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class MITLicenseTest {
-    private Document subject;
-
-    /**
-     * To ease testing provide a map with a given license version and the string to test for.
-     */
-    private static Map<IHeaderMatcher, String> licenseStringMap;
-
-    /**
-     * If you replace this with BeforeClass and make this method static the build fails at line 71.
-     */
-    @Before
-    public void initLicensesUnderTest() {
-        licenseStringMap = new HashMap<>();
-        licenseStringMap.put(new MITLicense(),
-                MITLicense.FIRST_LICENSE_LINE
-                        + "\n" + MITLicense.MIDDLE_LICENSE_LINE
-                        + "\r\n * " + MITLicense.AS_IS_LICENSE_LINE);
-        assertEquals(1, licenseStringMap.entrySet().size());
-    }
-
-
-    @Before
-    public final void initReporter() {
-        this.subject = new MockLocation("subject");
+public class MITLicenseTest extends AbstractMatcherTest 
+{
+    private static String category = "MIT";
+    private static String name = "The MIT License";
+    private static String[][] targets = {
+            { "fulltext", "", "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \\\"Software\\\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."},
+            { "spdx-tab", "", "SPDX-License-Identifier:\tMIT" },
+            { "spdx-space", "", "SPDX-License-Identifier: MIT" },
+    };
+    
+    public MITLicenseTest() {
+        super( category, name , targets);
     }
-
-    @Test
-    public void testNegativeMatches() throws Exception {
-        for (Map.Entry<IHeaderMatcher, String> licenseUnderTest : licenseStringMap.entrySet()) {
-            assertFalse(licenseUnderTest.getKey().match(subject, "'Behold, Telemachus! (nor fear the sight,)"));
-        }
-    }
-
-    @Test
-    public void testPositiveMatchInDocument() throws Exception {
-        for (Map.Entry<IHeaderMatcher, String> licenseUnderTest : licenseStringMap.entrySet()) {
-            assertTrue(licenseUnderTest.getKey().match(subject, "\t" + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, "     " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " * " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " // " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " /* " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " /** " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, "    " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " ## " + licenseUnderTest.getValue()));
-            assertTrue(licenseUnderTest.getKey().match(subject, " ## " + licenseUnderTest.getValue() + " ##"));
-        }
-    }
-
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
deleted file mode 100644
index f0ee862e6..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MockStandardLicense.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
-
-public class MockStandardLicense extends BaseLicense {
-
-//    public List visitors = new ArrayList();
-    
-    public MockStandardLicense() {
-        super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, ""), 
-                new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, ""), "");
-    }
-
-    @Override
-    public void reset() {
-        throw new NotImplementedException();
-    }
-
-    @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        throw new NotImplementedException();
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MultiplexLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MultiplexLicenseTest.java
new file mode 100644
index 000000000..0bb59cade
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MultiplexLicenseTest.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */ 
+package org.apache.rat.analysis.license;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.api.Document;
+import org.apache.rat.document.MockLocation;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class MultiplexLicenseTest {
+
+    private static final String LINE_ONE = "Line One";
+    private static final String LINE_TWO = "Line Two";
+
+    private IHeaderMatcher matcherOne;
+    private IHeaderMatcher matcherTwo;
+
+    private MultiplexLicense multiplexer;
+
+    @Before
+    public void setUp() {
+        matcherOne = mock(IHeaderMatcher.class);
+        matcherTwo = mock(IHeaderMatcher.class);
+        multiplexer = new MultiplexLicense("multiplexMatcher Test", Arrays.<IHeaderMatcher>asList(matcherOne, matcherTwo));
+    }
+
+    @Test
+    public void testMatcherLine() throws Exception {
+        final Document document = mock(Document.class);
+        
+        multiplexer.match(document, LINE_ONE);
+        verify(matcherOne, times(1)).match(eq(document), eq(LINE_ONE));
+        verify(matcherTwo, times(1)).match(eq(document), eq(LINE_ONE));
+
+        multiplexer.match(document, LINE_TWO);
+        verify(matcherOne, times(1)).match(eq(document), eq(LINE_TWO));
+        verify(matcherTwo, times(1)).match(eq(document), eq(LINE_TWO));
+        verify(matcherOne, times(2)).match(eq(document), any());
+        verify(matcherTwo, times(2)).match(eq(document), any());
+    }
+
+
+    @Test
+    public void testReset() {
+        multiplexer.reset();
+        verify(matcherOne, times(1)).reset();
+        verify(matcherTwo, times(1)).reset();
+        
+        multiplexer.reset();
+        verify(matcherOne, times(2)).reset();
+        verify(matcherTwo, times(2)).reset();
+    }
+    
+    @Test
+    public void testReportFamily() {
+        Consumer<ILicenseFamily> consumer = mock(Consumer.class);
+        multiplexer.reportFamily(consumer);
+        verify(matcherOne, times(1)).reportFamily(eq(consumer));
+        verify(matcherTwo, times(1)).reportFamily(eq(consumer));
+    }
+    
+    @Test
+    public void testExtractMatcher() {
+        Predicate<ILicenseFamily> comparator = mock(Predicate.class);
+        Consumer<IHeaderMatcher> consumer = mock(Consumer.class);
+
+        multiplexer.extractMatcher(consumer, comparator);
+        verify(matcherOne, times(1)).extractMatcher(eq(consumer),eq(comparator));
+        verify(matcherTwo, times(1)).extractMatcher(eq(consumer),eq(comparator));
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
index 7e4692185..ee68b29ac 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
@@ -32,78 +32,20 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class OASISLicenseTest {
-
-    private static final String LICENSE = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<!--\n" +
-            "\n" +
-            "\n" +
-            "OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.\n" +
-            "\n" +
-            "\n" +
-            "OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director\n." +
-            "\n" +
-            "Copyright (C) OASIS Open (2004-2005). All Rights Reserved.\n" +
-            "\n" +
-            "This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.\n" +
-            "\n" +
-            "\n" +
-            "The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.\n" +
-            "\n" +
-            "\n" +
-            "This document and the information contained herein is provided on an \"AS IS\" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.\n" +
-            "-->\n";
-
-    private OASISLicense license;
-
-    private MockClaimReporter reporter;
-
-    @Before
-    public void setUp() throws Exception {
-        license = new OASISLicense();
-        reporter = new MockClaimReporter();
-    }
-
-    @Test
-    public void match() throws Exception {
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new StringReader(LICENSE));
-            String line = in.readLine();
-            boolean result = false;
-            final Document subject = new MockLocation("subject");
-            while (line != null) {
-                result = license.match(subject, line);
-                line = in.readLine();
-            }
-            assertTrue("OASIS license should be matched", result);
-            license.reset();
-            result = license.match(subject, "New line");
-            assertFalse("After reset, content should build up again", result);
-        } finally {
-            IOUtils.closeQuietly(in);
-        }
-    }
-
-    @Test
-    public void noMatch() throws Exception {
-        BufferedReader in = null;
-        try {
-            in = Resources.getBufferedResourceReader("elements/Source.java");
-            String line = in.readLine();
-            boolean result = false;
-            final Document subject = new MockLocation("subject");
-            while (line != null) {
-                result = license.match(subject, line);
-                line = in.readLine();
-            }
-            assertFalse("OASIS license should not be matched", result);
-            license.reset();
-        } finally {
-            IOUtils.closeQuietly(in);
-        }
+public class OASISLicenseTest extends AbstractMatcherTest {
+
+    private static String category = "OASIS";
+    private static String name = "OASIS Open License";
+    private static String[][] targets = {
+            { "fulltext", "No modifications allowed", "This document and translations of it may be copied and furnished to others and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared copied published and distributed"},
+            {"copyright", "No modifications allowed", ".*Copyright\\s.*OASIS Open.*"}
+    };
+    
+    
+    public OASISLicenseTest() {
+        super( category, name , targets);
     }
-
+   /*
     @Test(timeout = 2000) // may need to be adjusted if many more files are added
     public void goodFiles() throws Exception {
         DirectoryScanner.testFilesInDir("oasis/good", license, true);
@@ -113,5 +55,5 @@ public void goodFiles() throws Exception {
     public void baddFiles() throws Exception {
         DirectoryScanner.testFilesInDir("oasis/bad", license, false);
     }
-
+*/
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
deleted file mode 100644
index b64296182..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/SPDXMatcherTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.rat.Defaults;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.document.MockDocument;
-import org.junit.Before;
-import org.junit.Test;
-
-public class SPDXMatcherTest {
-
-    private IHeaderMatcher defaults;
-    private Document testDocument;
-
-    @Before
-    public void setup() {
-        testDocument = new MockDocument("SPDXMatcher test");
-        Defaults.builder().build();
-        defaults = SPDXMatcher.INSTANCE;
-        }
-    
-    private String getTag(String shortName) {
-        return String.format("Some text\n  SPDX-License-Identifier:\t%s \nSome more text", shortName);
-    }
-    
-    private void validate( String category, String name) {
-        assertEquals(category, testDocument.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY));
-        assertEquals(name, testDocument.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
-  
-    }
-    @Test
-    public void testCDDL1() throws RatHeaderAnalysisException {
-        assertTrue( defaults.match( testDocument, getTag("CDDL-1.0")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_CDDL1, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1);
-    }
-    
-    @Test
-    public void testGPL1() throws RatHeaderAnalysisException {
-        assertTrue( defaults.match( testDocument, getTag("GPL-1.0-only")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL1, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1);
-    }
-
-    @Test
-    public void testGPL2() throws RatHeaderAnalysisException {
-        assertTrue( defaults.match( testDocument, getTag("GPL-2.0-only")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL2, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2);
-    }
-
-    @Test
-    public void testGPL3() throws RatHeaderAnalysisException {
-        assertTrue( defaults.match( testDocument, getTag("GPL-3.0-only")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL3, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3);
-    }
-
-    @Test
-    public void testMIT() throws RatHeaderAnalysisException {
-        assertTrue( defaults.match( testDocument, getTag("MIT")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_MIT, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT);
-    }
-
-    @Test
-    public void testApache2() throws RatHeaderAnalysisException {
-        assertTrue( defaults.match( testDocument, getTag("Apache-2.0")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
-    }
-
-    @Test
-    public void testW3C() throws RatHeaderAnalysisException {
-        assertTrue( defaults.match( testDocument, getTag("W3C")));
-        validate(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3C, MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT);
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
index 6397bbdee..a24cb1839 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
@@ -15,45 +15,46 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis.license;
 
 import org.apache.rat.api.Document;
+
 import org.apache.rat.document.MockLocation;
 import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class W3CLicenseTest {
-
-    public static final String COPYRIGHT_URL 
-    = "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231";
-    
-    public static final String COPYRIGHT_URL_COMMENTED
-    = "# http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 #";
-    
-    public static final String COPYRIGHT_URL_XML
-    = "<!-- http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 -->";
-    
-    private W3CLicense license;
-    private MockClaimReporter reporter;
-
-    @Before
-    public void setUp() throws Exception {
-        license = new W3CLicense();
-        reporter = new MockClaimReporter();
+import java.util.Arrays;
+import java.util.Collection;
+
+@RunWith(Parameterized.class)
+public class W3CLicenseTest extends AbstractMatcherTest {
+
+    private static String W3C_note = "Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.";
+    private static Object[] W3C = { "W3C", "W3C Software Copyright",
+            new String[][] {
+                    { "fulltext", W3C_note, "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231" },
+                    { "spdx-tab", W3C_note, "SPDX-License-Identifier:\tW3C" },
+                    { "spdx-space", W3C_note, "SPDX-License-Identifier: W3C" }, } };
+
+    private static String W3CD_note = "Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";
+    private static Object[] W3CD = { "W3CD", "W3C Document Copyright", new String[][] {
+            { "fulltext", W3CD_note, "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" }, } };
+
+    @Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(W3C, W3CD);
     }
 
-    @Test
-    public void match() throws Exception {
-        final Document subject = new MockLocation("subject");
-        assertTrue("Expected matcher to return license", license.match(subject, COPYRIGHT_URL));
-        assertTrue("Expected matcher to return license", license.match(subject, COPYRIGHT_URL_COMMENTED));
-        assertTrue("Expected matcher to return license", license.match(subject, COPYRIGHT_URL_XML));
-        assertFalse("Return null if the license isn't matched", license.match(subject, "Bogus"));
+    public W3CLicenseTest(String cat, String name, String[][] targets) {
+        super(cat, name, targets);
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java
deleted file mode 100644
index 68d89105c..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.util;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.MockLicenseMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-
-public class MatcherMultiplexerTest {
-
-    private static final String LINE_ONE = "Line One";
-    private static final String LINE_TWO = "Line Two";
-
-    private MockClaimReporter reporter;
-    private MockLicenseMatcher matcherOne;
-    private MockLicenseMatcher matcherTwo;
-
-    private HeaderMatcherMultiplexer multiplexer;
-
-    @Before
-    public void setUp() {
-        matcherOne = new MockLicenseMatcher();
-        matcherTwo = new MockLicenseMatcher();
-        multiplexer = new HeaderMatcherMultiplexer(Arrays.<IHeaderMatcher>asList(matcherOne, matcherTwo));
-        reporter = new MockClaimReporter();
-    }
-
-    @Test
-    public void testMatcherLine() throws Exception {
-        matcherOne.result = false;
-        matcherTwo.result = false;
-        final Document subject = new MockLocation("subject");
-        multiplexer.match(subject, LINE_ONE);
-        assertEquals("One line", 1, matcherOne.lines.size());
-        assertEquals("Same as line passed", LINE_ONE, matcherOne.lines.get(0));
-        assertEquals("One line", 1, matcherTwo.lines.size());
-        assertEquals("Same as line passed", LINE_ONE, matcherTwo.lines.get(0));
-        multiplexer.match(subject, LINE_TWO);
-        assertEquals("One line", 2, matcherOne.lines.size());
-        assertEquals("Same as line passed", LINE_TWO, matcherOne.lines.get(1));
-        assertEquals("One line", 2, matcherTwo.lines.size());
-        assertEquals("Same as line passed", LINE_TWO, matcherTwo.lines.get(1));
-    }
-
-    @Test
-    public void testReset() {
-        multiplexer.reset();
-        assertEquals("Reset once", 1, matcherOne.resets);
-        assertEquals("Reset once", 1, matcherTwo.resets);
-        multiplexer.reset();
-        assertEquals("Reset twice", 2, matcherOne.resets);
-        assertEquals("Reset twice", 2, matcherTwo.resets);
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
index e62891019..255d2d576 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
@@ -1,7 +1,6 @@
 package org.apache.rat.config;
 
 import org.apache.rat.api.MetaData;
-import org.apache.rat.license.GPL1LicenseFamily;
 import org.apache.rat.license.ILicenseFamily;
 import org.junit.Test;
 
@@ -28,17 +27,17 @@
  * under the License.
  */
 public class ConfigurationUtilTest {
-    @Test
-    public void toNamesIsNullSafe() {
-        assertTrue(ConfigurationUtil.toNames(null).isEmpty());
-    }
-
-    @Test
-    public void toNamesIsEmptyArraySafe() {
-        assertTrue(ConfigurationUtil.toNames(new ILicenseFamily[0]).isEmpty());
-    }
-    @Test
-    public void toNamesRegular() {
-        assertEquals(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1, ConfigurationUtil.toNames(new ILicenseFamily[]{new GPL1LicenseFamily()}).get(0));
-    }
+//    @Test
+//    public void toNamesIsNullSafe() {
+//        assertTrue(ConfigurationUtil.toNames(null).isEmpty());
+//    }
+//
+//    @Test
+//    public void toNamesIsEmptyArraySafe() {
+//        assertTrue(ConfigurationUtil.toNames(new ILicenseFamily[0]).isEmpty());
+//    }
+//    @Test
+//    public void toNamesRegular() {
+        //assertEquals(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1, ConfigurationUtil.toNames(new ILicenseFamily[]{new GPL1LicenseFamily()}).get(0));
+//    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index daa57775c..57db6bbad 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -22,49 +22,59 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
 import org.junit.Test;
 
 public class ConfigurationReaderTest {
     
-    private static String[] FAMILIES = {"GEN", "?????", "AL", "OASIS", "W3CD", "W3C", "GPL1", "GPL2", "GPL3", "MIT", "CDDL1", "BSD_m"};
+    private static String[] FAMILIES = {"GEN  ", "?????", "AL   ", "OASIS", "W3CD ", "W3C  ", "GPL1 ", "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "BSD_m"};
     
     @Test
     public void readDefault() throws ConfigurationException {
         ConfigurationReader reader = new ConfigurationReader();
         URL url = ConfigurationReader.class.getResource("/org/apache/rat/default.config");
         reader.read(url);
-        Map<String,MetaData> families = reader.readFamilies();
-        assertTrue(families.keySet().containsAll(Arrays.asList(FAMILIES)));
-        families.keySet().removeAll(Arrays.asList(FAMILIES));
-        assertTrue(families.isEmpty());
+        List<String> familyCategories = Arrays.asList(FAMILIES);
+        Set<String> readCategories = reader.readFamilies().stream().map(ILicenseFamily::getFamilyCategory).collect(Collectors.toSet());
+        assertTrue(readCategories.containsAll(familyCategories));
+        readCategories.removeAll(familyCategories);
+        assertTrue(readCategories.isEmpty());
         
-        Map<String,BaseLicense> licenses = reader.readLicenses();
+        Collection<IHeaderMatcher> licenses = reader.readLicenses();
         assertEquals(15, licenses.size());
         Map<String,Integer> result = new TreeMap<>();
-        licenses.values().stream().map(BaseLicense::getLicenseFamilyCategory).forEach( x -> {
-            Integer i = result.get(x);
-            if (i == null) {
-                result.put(x, 1);
-            } else {
-                result.put(x, 1+i.intValue());
-            }
-        });
-        assertEquals(2,result.get("AL   ").intValue());
+        for (IHeaderMatcher license : licenses) {
+            license.reportFamily( c -> { 
+                Integer i = result.get(c.getFamilyCategory());
+                if (i == null) {
+                    result.put(c.getFamilyCategory(), 1);
+                } else {
+                    result.put(c.getFamilyCategory(), 1+i.intValue());
+                }
+            });
+        }
+ 
+        assertEquals(3,result.get("AL   ").intValue());
         assertEquals(2,result.get("BSD_m").intValue());
-        assertEquals(2,result.get("CDDL1").intValue());
+        assertEquals(3,result.get("CDDL1").intValue());
         assertEquals(2,result.get("GEN  ").intValue());
-        assertEquals(1,result.get("GPL1 ").intValue());
-        assertEquals(1,result.get("GPL2 ").intValue());
-        assertEquals(1,result.get("GPL3 ").intValue());
-        assertEquals(1,result.get("MIT  ").intValue());
-        assertEquals(1,result.get("OASIS").intValue());
-        assertEquals(1,result.get("W3C  ").intValue());
+        assertEquals(2,result.get("GPL1 ").intValue());
+        assertEquals(2,result.get("GPL2 ").intValue());
+        assertEquals(2,result.get("GPL3 ").intValue());
+        assertEquals(2,result.get("MIT  ").intValue());
+        assertEquals(2,result.get("OASIS").intValue());
+        assertEquals(2,result.get("W3C  ").intValue());
         assertEquals(1,result.get("W3CD ").intValue());
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java
deleted file mode 100644
index ceaf2d036..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.report.xml;
-
-import org.apache.rat.report.xml.writer.IXmlWriter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class MockXmlWriter implements IXmlWriter {
-
-    public final List<Object> calls = new ArrayList<>();
-    
-    public IXmlWriter attribute(CharSequence name, CharSequence value)
-            throws IOException {
-        calls.add(new Attribute(name, value));
-        return this;
-    }
-
-    public IXmlWriter closeDocument() throws IOException {
-        calls.add(new CloseDocument());
-        return this;
-    }
-
-    public IXmlWriter closeElement() throws IOException {
-        calls.add(new CloseElement());
-        return this;
-    }
-
-    public IXmlWriter content(CharSequence content) throws IOException {
-        calls.add(new Content(content));
-        return this;
-    }
-
-    public IXmlWriter openElement(CharSequence elementName) throws IOException {
-        calls.add(new OpenElement(elementName));
-        return this;
-    }
-
-    public IXmlWriter startDocument() throws IOException {
-        calls.add(new StartDocument());
-        return this;
-    }
-    
-    public boolean isCloseElement(int index) {
-        boolean result = false;
-        final Object call = calls.get(index);
-        result = call instanceof CloseElement;
-        return result;
-    }
-    
-    public boolean isContent(String content, int index) {
-        boolean result = false;
-        final Object call = calls.get(index);
-        if (call instanceof Content) {
-            Content contentCall = (Content) call;
-            result = content.contentEquals(contentCall.content);
-        }
-        return result;
-    }
-    
-    public boolean isOpenElement(String name, int index) {
-        boolean result = false;
-        final Object call = calls.get(index);
-        if (call instanceof OpenElement) {
-            OpenElement openElement = (OpenElement) call;
-            result = name.contentEquals(openElement.elementName);
-        }
-        return result;
-    }
-
-    public boolean isAttribute(String name, String value, int index) {
-        boolean result = false;
-        final Object call = calls.get(index);
-        if (call instanceof Attribute) {
-            Attribute attribute = (Attribute) call;
-            result = name.contentEquals(attribute.name) && value.contentEquals(attribute.value);
-        }
-        return result;
-    }
-    
-    public class StartDocument {}
-    public class CloseDocument {}
-    public class CloseElement {}
-    public class OpenElement {
-        public final CharSequence elementName;
-        private OpenElement(CharSequence elementName) {
-            this.elementName = elementName;
-        }
-    }
-    public class Content {
-        public final CharSequence content;
-        private Content(CharSequence content) {
-            this.content = content;
-        }
-    }
-    public class Attribute {
-        public final CharSequence name;
-        public final CharSequence value;
-        private Attribute(CharSequence name, CharSequence value) {
-            this.name = name;
-            this.value = value;
-        }
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 3cb1fd368..4ea5bcd84 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -19,7 +19,7 @@
 package org.apache.rat.report.xml;
 
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.analysis.MockLicenseMatcher;
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
@@ -29,13 +29,19 @@
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 import java.io.File;
 import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Pattern;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class XmlReportFactoryTest {
 
@@ -58,11 +64,14 @@ private void report(DirectoryWalker directory, RatReport report) throws Exceptio
     @Test
     public void standardReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final MockLicenseMatcher mockLicenseMatcher = new MockLicenseMatcher();
+        
+        final IHeaderMatcher mockLicenseMatcher = mock(IHeaderMatcher.class);
+        when(mockLicenseMatcher.match(any(),any())).thenReturn( true );
+        
         DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY);
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.setHeaderMatcher(mockLicenseMatcher);
+        configuration.addHeaderMatcher(mockLicenseMatcher);
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
         report(directory, report);
@@ -72,25 +81,7 @@ public void standardReport() throws Exception {
         assertTrue("Preamble and document element are OK",
                    output.startsWith("<?xml version='1.0'?>" +
                 "<rat-report timestamp="));
-        assertTrue("Part after timestamp attribute is OK",
-                   output.endsWith(">" +
-                "<resource name='" + elementsPath + "/ILoggerFactory.java'><type name='standard'/></resource>" +
-                "<resource name='" + elementsPath + "/Image.png'><type name='binary'/></resource>" +
-                "<resource name='" + elementsPath + "/LICENSE'><type name='notice'/></resource>" +
-                "<resource name='" + elementsPath + "/NOTICE'><type name='notice'/></resource>" +
-                "<resource name='" + elementsPath + "/Source.java'><type name='standard'/>" +
-                "</resource>" +
-                "<resource name='" + elementsPath + "/Text.txt'><type name='standard'/>" +
-                "</resource>" +
-                "<resource name='" + elementsPath + "/TextHttps.txt'><type name='standard'/>" +
-                "</resource>" +
-                "<resource name='" + elementsPath + "/Xml.xml'><type name='standard'/>" +
-                "</resource>" +
-                "<resource name='" + elementsPath + "/buildr.rb'><type name='standard'/>" +
-                "</resource>" +
-                           "<resource name='" + elementsPath + "/dummy.jar'><type name='archive'/></resource>" +
-                           "<resource name='" + elementsPath + "/plain.json'><type name='binary'/></resource>" +
-                                   "</rat-report>"));
+        
         assertTrue("Is well formed", XmlUtils.isWellFormedXml(output));
         assertEquals("Binary files", Integer.valueOf(2), statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_BINARY));
         assertEquals("Notice files", Integer.valueOf(2), statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_NOTICE));
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index ef23042b1..3b88145ac 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -23,6 +23,7 @@
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
+import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.AbstractReport;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
@@ -37,10 +38,15 @@
 import java.io.File;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class XmlReportTest {
 
@@ -55,15 +61,9 @@ public void setUp() throws Exception {
         writer = new XmlWriter(out);
         writer.startDocument();
         final SimpleXmlClaimReporter reporter = new SimpleXmlClaimReporter(writer);
-        final IHeaderMatcher matcher = new IHeaderMatcher() {
+        final IHeaderMatcher matcher = mock(IHeaderMatcher.class);
+        when(matcher.match(any(),any())).thenReturn( false );
 
-            public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-                return false;
-            }
-
-            public void reset() {
-            }            
-        };
         IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(matcher);
         final List<AbstractReport> reporters = new ArrayList<>();
         reporters.add(reporter);
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index f11e73e52..410cc3e3c 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -530,9 +530,9 @@ protected ClaimStatistic createReport(Writer out, InputStream style)
     protected ReportConfiguration getConfiguration()
             throws MojoFailureException, MojoExecutionException {
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.setHeaderMatcher(new HeaderMatcherMultiplexer(
+        configuration.addHeaderMatcher(new HeaderMatcherMultiplexer(
                 mergeLicenseMatchers()));
-        configuration.setApprovedLicenseNames(mergeApprovedLicenseNames());
+        configuration.addApprovedLicenseNames(mergeApprovedLicenseNames());
         configuration.setApproveDefaultLicenses(addDefaultLicenseMatchers);
         return configuration;
     }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java
index 03c9d743d..c23fc6e95 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java
@@ -21,6 +21,7 @@
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.analysis.license.FullTextMatchingLicense;
 import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 
@@ -34,6 +35,10 @@ public class FullTextLicenseMatcher extends FullTextMatchingLicense {
     private boolean validated = false;
     private String fullText = "";
     private Project project;
+    
+    public FullTextLicenseMatcher() {
+        super(null, null, null);
+    }
 
     public void setProject(Project project) {
         this.project = project;
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 78b27f951..b1d076d77 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -21,7 +21,9 @@
  import org.apache.commons.io.IOUtils;
  import org.apache.rat.Defaults;
  import org.apache.rat.ReportConfiguration;
- import org.apache.rat.analysis.IHeaderMatcher;
+ import org.apache.rat.ConfigurationException;
+import org.apache.rat.Reporter;
+import org.apache.rat.analysis.IHeaderMatcher;
  import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
  import org.apache.rat.api.RatException;
  import org.apache.rat.license.ILicenseFamily;
@@ -37,13 +39,16 @@
 
 import javax.xml.transform.TransformerException;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
+import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -64,6 +69,10 @@
  * </ul>
  */
 public class Report extends Task {
+    
+    private org.apache.rat.Reporter reporter;
+    private Defaults.Builder defaultsBuilder;
+    private final ReportConfiguration configuration;
 
     /**
      * will hold any nested resource collection
@@ -72,35 +81,36 @@ public class Report extends Task {
     /**
      * The licenses we want to match on.
      */
-    private final ArrayList<IHeaderMatcher> licenseMatchers = new ArrayList<>();
+    //private final ArrayList<IHeaderMatcher> licenseMatchers = new ArrayList<>();
 
-    private final ArrayList<ILicenseFamily> licenseNames = new ArrayList<>();
+    //private final ArrayList<ILicenseFamily> licenseNames = new ArrayList<>();
 
     /**
      * Whether to add the default list of license matchers.
      */
-    private boolean addDefaultLicenseMatchers = true;
+    //private boolean addDefaultLicenseMatchers = true;
     /**
      * Where to send the report.
      */
-    private File reportFile;
-    /**
-     * Which format to use.
-     */
-    private Format format = Format.PLAIN;
+    //private File reportFile;
     /**
      * Which stylesheet to use.
      */
-    private Resource stylesheet;
+    //private Resource stylesheet;
     /**
      * Whether to add license headers.
      */
-    private AddLicenseHeaders addLicenseHeaders = new AddLicenseHeaders(AddLicenseHeaders.FALSE);
+    //private AddLicenseHeaders addLicenseHeaders = new AddLicenseHeaders(AddLicenseHeaders.FALSE);
     /**
      * The copyright message.
      */
-    private String copyrightMessage;
+    //private String copyrightMessage;
 
+    public Report() {
+        configuration = new ReportConfiguration();
+        configuration.setOut(new LogOutputStream(this, Project.MSG_INFO));
+        defaultsBuilder = Defaults.builder();
+    }
     /**
      * Adds resources that will be checked.
      * @param rc resource to check.
@@ -116,18 +126,20 @@ public void add(ResourceCollection rc) {
      * @param matcher Adds a license matcher.
      */
     public void add(IHeaderMatcher matcher) {
-        licenseMatchers.add(matcher);
+        configuration.addHeaderMatcher(matcher);
     }
 
     public void add(ILicenseFamily license) {
-        licenseNames.add(license);
+        configuration.addApprovedLicenseName(license);
     }
 
     /**
      * @param addDefaultLicenseMatchers Whether to add the default list of license matchers.
      */
     public void setAddDefaultLicenseMatchers(boolean addDefaultLicenseMatchers) {
-        this.addDefaultLicenseMatchers = addDefaultLicenseMatchers;
+        if (!addDefaultLicenseMatchers) {
+            defaultsBuilder.noDefault();
+        }
     }
 
     /**
@@ -135,7 +147,11 @@ public void setAddDefaultLicenseMatchers(boolean addDefaultLicenseMatchers) {
      * @param f report output file.
      */
     public void setReportFile(File f) {
-        reportFile = f;
+        try {
+            configuration.setOut(new FileOutputStream(f));
+        } catch (FileNotFoundException e) {
+            throw new BuildException("Can not open output file.", e);
+        }
     }
 
     /**
@@ -146,7 +162,7 @@ public void setFormat(Format f) {
         if (f == null) {
             throw new IllegalArgumentException("format must not be null");
         }
-        format = f;
+        configuration.setStyleReport(! f.getValue().equals(Format.XML_KEY));
     }
 
     /**
@@ -156,14 +172,20 @@ public void setAddLicenseHeaders(AddLicenseHeaders pAdd) {
         if (pAdd == null) {
             throw new IllegalArgumentException("addLicenseHeaders must not be null");
         }
-        addLicenseHeaders = pAdd;
+        if (!Arrays.asList(pAdd.getValues()).contains(pAdd.getValue().toUpperCase())) {
+            throw new IllegalArgumentException("Invalid value for addLicenseHeaders: " + pAdd.getValue());
+        }
+        if (!pAdd.getValue().equalsIgnoreCase(AddLicenseHeaders.FALSE)) {
+            configuration.setAddingLicenses(true);
+            configuration.setAddingLicensesForced(pAdd.getValue().equalsIgnoreCase(AddLicenseHeaders.FORCED));
+        }
     }
 
     /**
-     * @param pMessage copyright message to set.
+     * @param copyrightMessage copyright message to set.
      */
-    public void setCopyrightMessage(String pMessage) {
-        copyrightMessage = pMessage;
+    public void setCopyrightMessage(String copyrightMessage) {
+        configuration.setCopyrightMessage(copyrightMessage);
     }
     
     /**
@@ -171,10 +193,16 @@ public void setCopyrightMessage(String pMessage) {
      * @param u stylesheet.
      */
     public void addConfiguredStylesheet(Union u) {
-        if (stylesheet != null || u.size() != 1) {
+        if (configuration.getStyleSheet() != null || u.size() != 1) {
             throw new BuildException("You must not specify more than one stylesheet.");
         }
-        stylesheet = u.iterator().next();
+        Resource stylesheet = u.iterator().next(); 
+        try {
+            configuration.setStyleSheet(stylesheet.getInputStream());
+        } catch (IOException e) {
+            throw new BuildException("Stylesheet not readable", e);
+        }
+        
     }
 
     /**
@@ -182,27 +210,16 @@ public void addConfiguredStylesheet(Union u) {
      */
     @Override
     public void execute() {
-        validate();
-
-        PrintWriter out = null;
+        configuration.setReportable(new ResourceCollectionContainer(nestedResources));
         try {
-            if (reportFile == null) {
-                out = new PrintWriter(
-                          new OutputStreamWriter(
-                              new LogOutputStream(this, Project.MSG_INFO)
-                          ));
-            } else {
-                out = new PrintWriter(new OutputStreamWriter(
-                        new FileOutputStream(reportFile),
-                        Charset.forName("UTF-8")
-                ));
-            }
-            createReport(out);
-            out.flush();
-        } catch (IOException | RatException | InterruptedException | TransformerException ioex) {
+            validate();
+            Reporter.report(configuration);
+        } catch (BuildException e) {
+            throw e;
+        }catch (Exception ioex) {
             throw new BuildException(ioex);
         } finally {
-            IOUtils.closeQuietly(out);
+            configuration.close();
         }
     }
 
@@ -210,101 +227,41 @@ public void execute() {
      * validates the task's configuration.
      */
     private void validate() {
+        try {
+            configuration.validate( s -> log(s,Project.MSG_WARN));
+        } catch (ConfigurationException e) {
+            throw new BuildException(e.getMessage(), e.getCause());
+        }
         if (nestedResources == null) {
             throw new BuildException("You must specify at least one file to"
                                      + " create the report for.");
         }
-        if (!addDefaultLicenseMatchers && licenseMatchers.size() == 0) {
-            throw new BuildException("You must specify at least one license"
-                                     + " matcher");
-        }
-        if (format.getValue().equals(Format.STYLED_KEY)) {
-            if (stylesheet == null) {
-                throw new BuildException("You must specify a stylesheet when"
-                                         + " using the 'styled' format");
-            }
-            if (!stylesheet.isExists()) {
-                throw new BuildException("Cannot find specified stylesheet '"
-                                         + stylesheet + "'");
-            }
-        } else if (stylesheet != null) {
-            log("Ignoring stylesheet '" + stylesheet + "' when using format '"
-                + format.getValue() + "'", Project.MSG_WARN);
-        }
     }
 
-    /**
-     * Writes the report to the given stream.
-     * 
-     * @param out stream to write report to.
-     * 
-     * @throws IOException in case of I/O errors.
-     * @throws InterruptedException in case of threading errors.
-     * @throws TransformerException in case of XML errors.
-     * @throws RatException in case of general errors.
-     */
-    private void createReport(PrintWriter out) throws IOException, TransformerException, InterruptedException, RatException {
-        final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.setHeaderMatcher(new HeaderMatcherMultiplexer(getLicenseMatchers()));
-        configuration.setApprovedLicenseNames(getApprovedLicenseNames());
-        configuration.setApproveDefaultLicenses(addDefaultLicenseMatchers);
-        
-        if (AddLicenseHeaders.FORCED.equalsIgnoreCase(addLicenseHeaders.getValue())) {
-            configuration.setAddingLicenses(true);
-            configuration.setAddingLicensesForced(true);
-            configuration.setCopyrightMessage(copyrightMessage);
-        } else if (AddLicenseHeaders.TRUE.equalsIgnoreCase(addLicenseHeaders.getValue())) {
-            configuration.setAddingLicenses(true);
-            configuration.setCopyrightMessage(copyrightMessage);
-        } else if (!AddLicenseHeaders.FALSE.equalsIgnoreCase(addLicenseHeaders.getValue())) {
-            throw new BuildException("Invalid value for addLicenseHeaders: " + addLicenseHeaders.getValue());
-        }
-        ResourceCollectionContainer rcElement = new ResourceCollectionContainer(nestedResources);
-        if (format.getValue().equals(Format.XML_KEY)) {
-            org.apache.rat.Report.report(rcElement, out, configuration);
-        } else {
-            InputStream style = null;
-            try {
-                if (format.getValue().equals(Format.PLAIN_KEY)) {
-                    style = Defaults.getPlainStyleSheet();
-                } else if (format.getValue().equals(Format.STYLED_KEY)) {
-                    style = stylesheet.getInputStream();
-                } else {
-                    throw new BuildException("unsupported format '"
-                                             + format.getValue() + "'");
-                }
-                org.apache.rat.Report.report(out, rcElement, style,
-                                             configuration);
-            } finally {
-                FileUtils.close(style);
-            }
-        }
-    }
-
-    /**
-     * Flattens all nested matchers plus the default matchers (if
-     * required) into a single array.
-     */
-    private List<IHeaderMatcher> getLicenseMatchers() {
-        List<IHeaderMatcher> matchers = new ArrayList<>(
-                (addDefaultLicenseMatchers ? Defaults.DEFAULT_MATCHERS.size() : 0) + licenseMatchers.size());
-        if (addDefaultLicenseMatchers) {
-            matchers.addAll(Defaults.DEFAULT_MATCHERS);
-            matchers.addAll(licenseMatchers);
-        } else {
-            matchers = new ArrayList<>(licenseMatchers);
-        }
-        return matchers;
-    }
-
-    private ILicenseFamily[] getApprovedLicenseNames() {
-        // TODO: add support for adding default licenses
-        ILicenseFamily[] results = null;
-        if (licenseNames.size() > 0) {
-            results = licenseNames.toArray(new ILicenseFamily[0]);
-        }
-        return results;
-    }
+//    /**
+//     * Flattens all nested matchers plus the default matchers (if
+//     * required) into a single array.
+//     */
+//    private List<IHeaderMatcher> getLicenseMatchers() {
+//        List<IHeaderMatcher> matchers = new ArrayList<>(
+//                (addDefaultLicenseMatchers ? Defaults.DEFAULT_MATCHERS.size() : 0) + licenseMatchers.size());
+//        if (addDefaultLicenseMatchers) {
+//            matchers.addAll(Defaults.DEFAULT_MATCHERS);
+//            matchers.addAll(licenseMatchers);
+//        } else {
+//            matchers = new ArrayList<>(licenseMatchers);
+//        }
+//        return matchers;
+//    }
+//
+//    private ILicenseFamily[] getApprovedLicenseNames() {
+//        // TODO: add support for adding default licenses
+//        ILicenseFamily[] results = null;
+//        if (licenseNames.size() > 0) {
+//            results = licenseNames.toArray(new ILicenseFamily[0]);
+//        }
+//        return results;
+//    }
 
     /**
      * Type for the format attribute.
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java
index a241732af..6f9cb3538 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java
@@ -21,6 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.rat.analysis.license.SimplePatternBasedLicense;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.api.MetaData.Datum;
 import org.apache.tools.ant.BuildException;
 
 /**
@@ -32,6 +34,10 @@
 public class SubstringLicenseMatcher extends SimplePatternBasedLicense {
     private final List<String> patterns = new ArrayList<>();
     private boolean validated = false;
+    
+    public SubstringLicenseMatcher() {
+        super(null, null, null);
+    }
 
     public void addConfiguredPattern(Pattern p) {
         patterns.add(p.getSubstring());
diff --git a/apache-rat-tasks/src/test/java/org/example/Matcher.java b/apache-rat-tasks/src/test/java/org/example/Matcher.java
index bead7a78b..1b5bbee3d 100644
--- a/apache-rat-tasks/src/test/java/org/example/Matcher.java
+++ b/apache-rat-tasks/src/test/java/org/example/Matcher.java
@@ -23,10 +23,9 @@
 import org.apache.rat.api.MetaData;
 
 
-public class Matcher extends BaseLicense implements IHeaderMatcher {
+public class Matcher extends BaseLicense  {
     public Matcher() {
-        super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, "EXMPL"),
-                new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, "Example License"), "");
+        super( "EXMPL", "Example License", "");
     }
     public void reset() {}
     

From 38094daf79dd6e1472103397da1b671b0daf057f Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 9 Sep 2023 19:33:49 +0200
Subject: [PATCH 080/299] fixed compilation issues

---
 .../apache/rat/policy/DefaultPolicyTest.java  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index cc7e54bb7..b5176295b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -29,16 +29,18 @@
 import java.util.ArrayList;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 
 public class DefaultPolicyTest {
     private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 12;
 
-    private static final ILicenseFamily JUST_A_TEST_LIC_FAMILY = new ILicenseFamily() {
-        public String getFamilyName() {
-            return "justATest";
-        }
-    };
+    private static final ILicenseFamily JUST_A_TEST_LIC_FAMILY = mock(ILicenseFamily.class);
+    static {
+        when(JUST_A_TEST_LIC_FAMILY.getFamilyName()).thenReturn("justATest" );
+        
+    }
 
     private Document subject;
     private DefaultPolicy policy;
@@ -124,7 +126,7 @@ public void testNullAsMarkerOfDefaults() {
         // with defaults
         for (DefaultPolicy policy : new DefaultPolicy[]{//
                 new DefaultPolicy(), //
-                new DefaultPolicy(new ArrayList<String>(0), true),//
+                new DefaultPolicy(new ArrayList<ILicenseFamily>(0), true),//
                 new DefaultPolicy(new ILicenseFamily[]{}, true),
         }) {
             assertEquals("Did you add new license defaults?", NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
@@ -132,7 +134,7 @@ public void testNullAsMarkerOfDefaults() {
 
         // without defaults and no additions == 0
         for (DefaultPolicy policy : new DefaultPolicy[]{//
-                new DefaultPolicy(new ArrayList<String>(0), false),//
+                new DefaultPolicy(new ArrayList<ILicenseFamily>(0), false),//
                 new DefaultPolicy(new ILicenseFamily[]{}, false),
         }) {
             assertEquals(0, policy.getApprovedLicenseNames().size());
@@ -141,13 +143,13 @@ public void testNullAsMarkerOfDefaults() {
 
     @Test
     public void testAddNewApprovedLicenseAndDefaults() {
-        assertEquals("justATest", new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().get(0));
+        assertEquals("justATest", new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().first().getFamilyName());
         assertEquals("Did not properly merge approved licenses with default", 1, new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().size());
     }
 
     @Test
     public void testAddNewApprovedLicenseNoDefaults() {
-        assertEquals("justATest", new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().get(0));
+        assertEquals("justATest", new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().first().getFamilyName());
         assertEquals("Did not properly merge approved licenses with default", NUMBER_OF_DEFAULT_ACCEPTED_LICENSES + 1, new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, true).getApprovedLicenseNames().size());
     }
 }

From 6862f65c53c505a6cc4ca957030777fc235ecbd9 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 10 Sep 2023 16:53:13 +0200
Subject: [PATCH 081/299] extracted matchers from licenses\nswitched to XML
 configuration

---
 apache-rat-core/architecture_notes.md         |  52 +++
 .../main/java/org/apache/rat/Defaults.java    |  12 +-
 .../org/apache/rat/ReportConfiguration.java   |   4 +-
 .../main/java/org/apache/rat/Reporter.java    |   3 +-
 .../rat/analysis/HeaderCheckWorker.java       |  10 +-
 .../apache/rat/analysis/IHeaderMatcher.java   |   4 +-
 .../GeneratedLicenseNotRequired.java          |   6 +-
 .../rat/analysis/license/BaseLicense.java     |  76 +----
 .../rat/analysis/license/CopyrightHeader.java |  55 +---
 .../license/FullTextMatchingLicense.java      | 104 +-----
 .../analysis/license/MultiplexLicense.java    |  57 ----
 .../license/SimplePatternBasedLicense.java    |  74 ++---
 .../matchers/AbstractHeaderMatcher.java       |  43 +++
 .../matchers/AbstractMatcherContainer.java    |  44 +++
 .../rat/analysis/matchers/AndMatcher.java     |  51 +++
 .../analysis/matchers/CopyrightMatcher.java   | 117 +++++++
 .../analysis/matchers/FullTextMatcher.java    | 140 ++++++++
 .../rat/analysis/matchers/OrMatcher.java      |  33 ++
 .../SPDXMatcherFactory.java}                  |  91 ++----
 .../analysis/matchers/SimpleTextMatcher.java  |  58 ++++
 ....java => PropertyConfigurationReader.java} |  12 +-
 .../org/apache/rat/configuration/Readers.java |   2 +-
 .../configuration/XMLConfigurationReader.java | 304 ++++++++++++++++++
 .../java/org/apache/rat/license/ILicense.java |  20 ++
 .../org/apache/rat/license/SimpleLicense.java |  80 +++++
 .../main/resources/org/apache/rat/default.xml | 126 ++++++++
 .../org/apache/rat/generation-keywords.txt    |  26 ++
 .../test/java/org/apache/rat/ReportTest.java  |   4 +-
 .../GeneratedLicenseNotRequiredTest.java      |  25 +-
 .../analysis/license/AbstractMatcherTest.java |   9 +-
 .../AppliedApacheSoftwareLicense20Test.java   |   9 +-
 .../analysis/license/CopyrightHeaderTest.java |  19 +-
 .../analysis/license/DirectoryScanner.java    |   2 +-
 ...lexLicenseTest.java => OrMatcherTest.java} |  67 ++--
 .../ConfigurationReaderTest.java              |   4 +-
 .../apache/rat/configuration/ReadersTest.java |   4 +-
 .../src/test/java/org/example/Matcher.java    |  10 +-
 37 files changed, 1285 insertions(+), 472 deletions(-)
 create mode 100644 apache-rat-core/architecture_notes.md
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
 rename apache-rat-core/src/main/java/org/apache/rat/analysis/{license/SPDXMatcher.java => matchers/SPDXMatcherFactory.java} (57%)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
 rename apache-rat-core/src/main/java/org/apache/rat/configuration/{ConfigurationReader.java => PropertyConfigurationReader.java} (93%)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
 create mode 100644 apache-rat-core/src/main/resources/org/apache/rat/default.xml
 create mode 100644 apache-rat-core/src/main/resources/org/apache/rat/generation-keywords.txt
 rename apache-rat-core/src/test/java/org/apache/rat/analysis/license/{MultiplexLicenseTest.java => OrMatcherTest.java} (74%)

diff --git a/apache-rat-core/architecture_notes.md b/apache-rat-core/architecture_notes.md
new file mode 100644
index 000000000..4bb3ad3da
--- /dev/null
+++ b/apache-rat-core/architecture_notes.md
@@ -0,0 +1,52 @@
+# RAT Architecture notes.
+
+## Source definition
+
+In this document source files are the files that RAT is checking.  They can be individual source files, document files,
+configuration files, archives, etc.  The use of the term "source" does not specify application source files per. se.
+
+## License definitions
+
+Licenses comprise a unique ID, a name, and a series of tests.
+
+ * The uniqueID and name are defined in the interface `ILicenseFamiy`
+ * The tests are defined in the interface `IHeaderMatcher`
+ * If any of the tests are matched then the license is detected.
+ * tests may be multiplexing tests that containt more than one test.  Multiplexing tests are either
+ 	  * `AND` tests where all the the sub tests must be true for the test to be true; or
+ 	  * `OR` tests where one the the sub-tests being true makes the entire test true.
+ 
+ 
+ When source files are tested for the presence of a license all the license checks are performed in parallel.
+ 
+ ## Tests
+ 
+ There are several implementations of tests
+ 
+ ### Text
+ 
+ Text is specified, the complete text must be located in the source file.
+ 
+ ### SPDX
+ 
+ The SPDX keyword must be found within the source file.  SPDX keyword have the form `SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)`
+ when defining the SPDX matcher onlyt the variable alpha-numeric phrase may be specified (eg the 'Apache-2.0' in the SPDX
+ identifier 'SPDX-License-Identifier: Apache-2.0`
+ 
+ ### Copyright
+ 
+ The copyright must match a specific date(range) and owner.
+ 
+ ### Multiplex
+ 
+ Multiplex tests comprise several tests.  How the test is evaluated depends upon the type.
+ 
+ #### ANY-Multiplex (aka OR-Multiplex)
+ If any of the tests comprising the ANY-Multiplex test pass then the ANY-Multiplex test passes.
+ 
+ #### ALL-Multiplex (aka AND-Multiplex)
+Only if all of the tests comprising the ALL-Multiplex test pass will the ALL-Multiplex test pass.
+ 
+ ### License test
+ All licenses are defined as ANY-Multiplex tests.  Licenses therefore be uses as tests within other tests.  However, this
+ only makes sense in the context of an ALL-Multiplex test.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 22394be08..9d5e8acb4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -33,8 +33,8 @@
 import java.util.stream.Collectors;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.license.MultiplexLicense;
-import org.apache.rat.analysis.license.SPDXMatcher;
+import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
 import org.apache.rat.configuration.Reader;
 import org.apache.rat.configuration.Readers;
 import org.apache.rat.license.ILicenseFamily;
@@ -88,12 +88,12 @@ public static InputStream getDefaultStyleSheet() {
     }
 
     public static IHeaderMatcher createDefaultMatcher() {
-        List<IHeaderMatcher> matchers = getLicenses().stream().filter(x -> !(x instanceof SPDXMatcher.Match))
+        List<IHeaderMatcher> matchers = getLicenses().stream().filter(x -> !(x instanceof SPDXMatcherFactory.Match))
                 .collect(Collectors.toList());
-        if (SPDXMatcher.INSTANCE.isActive()) {
-            matchers.add(SPDXMatcher.INSTANCE);
+        if (SPDXMatcherFactory.INSTANCE.isActive()) {
+            matchers.add(SPDXMatcherFactory.INSTANCE);
         }
-        return new MultiplexLicense("Default matcher", matchers);
+        return new OrMatcher("Default matcher", matchers);
     }
 
     public static Collection<IHeaderMatcher> getLicenses() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 72f570657..569389a2e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -31,7 +31,7 @@
 import java.util.function.Consumer;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.license.MultiplexLicense;
+import org.apache.rat.analysis.matchers.OrMatcher;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.IReportable;
 
@@ -130,7 +130,7 @@ public IHeaderMatcher getHeaderMatcher() {
         if (headerMatcher.size() == 1) {
             return headerMatcher.get(0);
         }
-        return new MultiplexLicense("Report matchers", headerMatcher);
+        return new OrMatcher("Report matchers", headerMatcher);
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index da92bd8ce..c3f389d74 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.PipedReader;
 import java.io.PipedWriter;
-import java.io.PrintStream;
 import java.io.Writer;
 import java.util.List;
 import java.util.regex.PatternSyntaxException;
@@ -42,7 +41,7 @@
 
 public class Reporter {
 
-    static FilenameFilter parseExclusions(List<String> excludes) throws IOException {
+    static FilenameFilter parseExclusions(List<String> excludes) {
         final OrFileFilter orFilter = new OrFileFilter();
         int ignoredLines = 0;
         for (String exclude : excludes) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index b7b51f7ba..6e7890cd0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -37,7 +37,7 @@ class HeaderCheckWorker {
     private final int numberOfRetainedHeaderLines;
     private final BufferedReader reader;
     private final IHeaderMatcher matcher;
-    private final Document subject;
+    private final Document document;
     
     private boolean match = false;
 
@@ -64,7 +64,7 @@ public HeaderCheckWorker(BufferedReader reader, int numberOfRetainedHeaderLine,
         this.reader = reader;
         this.numberOfRetainedHeaderLines = numberOfRetainedHeaderLine;
         this.matcher = matcher;
-        this.subject = name;
+        this.document = name;
     }
 
     public boolean isFinished() {
@@ -81,13 +81,13 @@ public void read() throws RatHeaderAnalysisException {
                 }
                 if (!match) {
                     final String notes = headers.toString();
-                    final MetaData metaData = subject.getMetaData();
+                    final MetaData metaData = document.getMetaData();
                     metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
                     metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN));
                     metaData.set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN);
                 }
             } catch (IOException e) {
-                throw new RatHeaderAnalysisException("Cannot read header for " + subject, e);
+                throw new RatHeaderAnalysisException("Cannot read header for " + document, e);
             }
             IOUtils.closeQuietly(reader);
             matcher.reset();
@@ -103,7 +103,7 @@ boolean readLine(StringBuilder headers) throws IOException, RatHeaderAnalysisExc
                 headers.append(line);
                 headers.append('\n');
             }
-            match = matcher.match(subject, line);
+            match = matcher.match(document.getMetaData(), line);
             result = !match;
         }
         return result;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index e0480c4eb..0c058a292 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -23,7 +23,7 @@
 import java.util.function.Predicate;
 
 import org.apache.rat.api.Document;
-
+import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 /**
  * Matches text headers to known licenses.
@@ -51,7 +51,7 @@ public interface IHeaderMatcher {
      * 
      * @throws RatHeaderAnalysisException in case of internal RAT errors.
      */
-    boolean match(Document subject, String line) throws RatHeaderAnalysisException;
+    boolean matches(String line) throws RatHeaderAnalysisException;
     
     /**
      * Report the license family for this and any contained implementations.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
index e801de3b7..be39e68db 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
@@ -81,19 +81,19 @@ public GeneratedLicenseNotRequired(final String[] lines) {
     }
 
     @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
+    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
         boolean result = false;
         for (Pattern pat : linePatterns) {
             if (pat.matcher(line).matches()) {
                 result = true;
-                reportOnLicense(subject);
+                reportOnLicense(metadata);
                 break;
             }
         }
         for(String phrase : phrases) {
             if (line.contains(phrase)) {
                 result = true;
-                reportOnLicense(subject);
+                reportOnLicense(metadata);
                 break;
             }                
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index fd880912c..55dc52c2d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -15,89 +15,59 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis.license;
 
-import java.util.Collection;
-import java.util.Comparator;
+import java.util.Arrays;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.matchers.AbstractMatcherContainer;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.SimpleLicenseFamily;
 
-/*
- * Todo move to bulder pattern
- */
-
-public abstract class BaseLicense implements IHeaderMatcher {
+public abstract class BaseLicense extends AbstractMatcherContainer {
     private ILicenseFamily family;
     private String notes;
-    private String idPrefix;
 
-    public BaseLicense(ILicenseFamily family, String notes) {
-        this(family, notes, null);
+    public BaseLicense(ILicenseFamily family, String notes, IHeaderMatcher matcher) {
+        this(null, family, notes, matcher);
     }
-    
-    public BaseLicense(ILicenseFamily family, String notes, String idPrefix) {
+
+    public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher) {
+        super(String.format("%s:%s:%s/%s", idPrefix == null ? "" : idPrefix, family.getFamilyCategory(),
+                matcher.getClass().getSimpleName(), matcher.getId()), Arrays.asList(matcher));
         this.family = family;
         this.notes = notes;
-        this.idPrefix = idPrefix;
-    }
-    
-    @Override
-    public String toString() {
-        return getId();
-    }
-    
-    public String getId() {
-        return String.format( "%s:%s:%s", idPrefix==null?"":idPrefix, family.getFamilyCategory(), this.getClass().getSimpleName());
-    }
-
-    public String getIdPrefix() {
-        return idPrefix;
-    }
-
-    public void setIdPrefix(String idPrefix) {
-        this.idPrefix = idPrefix;
     }
 
     public ILicenseFamily getLicenseFamily() {
         return family;
     }
 
-    public void setLicenseFamilyCategory(String category) {
-        this.family = new SimpleLicenseFamily(category, family == null? null : family.getFamilyName());
-    }
-    
-    public void setLicenseFamilyName(String name) {
-        this.family = new SimpleLicenseFamily(family == null? null : family.getFamilyCategory(), name);
-    }
-
     public String getNotes() {
         return notes;
     }
 
-    public void setNotes(String pNotes) {
-        notes = pNotes;
-    }
-
-    public final void reportOnLicense(Document subject) {
-        final MetaData metaData = subject.getMetaData();
+    public final void reportOnLicense(MetaData metaData) {
         metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
         metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, family.getFamilyCategory()));
         metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, family.getFamilyCategory()));
         metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, family.getFamilyName()));
     }
 
+    @Override
+    public boolean matches(String line) throws RatHeaderAnalysisException {
+        return enclosed.iterator().next().matches(line);
+    }
+
     /**
      * Removes everything except letter or digit from text.
+     * 
      * @param text The text to remove extra chars from.
      * @return the pruned text.
      */
@@ -112,16 +82,4 @@ protected static final String prune(String text) {
         }
         return buffer.toString();
     }
-
-    @Override
-    public void reportFamily(Consumer<ILicenseFamily> consumer) {
-        consumer.accept(family);
-    }
-
-    @Override
-    public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
-        if (comparator.test(family)) {
-            consumer.accept(this);
-        }
-    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
index 553b67a1b..817a5a22e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
@@ -20,7 +20,9 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.matchers.CopyrightMatcher;
 import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
 import org.apache.rat.api.MetaData.Datum;
 import org.apache.rat.license.ILicenseFamily;
 
@@ -47,58 +49,13 @@
  */
 public class CopyrightHeader extends BaseLicense {
 
-    public static final String COPYRIGHT_PREFIX_PATTERN_DEFN = ".*Copyright [0-9]{4}(\\-[0-9]{4})? ";
-
-    private Pattern copyrightPattern;
-    private String copyrightOwner;
-    private boolean copyrightMatch = false;
-
-    protected CopyrightHeader(ILicenseFamily licenseFamily, String notes) {
-        super(licenseFamily, notes);
-    }
-
-    public CopyrightHeader(String idPrefix, ILicenseFamily licenseFamily, String notes, String copyrightOwner) {
-        super(licenseFamily, notes, idPrefix);
-        setCopyrightOwner(copyrightOwner);
-    }
     
-    public CopyrightHeader(ILicenseFamily licenseFamily, String notes, String copyrightOwner) {
-        this(null, licenseFamily, notes, copyrightOwner);
-    }
-
-    // Called by ctor, so must not be overridden
-    public final void setCopyrightOwner(String copyrightOwner) {
-        this.copyrightOwner = copyrightOwner;
-        this.copyrightPattern = Pattern.compile(COPYRIGHT_PREFIX_PATTERN_DEFN + copyrightOwner + ".*", Pattern.CASE_INSENSITIVE);
-    }
-
-    public String getCopyRightOwner() {
-        return copyrightOwner;
-    }
-
-    public boolean hasCopyrightPattern() {
-        return copyrightPattern != null;
-    }
-
-    protected boolean isCopyrightMatch() {
-        return copyrightMatch;
-    }
-
-    protected boolean matchCopyright(String s) {
-        if (!copyrightMatch) {
-            copyrightMatch = copyrightPattern.matcher(s).matches();
-        }
-        return copyrightMatch;
-    }
 
-    public boolean match(Document subject, String s) throws RatHeaderAnalysisException {
-        if (!copyrightMatch && matchCopyright(s)) {
-            reportOnLicense(subject);
-        }
-        return copyrightMatch;
+    protected CopyrightHeader(ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
+        super(licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
 
-    public void reset() {
-        copyrightMatch = false;
+    public CopyrightHeader(String id, ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
+        super(id, licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index d16d8a033..fb2ca1801 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -15,23 +15,26 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis.license;
 
 import java.util.Locale;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
+import org.apache.rat.analysis.matchers.FullTextMatcher;
+import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 
 /**
- * Accumulates all letters and numbers contained inside the header and
- * compares it to the full text of a given license (after reducing it
- * to letters and numbers as well).
+ * Accumulates all letters and numbers contained inside the header and compares
+ * it to the full text of a given license (after reducing it to letters and
+ * numbers as well).
  *
- * <p>The text comparison is case insensitive but assumes only
- * characters in the US-ASCII charset are being matched.</p>
+ * <p>
+ * The text comparison is case insensitive but assumes only characters in the
+ * US-ASCII charset are being matched.
+ * </p>
  *
  * @since Rat 0.9
  */
@@ -41,95 +44,14 @@ public class FullTextMatchingLicense extends BaseLicense {
     private static final int DEFAULT_INITIAL_LINE_LENGTH = 20;
 
     private String fullText;
-    
+
     private String firstLine;
 
     private boolean seenFirstLine = false;
 
     private final StringBuilder buffer = new StringBuilder();
-    
-    public FullTextMatchingLicense(ILicenseFamily licenseFamily) {
-        this(licenseFamily, null);
-    }
-    
-    public FullTextMatchingLicense(ILicenseFamily licenseFamily, String notes) {
-        this(null, licenseFamily, notes);
-    }
-    
-    public FullTextMatchingLicense(String idPrefix, ILicenseFamily licenseFamily, String notes) {
-        super(licenseFamily, notes, idPrefix);
-    }
-    
-    public FullTextMatchingLicense(ILicenseFamily family,
-            String notes,
-            String fullText) {
-        this(null, family, notes, fullText);
-    }
-
-    public FullTextMatchingLicense(String idPrefix, ILicenseFamily family,
-                                      String notes,
-                                      String fullText) {
-        super(family, notes, idPrefix);
-        setFullText(fullText);
-    }
-
-    public final void setFullText(String text) {
-        int offset = text.indexOf('\n');
-        if (offset == -1) {
-            offset = Math.min(DEFAULT_INITIAL_LINE_LENGTH, text.length());
-        }
-        firstLine = prune(text.substring(0, offset)).toLowerCase(Locale.ENGLISH);
-        fullText = prune(text).toLowerCase(Locale.ENGLISH);
-        init();
-    }
-
-    public final boolean hasFullText() {
-        return fullText != null;
-    }
-
-    @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        final String inputToMatch = prune(line).toLowerCase(Locale.ENGLISH);
-        if (seenFirstLine) { // Accumulate more input
-            buffer.append(inputToMatch);
-        } else {
-            int offset = inputToMatch.indexOf(firstLine);
-            if (offset >= 0) {
-                // we have a match, save the text starting with the match
-                buffer.append(inputToMatch.substring(offset));
-                seenFirstLine = true;
-                // Drop out to check whether full text is matched
-            } else {
-                // we assume that the first line must appear in a single line
-                return false; // no more to do here
-            }
-        }
- 
-        if (buffer.length() >= fullText.length()) { // we have enough data to match
-            if (buffer.toString().contains(fullText)) {
-                reportOnLicense(subject);
-                return true; // we found a match
-            } 
-            // buffer contains first line but does not contain full text
-            // It's possible that the buffer contains the first line again
-            int offset = buffer.substring(1).indexOf(firstLine);
-            if (offset >= 0) { // first line found again
-                buffer.delete(0,offset); // reset buffer to the new start
-            } else { // buffer does not even contain first line, so cannot be used to match full text
-                init();
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void reset() {
-        init();
-    }
 
-    // This is called indirectly from a ctor so must be final or private
-    private void init() {
-        buffer.setLength(0);
-        seenFirstLine = false;
+    public FullTextMatchingLicense(ILicenseFamily family, String notes, String fullText) {
+        super(family, notes, new FullTextMatcher(fullText));
     }
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
deleted file mode 100644
index f203d0d96..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MultiplexLicense.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.rat.analysis.license;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.license.ILicenseFamily;
-
-public class MultiplexLicense implements IHeaderMatcher {
-    
-    private Collection<IHeaderMatcher> enclosed;
-    private String id;
-    
-    public MultiplexLicense(String id, Collection<IHeaderMatcher> enclosed) {
-        this.id = id;
-        this.enclosed = new ArrayList<>(enclosed);
-    }
-
-    @Override
-    public String toString() {
-        return getId();
-    }
-    
-    public String getId() {
-        return id;
-    }
-    
-    @Override
-    public void reset() {
-        enclosed.stream().forEach(x -> x.reset());
-    }
-
-    @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        for (IHeaderMatcher matcher : enclosed) {
-            if (matcher.match(subject, line)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void reportFamily(Consumer<ILicenseFamily> consumer) {
-        enclosed.forEach(x -> x.reportFamily(consumer));
-    }
-    
-    @Override
-    public void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
-        enclosed.forEach(x -> x.extractMatcher(matchers, comparator));
-    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
index aafdcbde1..bab738a5c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -18,16 +18,31 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
+import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.analysis.matchers.SimpleTextMatcher;
+import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 
 /**
  * @since Rat 0.8
  */
 public class SimplePatternBasedLicense extends BaseLicense {
-    private String[] patterns;
 
+    private static IHeaderMatcher getMatcher(String[] patterns) {
+        if (patterns.length == 1)
+        {
+            return new SimpleTextMatcher(patterns[0]);
+        } 
+        Collection<IHeaderMatcher> collection = Arrays.stream(patterns).map(SimpleTextMatcher::new)
+                .collect(Collectors.toList());
+        return new OrMatcher(collection);
+    }
     /**
      * Creates a pattern based license with full documentation.
      * 
@@ -37,59 +52,10 @@ public class SimplePatternBasedLicense extends BaseLicense {
      * @param pPatterns
      */
     public SimplePatternBasedLicense(ILicenseFamily licenseFamily, String notes, String[] patterns) {
-        this(null,licenseFamily, notes, patterns);
-    }
-    
-    public SimplePatternBasedLicense(String idPrefix, ILicenseFamily licenseFamily, String notes, String[] patterns) {
-        super(licenseFamily, notes, idPrefix);
-        setPatterns(patterns);
-    }
-
-    /**
-     * Creates a pattern based license without patterns.
-     * 
-     * @param pLicenseFamilyCategory
-     * @param pLicenseFamilyName
-     * @param pNotes
-     */
-    protected SimplePatternBasedLicense(ILicenseFamily licenseFamily, String notes) {
-        super(licenseFamily, notes);
-    }
-
-    public String[] getPatterns() {
-        return patterns;
-    }
-
-    public void setPatterns(String[] pPatterns) {
-        patterns = pPatterns;
+        this(null, licenseFamily, notes, patterns);
     }
 
-    protected boolean matches(String pLine) {
-        if (pLine != null) {
-            final String[] pttrns = getPatterns();
-            if (pttrns != null) {
-                for (String pttrn : pttrns) {
-                    if (pLine.contains(pttrn)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
+    public SimplePatternBasedLicense(String id, ILicenseFamily licenseFamily, String notes, String[] patterns) {
+        super(licenseFamily, notes, getMatcher(patterns));
     }
-
-    @Override
-    public void reset() {
-        // Nothing to do
-    }
-
-    @Override
-    public boolean match(Document pSubject, String pLine) throws RatHeaderAnalysisException {
-        final boolean result = matches(pLine);
-        if (result) {
-            reportOnLicense(pSubject);
-        }
-        return result;
-    }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
new file mode 100644
index 000000000..5902b111e
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
@@ -0,0 +1,43 @@
+package org.apache.rat.analysis.matchers;
+
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+
+public abstract class AbstractHeaderMatcher implements IHeaderMatcher {
+    
+    private String id;
+    
+    protected AbstractHeaderMatcher() {
+        this(UUID.randomUUID().toString());
+    }
+    
+    protected AbstractHeaderMatcher(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public void reportFamily(Consumer<ILicenseFamily> consumer) {
+        // by default do nothing.
+    }
+
+    @Override
+    public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
+        // by default do nothing
+    }
+
+    @Override
+    public String toString() {
+        return getId();
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
new file mode 100644
index 000000000..36aee049b
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -0,0 +1,44 @@
+package org.apache.rat.analysis.matchers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+
+public abstract class AbstractMatcherContainer extends AbstractHeaderMatcher {
+    
+    protected Collection<IHeaderMatcher> enclosed;
+
+    
+    public AbstractMatcherContainer(String id, Collection<IHeaderMatcher> enclosed) {
+        super(id);
+        this.enclosed = new ArrayList<>(enclosed);
+    }
+    
+    public AbstractMatcherContainer(Collection<IHeaderMatcher> enclosed) {
+        super();
+        this.enclosed = new ArrayList<>(enclosed);
+    }
+
+    @Override
+    public void reset() {
+        enclosed.stream().forEach(x -> x.reset());
+    }
+
+    @Override
+    public final void reportFamily(Consumer<ILicenseFamily> consumer) {
+        enclosed.forEach(x -> x.reportFamily(consumer));
+    }
+    
+    @Override
+    public final void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
+        enclosed.forEach(x -> x.extractMatcher(matchers, comparator));
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
new file mode 100644
index 000000000..a4d14458e
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -0,0 +1,51 @@
+package org.apache.rat.analysis.matchers;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+
+public class AndMatcher extends AbstractMatcherContainer {
+    private boolean[] flags = null;
+    
+    public AndMatcher(String id, Collection<IHeaderMatcher> enclosed) {
+        super(id, enclosed);
+        flags = new boolean[enclosed.size()];
+    }
+    
+    public AndMatcher(Collection<IHeaderMatcher> enclosed) {
+        super(enclosed);
+        flags = new boolean[enclosed.size()];
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        flags = new boolean[enclosed.size()];
+    }
+
+    @Override
+    public boolean matches(String line) throws RatHeaderAnalysisException {
+        boolean result = true;
+        Iterator<IHeaderMatcher> iter = enclosed.iterator();
+        int i=0;
+        while(iter.hasNext()) {
+            if (flags[i]) {
+                iter.next();
+            } else {
+                flags[i] = iter.next().matches(line);
+                result &= flags[i];
+            }
+        }
+        return result;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
new file mode 100644
index 000000000..a24eccacd
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.matchers;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Matches a typical Copyright header line only based on a regex pattern which
+ * allows for one (starting) year or year range, and a configurable copyright
+ * owner. <br>
+ * <br>
+ * The matching is done case insensitive<br>
+ * <br>
+ * Example supported Copyright header lines, using copyright owner
+ * &quot;FooBar&quot;
+ * <ul>
+ * <li>* Copyright 2010 FooBar. *</li>
+ * <li>* Copyright 2010-2012 FooBar. *</li>
+ * <li>*copyright 2012 foobar*</li>
+ * </ul>
+ * <p>
+ * Note also that the copyright owner is appended to the regex pattern, so can
+ * support additional regex but also requires escaping where needed,<br>
+ * e.g. use &quot;FooBar \(www\.foobar\.com\)&quot; for matching &quot;FooBar
+ * (www.foobar.com)&quot;
+ * </p>
+ *
+ * @since Rat 0.9
+ */
+public class CopyrightMatcher extends AbstractHeaderMatcher {
+
+    private static final String COPYRIGHT_PATTERN_DEFN = "(\\b)?\\([Cc]\\)|©|Copyright\\b";
+    private static final Pattern COPYRIGHT_PATTERN = Pattern.compile(COPYRIGHT_PATTERN_DEFN);
+
+    private Pattern datePattern;
+    private String owner;
+    private boolean answered;
+
+    public CopyrightMatcher(String start, String stop, String owner) {
+        super();
+        if (start != null) {
+            if (stop != null) {
+                datePattern = Pattern.compile(String.format("\\b%s\\s?-\\s?%s\\b", start, stop));
+            } else {
+                datePattern = Pattern.compile(String.format("\\b%s\\b", start));
+            }
+        } else {
+            datePattern = null;
+        }
+        this.owner = owner;
+        this.answered = false;
+    }
+
+    @Override
+    public boolean matches(String line) {
+        return answered ? false : processLine(line);
+    }
+
+    private boolean processLine(String line) {
+        String buffer = null;
+        Matcher matcher = COPYRIGHT_PATTERN.matcher(line);
+        if (matcher.matches()) {
+            buffer = line.substring(matcher.end());
+        }
+
+        if (buffer != null) {
+            // check for 2 options "date owner"
+            // "owner date"
+            if (owner == null) {
+                matcher = datePattern.matcher(buffer);
+                if (matcher.matches() && matcher.start() == 0) {
+                    answered = true;
+                    return true;
+                }
+            } else {
+                if (datePattern != null) {
+                    matcher = datePattern.matcher(buffer);
+                    if (!matcher.matches()) {
+                        return false;
+                    }
+                    if (matcher.start() == 0) {
+                        buffer = buffer.substring(matcher.end());
+                    }
+                }
+                buffer.trim();
+                if (buffer.startsWith(owner)) {
+                    answered = true;
+                    return true;
+                }
+            }
+
+        }
+        return false;
+    }
+
+    @Override
+    public void reset() {
+        answered = false;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
new file mode 100644
index 000000000..e32b5586a
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.matchers;
+
+import java.util.Locale;
+import java.util.UUID;
+
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+
+/**
+ * Accumulates all letters and numbers contained inside the header and compares
+ * it to the full text of a given license (after reducing it to letters and
+ * numbers as well).
+ *
+ * <p>
+ * The text comparison is case insensitive but assumes only characters in the
+ * US-ASCII charset are being matched.
+ * </p>
+ *
+ * @since Rat 0.9
+ */
+public class FullTextMatcher extends AbstractHeaderMatcher {
+
+    // Number of match characters assumed to be present on first line
+    private static final int DEFAULT_INITIAL_LINE_LENGTH = 20;
+
+    private String fullText;
+
+    private String firstLine;
+
+    private boolean seenFirstLine = false;
+
+    private final StringBuilder buffer = new StringBuilder();
+
+    public FullTextMatcher(String fullText) {
+        super();
+        setFullText(fullText);
+    }
+
+
+    public FullTextMatcher(String id, String fullText) {
+        super(id);
+        setFullText(fullText);
+    }
+    
+    /**
+     * Removes everything except letter or digit from text.
+     * 
+     * @param text The text to remove extra chars from.
+     * @return the pruned text.
+     */
+    protected final String prune(String text) {
+        final int length = text.length();
+        final StringBuilder buffer = new StringBuilder(length);
+        for (int i = 0; i < length; i++) {
+            char at = text.charAt(i);
+            if (Character.isLetterOrDigit(at)) {
+                buffer.append(at);
+            }
+        }
+        return buffer.toString();
+    }
+
+    public final void setFullText(String text) {
+        int offset = text.indexOf('\n');
+        if (offset == -1) {
+            offset = Math.min(DEFAULT_INITIAL_LINE_LENGTH, text.length());
+        }
+        firstLine = prune(text.substring(0, offset)).toLowerCase(Locale.ENGLISH);
+        fullText = prune(text).toLowerCase(Locale.ENGLISH);
+        init();
+    }
+
+    public final boolean hasFullText() {
+        return fullText != null;
+    }
+
+    @Override
+    public boolean matches(String line) throws RatHeaderAnalysisException {
+        final String inputToMatch = prune(line).toLowerCase(Locale.ENGLISH);
+        if (seenFirstLine) { // Accumulate more input
+            buffer.append(inputToMatch);
+        } else {
+            int offset = inputToMatch.indexOf(firstLine);
+            if (offset >= 0) {
+                // we have a match, save the text starting with the match
+                buffer.append(inputToMatch.substring(offset));
+                seenFirstLine = true;
+                // Drop out to check whether full text is matched
+            } else {
+                // we assume that the first line must appear in a single line
+                return false; // no more to do here
+            }
+        }
+
+        if (buffer.length() >= fullText.length()) { // we have enough data to match
+            if (buffer.toString().contains(fullText)) {
+                return true; // we found a match
+            }
+            // buffer contains first line but does not contain full text
+            // It's possible that the buffer contains the first line again
+            int offset = buffer.substring(1).indexOf(firstLine);
+            if (offset >= 0) { // first line found again
+                buffer.delete(0, offset); // reset buffer to the new start
+            } else { // buffer does not even contain first line, so cannot be used to match full text
+                init();
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void reset() {
+        init();
+    }
+
+    // This is called indirectly from a ctor so must be final or private
+    private void init() {
+        buffer.setLength(0);
+        seenFirstLine = false;
+    }
+}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
new file mode 100644
index 000000000..e42fff066
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
@@ -0,0 +1,33 @@
+package org.apache.rat.analysis.matchers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+
+public class OrMatcher extends AbstractMatcherContainer {
+
+    public OrMatcher(Collection<IHeaderMatcher> enclosed) {
+        super(enclosed);
+    }
+
+    public OrMatcher(String id, Collection<IHeaderMatcher> enclosed) {
+        super(id, enclosed);
+    }
+
+    @Override
+    public boolean matches(String line) throws RatHeaderAnalysisException {
+        for (IHeaderMatcher matcher : enclosed) {
+            if (matcher.matches(line)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
similarity index 57%
rename from apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
rename to apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index 49baffba3..23d6288a0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SPDXMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */
-package org.apache.rat.analysis.license;
+package org.apache.rat.analysis.matchers;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,7 +27,9 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 
 /**
@@ -41,18 +43,21 @@
  * 
  * @see https://spdx.dev/ids/
  */
-public class SPDXMatcher implements IHeaderMatcher {
+public class SPDXMatcherFactory {
 
     /**
      * Creates IHeaderMatcher instances that are a collection of SPDXMatcher
      * instances. Used in the default matcher construction.
      */
-    private static final Map<String, SPDXMatcher.Match> matchers = new HashMap<>();
+    private static final Map<String, SPDXMatcherFactory.Match> matchers = new HashMap<>();
 
-    public static final SPDXMatcher INSTANCE = new SPDXMatcher();
+    public static final SPDXMatcherFactory INSTANCE = new SPDXMatcherFactory();
 
     private static Pattern groupSelector = Pattern.compile(".*SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)");
 
+    private String lastLine;
+    private Match lastMatch;
+    
     /**
      * Constructor.
      * 
@@ -61,58 +66,33 @@ public class SPDXMatcher implements IHeaderMatcher {
      * @param licenseFamilyCategory the RAT license family category for the license.
      * @param licenseFamilyName the RAT license family name for the license.
      */
-    private SPDXMatcher() {
+    private SPDXMatcherFactory() {
+        lastLine = null;
     };
 
-    public BaseLicense register(String idPrefix, final ILicenseFamily licenseFamily, String notes, final String spdxId) {
-        Match matcher = new Match(idPrefix, licenseFamily, notes, spdxId);
-        matchers.put(spdxId, matcher);
+    public IHeaderMatcher create(String spdxId) {
+        Match matcher = matchers.get(spdxId);
+        if (matcher == null) {
+            matcher = new Match(spdxId);
+            matchers.put(spdxId, matcher);
+        }
         return matcher;
     }
 
-    @Override
-    public String toString() {
-        return getId();
-    }
-    
-    @Override
-    public String getId() {
-        return "SPDXMatcher";
-    }
-
-    public boolean isActive() {
-        return !matchers.isEmpty();
-    }
-
-    @Override
-    public void reset() {
-    }
-
-    @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        Matcher matcher = groupSelector.matcher(line);
-        if (matcher.find()) {
-            Match match = matchers.get(matcher.group(1));
-            if (match != null) {
-                match.reportOnLicense(subject);
-                return true;
+    private boolean check(String line, Match caller) throws RatHeaderAnalysisException {
+        if (lastLine == null || !lastLine.equals(line)) {
+            Matcher matcher = groupSelector.matcher(line);
+            if (matcher.find()) {
+                lastMatch = matchers.get(matcher.group(1));
+            } else {
+                lastMatch = null;
             }
         }
-        return false;
-    }
-
-    @Override
-    public void reportFamily(Consumer<ILicenseFamily> consumer) {
-        matchers.values().forEach(x -> x.reportFamily(consumer));
-    }
-
-    @Override
-    public void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
-        SPDXMatcher.matchers.values().forEach(x -> x.extractMatcher(matchers, comparator));
+        return caller == lastMatch;
     }
 
-    public class Match extends BaseLicense {
-        String spdx;
+    public class Match extends AbstractHeaderMatcher {
+        private String spdx;
 
         /**
          * Constructor.
@@ -123,8 +103,8 @@ public class Match extends BaseLicense {
          * @param licenseFamilyName the RAT license family name for the license.
          * @param notes The notes for this matcher.
          */
-        Match(String idPrefix, final ILicenseFamily licenseFamily, String notes, final String spdxId ) {
-            super(licenseFamily, notes, idPrefix);
+        Match(final String spdxId ) {
+            super("SPDX:"+spdxId);
             spdx = spdxId;
         }
 
@@ -132,20 +112,11 @@ public class Match extends BaseLicense {
         public void reset() {
         }
 
-        /*
-         * This method only gets called during testing and othe cases where individual matchers are executed.
-         * In this case we need to call the SPDXMatcher match method.
-         */
         @Override
-        public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-            return SPDXMatcher.this.match(subject, line);
+        public boolean matches(String line) throws RatHeaderAnalysisException {
+            return SPDXMatcherFactory.this.check(line, this);
         }
 
-        @Override
-        public String getId() {
-            return String.format("%s: %s", SPDXMatcher.this.getId(), spdx);
-        }
-        
         @Override
         public String toString() {
             return getId();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
new file mode 100644
index 000000000..9138b3ed8
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.matchers;
+
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+
+/**
+ * @since Rat 0.8
+ */
+public class SimpleTextMatcher extends AbstractHeaderMatcher {
+    private String pattern;
+
+    /**
+     * Creates a pattern based license with full documentation.
+     * 
+     * @param pLicenseFamilyCategory
+     * @param pLicenseFamilyName
+     * @param pNotes
+     * @param pPatterns
+     */
+    public SimpleTextMatcher(String pattern) {
+        super();
+        this.pattern = pattern;
+    }
+
+    public SimpleTextMatcher(String id, String pattern) {
+        super(id);
+        this.pattern = pattern;
+    }
+
+    
+    public boolean matches(String line) {
+        return line != null && line.contains(pattern);
+    }
+
+    @Override
+    public void reset() {
+        // Nothing to do
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/PropertyConfigurationReader.java
similarity index 93%
rename from apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
rename to apache-rat-core/src/main/java/org/apache/rat/configuration/PropertyConfigurationReader.java
index fe1507596..c9f303545 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/PropertyConfigurationReader.java
@@ -38,9 +38,9 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.CopyrightHeader;
 import org.apache.rat.analysis.license.FullTextMatchingLicense;
-import org.apache.rat.analysis.license.MultiplexLicense;
-import org.apache.rat.analysis.license.SPDXMatcher;
 import org.apache.rat.analysis.license.SimplePatternBasedLicense;
+import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.SimpleLicenseFamily;
 
@@ -56,10 +56,10 @@
          * license.id.text=
          * license.id.spdx=
  */
-public class ConfigurationReader implements Reader {
+public class PropertyConfigurationReader implements Reader {
     private final CompositeConfiguration configuration;
 
-    public ConfigurationReader() {
+    public PropertyConfigurationReader() {
         configuration = new CompositeConfiguration();
     }
 
@@ -139,13 +139,13 @@ public Collection<IHeaderMatcher> readLicenses() {
                         new SimplePatternBasedLicense(id, licenseFamily, notes, texts.toArray(new String[texts.size()])));
             }
             if (keys.contains("spdx")) {
-                licenses.add(SPDXMatcher.INSTANCE.register(id, licenseFamily, notes, lic.getString("spdx")));
+                licenses.add(SPDXMatcherFactory.INSTANCE.register(id, licenseFamily, notes, lic.getString("spdx")));
             }
             if (licenses.size() == 1) {
                 result.add(licenses.get(0));
                 licenses.clear();
             } else if (licenses.size() > 1) {
-                result.add(new MultiplexLicense(id, licenses));
+                result.add(new OrMatcher(id, licenses));
                 licenses = new ArrayList<>();
             }
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
index 696b54778..9f50a8b5f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -89,7 +89,7 @@ public class Readers {
 
     static {
         readers = new HashMap<>();
-        readers.put( Format.CONFIG, new ConfigurationReader());
+        readers.put( Format.CONFIG, new PropertyConfigurationReader());
     }
 
     public static Reader get(URL fileName) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
new file mode 100644
index 000000000..c993becd9
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -0,0 +1,304 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.configuration;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.license.CopyrightHeader;
+import org.apache.rat.analysis.license.FullTextMatchingLicense;
+import org.apache.rat.analysis.license.SimplePatternBasedLicense;
+import org.apache.rat.analysis.matchers.AndMatcher;
+import org.apache.rat.analysis.matchers.FullTextMatcher;
+import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.analysis.matchers.SPDXMatcher;
+import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
+import org.apache.rat.analysis.matchers.SimpleTextMatcher;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicense;
+import org.apache.rat.license.SimpleLicenseFamily;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/*
+ *  <license id=id name=name >
+        <notes></notes>
+        <text>  </text>
+        <copyright start='' end='' owner=''/>
+        <spdx></spdx> 
+        <and> <license>...</and>
+        <or> <license>...</or> 
+    </license>
+ */
+
+public class XMLConfigurationReader implements Reader {
+    
+    
+    enum MatcherType { text, copyright, spdx, and, or };
+    
+    private final Document complete;
+    private final Element baseElement;
+    private final SortedSet<ILicense> licenses;
+    
+    public XMLConfigurationReader() {
+        try {
+            complete = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+        } catch (ParserConfigurationException e) {
+            throw new IllegalStateException( "No XML parser defined", e);
+        }
+        baseElement = complete.createElement("rat-config");
+        licenses = new TreeSet<>();
+    }
+
+    @Override
+    public void add(URL url) {
+        try {
+            read(url);
+        } catch (ParserConfigurationException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public void read(URL... urls) throws ParserConfigurationException {
+        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        for (URL url : urls) {
+            Document document = builder.parse(url.openStream());
+            add(document);
+        }
+    }
+    
+    private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
+        for (int i=0; i<list.getLength(); i++) {
+            consumer.accept(list.item(i));
+        }
+    }
+
+    public void add(Document document) {
+        nodeListConsumer(document.getElementsByTagName("rat-config"),
+                (x) -> nodeListConsumer( x.getChildNodes(), baseElement::appendChild));
+    }
+    
+    
+
+    @Override
+    public SortedSet<ILicenseFamily> readFamilies() {
+        SortedSet<ILicenseFamily> result = new TreeSet<>();
+        readLicenses().stream().map( ILicense::getLicenseFamily).forEach( result::add );
+        return result;
+    }
+
+    Set<String> extractKeys(Configuration cfg) {
+        Iterator<String> iter = cfg.getKeys();
+        Set<String> ids = new TreeSet<>();
+        while (iter.hasNext()) {
+            ids.add(iter.next().split("\\.")[0]);
+        }
+        return ids;
+    }
+    
+    Map<String,String> attributes(Node node) {
+        NamedNodeMap nnm = node.getAttributes();
+        Map<String,String> result = new HashMap<>();
+        for (int i=0; i<nnm.getLength(); i++) {
+            Node n = nnm.item(i);
+            result.put(n.getNodeName(), n.getNodeValue());
+        }
+        return result;
+    }
+
+    private IHeaderMatcher parseMatcher(Node matcherNode) {
+        String hasSpaces = ".*\\s.*";
+        MatcherType type = MatcherType.valueOf(matcherNode.getLocalName());
+        switch (type) { 
+        case text: 
+            String txt = matcherNode.getTextContent();
+            return Pattern.matches(hasSpaces, txt) ? new FullTextMatcher(txt) : new SimpleTextMatcher(txt);
+
+        case or:
+        case and:
+            List<IHeaderMatcher> children = new ArrayList<>();
+            nodeListConsumer( matcherNode.getChildNodes(), x -> children.add(parseMatcher(x)));
+            return type==MatcherType.or ? new OrMatcher( children ) : new AndMatcher( children );
+            
+        case copyright:
+            Map<String,String> attr = attributes(matcherNode);
+            return new CopyrightMatcher(attr.get('start'), attr.get('end'), attr.get('owner'));
+            
+        case spdx:
+            return SPDXMatcherFactory.INSTANCE.create(attributes(matcherNode).get("name"));
+        }
+        
+    }
+    
+    private ILicense parseLicense(Node licenseNode)
+    {
+       Map<String,String> attributes = attributes(licenseNode);
+       
+       ILicenseFamily family = new SimpleLicenseFamily( attributes.get("id"), attributes.get("name"));
+       IHeaderMatcher matcher[] = {null};
+       StringBuilder notesBuilder = new StringBuilder();
+       nodeListConsumer( licenseNode.getChildNodes(), x -> { 
+           if (x.getLocalName().equals("notes")) {
+               notesBuilder.append(x.getTextContent()).append("\n");
+           } else {
+               matcher[0] = parseMatcher(x);
+           }
+       });
+       ILicense derivedFrom = attributes.get("derived-from")==null?null:new ILicenseProxy(attributes.get("derived-from"));
+       String notes = notesBuilder.length() == 0 ? null : notesBuilder.toString();
+       return new SimpleLicense( family, matcher[0], derivedFrom, notes);
+    }
+    
+    @Override
+    public SortedSet<ILicense> readLicenses() {
+        if (licenses.size() == 0) {
+            nodeListConsumer( complete.getElementsByTagName("license"), x -> licenses.add( parseLicense(x)));
+            complete = null;
+        }
+        return Collections.unmodifiableSortedSet(licenses);
+        /*
+        SortedSet<ILicenseFamily> families = readFamilies();
+        Collection<IHeaderMatcher> result = new ArrayList<>();
+        List<IHeaderMatcher> licenses = new ArrayList<>();
+        Configuration licenseConfig = configuration.subset("license");
+        for (String id : extractKeys(licenseConfig)) {
+            Configuration lic = licenseConfig.subset(id);
+            ILicenseFamily licenseFamily = ILicenseFamily.searchSet(families, lic.getString("family"));
+            if (licenseFamily == null) {
+                throw new IllegalArgumentException(
+                        String.format("license %s uses family %s which is missing", id, lic.getString("family")));
+            }
+            Set<String> keys = extractKeys(lic);
+            String notes = lic.getString("notes", "");
+            if (keys.contains("fullText")) {
+                licenses.add(new FullTextMatchingLicense(id, licenseFamily, notes, lic.getString("fullText")));
+            }
+            if (keys.contains("copyright")) {
+                licenses.add(new CopyrightHeader(id, licenseFamily, notes, lic.getString("copyright")));
+            }
+            if (keys.contains("text")) {
+                Configuration text = lic.subset("text");
+                Set<String> txtKeys = extractKeys(text);
+                List<String> texts = txtKeys.stream().map(text::getString).collect(Collectors.toList());
+                licenses.add(
+                        new SimplePatternBasedLicense(id, licenseFamily, notes, texts.toArray(new String[texts.size()])));
+            }
+            if (keys.contains("spdx")) {
+                licenses.add(SPDXMatcher.INSTANCE.register(id, licenseFamily, notes, lic.getString("spdx")));
+            }
+            if (licenses.size() == 1) {
+                result.add(licenses.get(0));
+                licenses.clear();
+            } else if (licenses.size() > 1) {
+                result.add(new OrMatcher(id, licenses));
+                licenses = new ArrayList<>();
+            }
+        }
+        return licenses;
+        */
+    }
+    
+    class ILicenseProxy implements ILicense {
+        final String proxyId;
+        ILicense wrapped;
+        
+        ILicenseProxy(String proxyId) {
+            this.proxyId = proxyId;
+        }
+        
+        private void checkProxy() {
+            if (wrapped == null) {
+                wrapped = complete.stream().
+            }
+        }
+
+        public ILicenseFamily getLicenseFamily() {
+            checkProxy();
+            return wrapped.getLicenseFamily();
+        }
+
+        public String getNotes() {
+            checkProxy();
+            return wrapped.getNotes();
+        }
+
+        public ILicense derivedFrom() {
+            checkProxy();
+            return wrapped.derivedFrom();
+        }
+
+        public String getId() {
+            checkProxy();
+            return wrapped.getId();
+        }
+
+        public void reset() {
+            checkProxy();
+            wrapped.reset();
+        }
+
+        public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
+            checkProxy();
+            return wrapped.match(metadata, line);
+        }
+
+        public void reportFamily(Consumer<ILicenseFamily> consumer) {
+            checkProxy();
+            wrapped.reportFamily(consumer);
+        }
+
+        public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
+            checkProxy();
+            wrapped.extractMatcher(consumer, comparator);
+        }
+        
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
new file mode 100644
index 000000000..5ce7ef5e3
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -0,0 +1,20 @@
+package org.apache.rat.license;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public interface ILicense extends IHeaderMatcher {
+    ILicenseFamily getLicenseFamily();
+    String getNotes();
+    ILicense derivedFrom();
+    
+    /*
+     * <license id=id name=name derived-from="">
+        <notes></notes>
+        <text>  </text>
+        <copyright start='' end='' owner=''/>
+        <spdx></spdx> 
+        <and> <license>...</and>
+        <or> <license>...</or> 
+    </license>
+     */
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
new file mode 100644
index 000000000..1f95e6f04
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -0,0 +1,80 @@
+package org.apache.rat.license;
+
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.MetaData;
+
+public class SimpleLicense implements ILicense {
+
+    ILicenseFamily family;
+    IHeaderMatcher matcher;
+    ILicense derivedFrom;
+    String notes;
+    
+    public SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, ILicense derivedFrom, String notes)
+    {
+        this.family = family;
+        this.matcher = matcher;
+        this.derivedFrom = derivedFrom;
+        this.notes = notes;
+    }
+
+    public ILicenseFamily getFamily() {
+        return family;
+    }
+
+    public void setFamily(ILicenseFamily family) {
+        this.family = family;
+    }
+
+    public IHeaderMatcher getMatcher() {
+        return matcher;
+    }
+
+    public void setMatcher(IHeaderMatcher matcher) {
+        this.matcher = matcher;
+    }
+
+    public void setDerivedFrom(ILicense derivedFrom) {
+        this.derivedFrom = derivedFrom;
+    }
+
+    public String getId() {
+        return matcher.getId();
+    }
+
+    public void reset() {
+        matcher.reset();
+    }
+
+    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
+        return matcher.match(metadata, line);
+    }
+
+    public void reportFamily(Consumer<ILicenseFamily> consumer) {
+        matcher.reportFamily(consumer);
+    }
+
+    public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
+        matcher.extractMatcher(consumer, comparator);
+    }
+
+    @Override
+    public ILicenseFamily getLicenseFamily() {
+        return family;
+    }
+
+    @Override
+    public String getNotes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ILicense derivedFrom() {
+        return derivedFrom;
+    }
+}
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
new file mode 100644
index 000000000..ee1ad58ca
--- /dev/null
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -0,0 +1,126 @@
+<rat-config>
+	
+<licenses>
+
+
+<!--
+	<license id=id name=name>
+		<notes></notes>
+	    <text>  </text>
+		<copyright start='' end='' owner=''/>
+		<spdx name=''/> 
+		<and> <license>...</and>
+		<or> <license>...</or> 
+	</license>
+-->
+
+<license id="AL" name="Apache License Version 2.0">
+	<any>
+		<text>Licensed under the Apache License, Version 2.0 (the "License")</text>
+		<text>Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</text>
+		<text>http://www.apache.org/licenses/LICENSE-2.0</text>
+		<text>https://www.apache.org/licenses/LICENSE-2.0</text>
+		<text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
+		<text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
+		<text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
+		<text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
+		<spdx name='Apache-2.0'/>
+	</any>
+</license>
+
+<license id="ASL" name="Applied Apahce License Version 2.0">
+	<all>
+		<license-ref refid="AL"/>
+		<copyright start="" end="" owner=""/>
+	</all>
+</license>
+
+<license id="CDDL1" name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
+	<any>
+		<text>The contents of this file are subject to the terms of the Common Development\nand Distribution License("CDDL") (the "License"). You may not use this file\nexcept in compliance with the License.</text>
+		<spdx name='CDDL-1.0'/>
+	</any>
+</license>
+
+<license id="CDDL1" name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
+	<any>
+		<text>The contents of this file are subject to the terms of the Common Development\nand Distribution License("CDDL") (the "License"). You may not use this file\nexcept in compliance with the License.</text>
+		<spdx name='CDDL-1.0'/>
+	</any>
+</license>
+
+<license id="ILUMOS" name="ILLUMOS CDDL1 Derived license" derived-from='CDDL1'>
+	<note>modified CDDL1 license</note>
+	<any>
+		<text>The contents of this file are subject to the terms of the\nCommon Development and Distribution License (the "License")\nYou may not use this file except in compliance with the License.\n</text>
+	</any>
+</license>
+
+<license id="DOJO" name="DOJO License" derived-from="BSD">
+	<text>http://dojotoolkit.org/community/licensing.shtml</text>
+</license>
+
+<license id="GEN" name="Generated files" />
+	<text file="generation-keywords"/>
+</license>
+
+<license id="GPL1" name="GNU General Public License, version 1">
+	<any>
+		</text>This program is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 1, or (at your option)\n any later version.</text>text>
+		<spdx name='GPL-1.0-only'/>
+	</any>
+</license>
+
+<license id="GPL2" name="GNU General Public License, version 2">
+	<any>
+		</text>This program is free software; you can redistribute it and/or\n modify it under the terms of the GNU General Public License\n as published by the Free Software Foundation; either version 2\n of the License, or (at your option) any later version.</text>
+		<spdx name='GPL-2.0-only'/>
+	</any>
+</license>
+
+<license id="GPL3" name="GNU General Public License, version 3">
+	<any>
+		</text>This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.</text>
+		<spdx name='GPL-3.0-only'/>
+	</any>
+</license>
+
+<license id="MIT" name="The MIT License">
+	<any>
+		</text>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</text>
+		<spdx name='MIT'/>
+	</any>
+</license>
+
+<license id="OASIS" name="OASIS Open License">
+	<notes>No modifications allowed</notes>
+	<all>
+		</text>This document and translations of it may be copied and furnished to others and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared copied published and distributed</text>
+		<copyright owner="OASIS Open"/>
+	</all>
+</license>
+
+<license id="TMF" name="The Telemanagement Forum License" derived-from="BSD">
+	<any>
+		</text>TMF854 Version 1.0</text>
+		<copyrigth owner="TeleManagement Forum"/>
+	</any>
+</license>
+
+
+<license id="W3C" name="W3C Software Copyright">
+	<notes>Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.</notes>
+	<any>
+		</text>http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</text>
+		<spdx name='W3C'/>
+	</any>
+</license>
+
+<license id="W3CD" name="W3C Document Copyright">
+	<notes>Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.</notes>
+	</text>http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</text>
+</license>
+
+</licenses>
+</rat-config>
+            
\ No newline at end of file
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/generation-keywords.txt b/apache-rat-core/src/main/resources/org/apache/rat/generation-keywords.txt
new file mode 100644
index 000000000..f9314a659
--- /dev/null
+++ b/apache-rat-core/src/main/resources/org/apache/rat/generation-keywords.txt
@@ -0,0 +1,26 @@
+Generated text no license required
+generated by Cayenne
+Generated By:JJTree
+Generated By:JavaCC
+THIS FILE IS AUTOMATICALLY GENERATED
+NOTE: this file is autogenerated by XBeans
+This file was automatically generated by 
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+# Microsoft Developer Studio Generated NMAKE File
+# Microsoft Developer Studio Generated Build File
+Generated from configure.ac by autoheader
+generated automatically by aclocal
+build.xml generated by maven from project.xml
+This file was generated by
+This file has been automatically generated.
+Automatically generated - do not modify!
+Javadoc style sheet
+SOURCE FILE GENERATATED
+Generated by the Batik
+this file is autogenerated
+This class was autogenerated
+Generated by Maven
+Autogenerated by Thrift
+DO NOT EDIT THIS FILE - it is machine generated
+This class was generated by
+Generated by javadoc
\ No newline at end of file
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 93f84554b..2d907a192 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -28,7 +28,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.rat.analysis.license.MultiplexLicense;
+import org.apache.rat.analysis.matchers.OrMatcher;
 import org.apache.rat.test.utils.Resources;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Test;
@@ -115,7 +115,7 @@ private static String getElementsReports(String pElementsPath) {
     public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         Defaults.builder().build();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        MultiplexLicense matcherMultiplexer = new MultiplexLicense(Defaults.getLicenses());
+        OrMatcher matcherMultiplexer = new OrMatcher("testing License",Defaults.getLicenses());
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setApproveDefaultLicenses(true);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
index d9fc72f3a..d94e3d41b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
@@ -15,36 +15,35 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis.generation;
 
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
+import org.junit.Before;
+import org.junit.Test;
 
 public class GeneratedLicenseNotRequiredTest {
 
     private GeneratedLicenseNotRequired license;
     private MockClaimReporter reporter;
-    
+
     @Before
     public void setUp() throws Exception {
-        Pattern[] patterns = {Pattern.compile(".*Generated")};
+        Pattern[] patterns = { Pattern.compile(".*Generated") };
         license = new GeneratedLicenseNotRequired(patterns);
         reporter = new MockClaimReporter();
     }
 
     @Test
     public void match() throws Exception {
-        final Document subject = new MockLocation("subject");
-        assertFalse("Does not match regex", license.match(subject, "Not at all"));
-        assertTrue("Matches regex", license.match(subject, "This is Generated"));
+        MetaData metadata = new MetaData();
+        assertFalse("Does not match regex", license.match(metadata, "Not at all"));
+        assertTrue("Matches regex", license.match(metadata, "This is Generated"));
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
index 4f0c03caa..804bcf149 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
@@ -56,7 +56,6 @@ abstract public class AbstractMatcherTest {
     private static int NOTES=1;
     private static int TEXT=2;
 	protected MetaData data;
-	protected Document document;
 	protected static Collection<IHeaderMatcher> instrumented;
 	private final String category;
 	private final String name;
@@ -83,8 +82,6 @@ protected AbstractMatcherTest(String cat, String name, String[][]targets) {
 	@Before
 	public void setup() {
 	    data = new MetaData();
-        document = mock(Document.class);
-        when(document.getMetaData()).thenReturn(data);
 	}
 	
 	protected static Collection<IHeaderMatcher> extractCategory(String category) {
@@ -151,7 +148,7 @@ private boolean processText(IHeaderMatcher matcher, String text) throws IOExcept
         String line = in.readLine();
         boolean found = false;
         while (line != null) {
-            found |= matcher.match(document, line);
+            found |= matcher.match(data, line);
             line = in.readLine();
         }
         return found;
@@ -273,9 +270,9 @@ public void reset() {
 	    }
 
 	    @Override
-	    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
+	    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
 	        matchCalled++;
-	        if (wrapped.match(subject, line)) {
+	        if (wrapped.match(metadata, line)) {
 	            matchCount++;
 	            return true;
 	        }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
index 94c0917ac..2b93e8963 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
@@ -31,6 +31,7 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class AppliedApacheSoftwareLicense20Test {
 
@@ -50,7 +51,7 @@ public class AppliedApacheSoftwareLicense20Test {
             + " *  See the License for the specific language governing permissions and\n"
             + " *  limitations under the License.\n"
             + " */\n";
-
+/*
     private AppliedApacheSoftwareLicense20 license;
 
     private MockClaimReporter reporter;
@@ -105,5 +106,9 @@ public void goodFiles() throws Exception {
     public void baddFiles() throws Exception {
         DirectoryScanner.testFilesInDir("appliedAL20/bad", license, false);
     }
-
+*/
+    @Test
+    public void dummy() {
+        fail( "Unimplemented test class");
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
index bb960857d..c996fea09 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
@@ -21,6 +21,8 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.MockLocation;
+import org.apache.rat.license.SimpleLicenseFamily;
+import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,22 +46,21 @@ public class CopyrightHeaderTest {
             , "/*  Copyright 2012 2013 FooBar.*/" };
 
     private CopyrightHeader header;
-    private MockClaimReporter reporter;
-    private Document subject = new MockLocation("subject");
+    private MetaData metadata;
 
     @Before
     public void setUp() throws Exception {
-        header = new CopyrightHeader(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL,MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0,"","FooBar");
-        reporter = new MockClaimReporter();
-        subject = new MockLocation("subject");
+        ILicenseFamily family = new SimpleLicenseFamily("test", "Test family");
+        header = new CopyrightHeader(family,"","FooBar");
+        metadata = new MetaData();
     }
 
     @Test
     public void match() throws Exception {
         for (String line : MATCHING_HEADERS) {
-            assertTrue("Copyright Header should be matched", header.match(subject, line));
+            assertTrue("Copyright Header should be matched", header.match(metadata, line));
             header.reset();
-            assertFalse("After reset, content should build up again", header.match(subject, "New line"));
+            assertFalse("After reset, content should build up again", header.match(metadata, "New line"));
             header.reset();
         }
     }
@@ -67,9 +68,9 @@ public void match() throws Exception {
     @Test
     public void noMatch() throws Exception {
         for (String line : NON_MATCHING_HEADERS) {
-            assertFalse("Copyright Header shouldn't be matched", header.match(subject, line));
+            assertFalse("Copyright Header shouldn't be matched", header.match(metadata, line));
             header.reset();
-            assertTrue("After reset, content should build up again", header.match(subject, MATCHING_HEADERS[0]));
+            assertTrue("After reset, content should build up again", header.match(metadata, MATCHING_HEADERS[0]));
             header.reset();
         }
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
index 8d9a67b7b..756cf2376 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
@@ -53,7 +53,7 @@ public static void testFilesInDir(String directory, IHeaderMatcher matcher, bool
                 br = Resources.getBufferedReader(f);
                 String line;
                 while(!result && (line = br.readLine()) != null) {
-                    result = matcher.match(subject, line);
+                    result = matcher.match(subject.getMetaData(), line);
                 }
                 assertEquals(f.toString(), expected, result);
             } finally {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MultiplexLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
similarity index 74%
rename from apache-rat-core/src/test/java/org/apache/rat/analysis/license/MultiplexLicenseTest.java
rename to apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
index 0bb59cade..8f2f6f0fd 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MultiplexLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
@@ -15,30 +15,27 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-public class MultiplexLicenseTest {
+import java.util.Arrays;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+import org.junit.Before;
+import org.junit.Test;
+
+public class OrMatcherTest {
 
     private static final String LINE_ONE = "Line One";
     private static final String LINE_TWO = "Line Two";
@@ -46,42 +43,42 @@ public class MultiplexLicenseTest {
     private IHeaderMatcher matcherOne;
     private IHeaderMatcher matcherTwo;
 
-    private MultiplexLicense multiplexer;
+    private OrMatcher multiplexer;
 
     @Before
     public void setUp() {
         matcherOne = mock(IHeaderMatcher.class);
         matcherTwo = mock(IHeaderMatcher.class);
-        multiplexer = new MultiplexLicense("multiplexMatcher Test", Arrays.<IHeaderMatcher>asList(matcherOne, matcherTwo));
+        multiplexer = new OrMatcher("multiplexMatcher Test",
+                Arrays.<IHeaderMatcher>asList(matcherOne, matcherTwo));
     }
 
     @Test
     public void testMatcherLine() throws Exception {
-        final Document document = mock(Document.class);
-        
-        multiplexer.match(document, LINE_ONE);
-        verify(matcherOne, times(1)).match(eq(document), eq(LINE_ONE));
-        verify(matcherTwo, times(1)).match(eq(document), eq(LINE_ONE));
-
-        multiplexer.match(document, LINE_TWO);
-        verify(matcherOne, times(1)).match(eq(document), eq(LINE_TWO));
-        verify(matcherTwo, times(1)).match(eq(document), eq(LINE_TWO));
-        verify(matcherOne, times(2)).match(eq(document), any());
-        verify(matcherTwo, times(2)).match(eq(document), any());
-    }
+        final MetaData metadata = new MetaData();
+
+        multiplexer.match(metadata, LINE_ONE);
+        verify(matcherOne, times(1)).match(eq(metadata), eq(LINE_ONE));
+        verify(matcherTwo, times(1)).match(eq(metadata), eq(LINE_ONE));
 
+        multiplexer.match(metadata, LINE_TWO);
+        verify(matcherOne, times(1)).match(eq(metadata), eq(LINE_TWO));
+        verify(matcherTwo, times(1)).match(eq(metadata), eq(LINE_TWO));
+        verify(matcherOne, times(2)).match(eq(metadata), any());
+        verify(matcherTwo, times(2)).match(eq(metadata), any());
+    }
 
     @Test
     public void testReset() {
         multiplexer.reset();
         verify(matcherOne, times(1)).reset();
         verify(matcherTwo, times(1)).reset();
-        
+
         multiplexer.reset();
         verify(matcherOne, times(2)).reset();
         verify(matcherTwo, times(2)).reset();
     }
-    
+
     @Test
     public void testReportFamily() {
         Consumer<ILicenseFamily> consumer = mock(Consumer.class);
@@ -89,14 +86,14 @@ public void testReportFamily() {
         verify(matcherOne, times(1)).reportFamily(eq(consumer));
         verify(matcherTwo, times(1)).reportFamily(eq(consumer));
     }
-    
+
     @Test
     public void testExtractMatcher() {
         Predicate<ILicenseFamily> comparator = mock(Predicate.class);
         Consumer<IHeaderMatcher> consumer = mock(Consumer.class);
 
         multiplexer.extractMatcher(consumer, comparator);
-        verify(matcherOne, times(1)).extractMatcher(eq(consumer),eq(comparator));
-        verify(matcherTwo, times(1)).extractMatcher(eq(consumer),eq(comparator));
+        verify(matcherOne, times(1)).extractMatcher(eq(consumer), eq(comparator));
+        verify(matcherTwo, times(1)).extractMatcher(eq(consumer), eq(comparator));
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index 57db6bbad..4e4ecda7e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -42,8 +42,8 @@ public class ConfigurationReaderTest {
     
     @Test
     public void readDefault() throws ConfigurationException {
-        ConfigurationReader reader = new ConfigurationReader();
-        URL url = ConfigurationReader.class.getResource("/org/apache/rat/default.config");
+        PropertyConfigurationReader reader = new PropertyConfigurationReader();
+        URL url = PropertyConfigurationReader.class.getResource("/org/apache/rat/default.config");
         reader.read(url);
         List<String> familyCategories = Arrays.asList(FAMILIES);
         Set<String> readCategories = reader.readFamilies().stream().map(ILicenseFamily::getFamilyCategory).collect(Collectors.toSet());
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
index 3443d5603..78302b394 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
@@ -26,8 +26,8 @@
 public class ReadersTest {
     @Test
     public void getTest() throws MalformedURLException {
-        assertEquals(ConfigurationReader.class, Readers.get( "foo/x.config").getClass());
-        assertEquals(ConfigurationReader.class, Readers.get("x.cfg").getClass());
+        assertEquals(PropertyConfigurationReader.class, Readers.get( "foo/x.config").getClass());
+        assertEquals(PropertyConfigurationReader.class, Readers.get("x.cfg").getClass());
         assertThrows( IllegalArgumentException.class, () -> Readers.get("x.junk"));
     }
 }
diff --git a/apache-rat-tasks/src/test/java/org/example/Matcher.java b/apache-rat-tasks/src/test/java/org/example/Matcher.java
index 1b5bbee3d..e54636325 100644
--- a/apache-rat-tasks/src/test/java/org/example/Matcher.java
+++ b/apache-rat-tasks/src/test/java/org/example/Matcher.java
@@ -21,16 +21,20 @@
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.SimpleLicenseFamily;
 
 
 public class Matcher extends BaseLicense  {
     public Matcher() {
-        super( "EXMPL", "Example License", "");
+        super( new SimpleLicenseFamily("EXMPL", "Example License"), "");
     }
+    
+    @Override
     public void reset() {}
     
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        reportOnLicense(subject);
+    @Override
+    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
+        reportOnLicense(metadata);
         return true;
     }
 }

From 728d1cd4be7dcdbe333ef0e9d8a1576ddeeaed09 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 11 Sep 2023 00:49:44 +0200
Subject: [PATCH 082/299] changed to using ILicense for reporting

---
 .../main/java/org/apache/rat/Defaults.java    |  80 ++++++--
 .../rat/analysis/DefaultAnalyserFactory.java  |  25 +--
 .../rat/analysis/DocumentHeaderAnalyser.java  |   9 +-
 .../rat/analysis/HeaderCheckWorker.java       |  22 ++-
 .../rat/analysis/license/BaseLicense.java     |  15 +-
 ...rightHeader.java => CopyrightLicense.java} |   8 +-
 .../matchers/AbstractMatcherContainer.java    |  14 +-
 .../java/org/apache/rat/api/MetaData.java     |  12 ++
 .../org/apache/rat/configuration/Format.java  |   2 +-
 .../PropertyConfigurationReader.java          | 154 ---------------
 .../org/apache/rat/configuration/Reader.java  |   3 +-
 .../org/apache/rat/configuration/Readers.java |   2 +-
 .../configuration/XMLConfigurationReader.java | 181 +++++++-----------
 .../java/org/apache/rat/license/ILicense.java |  11 --
 .../org/apache/rat/license/SimpleLicense.java |  26 +--
 .../main/resources/org/apache/rat/default.xml |   1 +
 .../java/org/apache/rat/DefaultsTest.java     |   7 +-
 .../test/java/org/apache/rat/ReportTest.java  |   5 +-
 .../rat/analysis/AnalyserFactoryTest.java     |   5 +-
 .../rat/analysis/HeaderCheckWorkerTest.java   |   3 +-
 .../analysis/license/AbstractMatcherTest.java |   6 +-
 ...aderTest.java => CopyrighLicenseTest.java} |  14 +-
 .../analysis/license/DirectoryScanner.java    |   7 +-
 .../rat/analysis/license/OrMatcherTest.java   |  21 +-
 .../ConfigurationReaderTest.java              |  13 +-
 .../apache/rat/configuration/FormatTest.java  |   4 +-
 .../apache/rat/configuration/ReadersTest.java |   4 +-
 27 files changed, 267 insertions(+), 387 deletions(-)
 rename apache-rat-core/src/main/java/org/apache/rat/analysis/license/{CopyrightHeader.java => CopyrightLicense.java} (87%)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/PropertyConfigurationReader.java
 rename apache-rat-core/src/test/java/org/apache/rat/analysis/license/{CopyrightHeaderTest.java => CopyrighLicenseTest.java} (91%)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 9d5e8acb4..b30404ffd 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -26,18 +26,20 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.OrMatcher;
-import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.configuration.Reader;
 import org.apache.rat.configuration.Readers;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
 
 /**
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
@@ -51,13 +53,13 @@ public class Defaults {
     private Defaults() {
     }
 
-    private static Collection<IHeaderMatcher> licenses = new ArrayList<>();
+    private static Collection<ILicense> licenses = new ArrayList<>();
     private static SortedSet<ILicenseFamily> licenseFamilies = new TreeSet<>();
 
     public static Builder builder() {
         return new Builder();
     }
-    
+
     public static void clear() {
         licenses.clear();
         licenseFamilies.clear();
@@ -87,16 +89,11 @@ public static InputStream getDefaultStyleSheet() {
         return getPlainStyleSheet();
     }
 
-    public static IHeaderMatcher createDefaultMatcher() {
-        List<IHeaderMatcher> matchers = getLicenses().stream().filter(x -> !(x instanceof SPDXMatcherFactory.Match))
-                .collect(Collectors.toList());
-        if (SPDXMatcherFactory.INSTANCE.isActive()) {
-            matchers.add(SPDXMatcherFactory.INSTANCE);
-        }
-        return new OrMatcher("Default matcher", matchers);
+    public static ILicense createDefaultMatcher() {
+        return new LicenseCollectionMatcher(licenses);
     }
 
-    public static Collection<IHeaderMatcher> getLicenses() {
+    public static Collection<ILicense> getLicenses() {
         return Collections.unmodifiableCollection(licenses);
     }
 
@@ -155,4 +152,61 @@ public void build() {
             Defaults.readConfigFiles(fileNames);
         }
     }
+
+    public static class LicenseCollectionMatcher implements ILicense {
+
+        private Collection<ILicense> enclosed;
+        private ILicenseFamily family;
+
+        public LicenseCollectionMatcher(Collection<ILicense> enclosed) {
+            family = new SimpleLicenseFamily("", "System License Collection");
+            this.enclosed = enclosed;
+        }
+
+        @Override
+        public String getId() {
+            return "Default License Collection";
+        }
+
+        @Override
+        public void reset() {
+            enclosed.stream().forEach(ILicense::reset);
+        }
+
+        @Override
+        public boolean matches(String line) throws RatHeaderAnalysisException {
+            for (ILicense license : enclosed) {
+                if (license.matches(line)) {
+                    this.family = license.getLicenseFamily();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public void reportFamily(Consumer<ILicenseFamily> consumer) {
+            enclosed.stream().forEach(x -> x.reportFamily(consumer));
+        }
+
+        @Override
+        public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
+            enclosed.stream().forEach(x -> x.extractMatcher(consumer, comparator));
+        }
+
+        @Override
+        public ILicenseFamily getLicenseFamily() {
+            return family;
+        }
+
+        @Override
+        public String getNotes() {
+            return null;
+        }
+
+        @Override
+        public ILicense derivedFrom() {
+            return null;
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index c8d39ffc8..dd8678b56 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis;
 
 import org.apache.rat.api.Document;
@@ -25,27 +25,28 @@
 import org.apache.rat.document.impl.guesser.ArchiveGuesser;
 import org.apache.rat.document.impl.guesser.BinaryGuesser;
 import org.apache.rat.document.impl.guesser.NoteGuesser;
+import org.apache.rat.license.ILicense;
 
 /**
  * Creates default analysers.
  *
  */
 public class DefaultAnalyserFactory {
-  
-    public static final IDocumentAnalyser createDefaultAnalyser(final IHeaderMatcher matcher) {
-        
-        return new DefaultAnalyser(matcher);
+
+    public static final IDocumentAnalyser createDefaultAnalyser(final ILicense license) {
+        return new DefaultAnalyser(license);
     }
-    
+
     private final static class DefaultAnalyser implements IDocumentAnalyser {
 
-        private final IHeaderMatcher matcher;
-        
-        public DefaultAnalyser(final IHeaderMatcher matcher) {
+        private final ILicense license;
+
+        public DefaultAnalyser(final ILicense license) {
             super();
-            this.matcher = matcher;
+            this.license = license;
         }
 
+        @Override
         public void analyse(Document subject) throws RatDocumentAnalysisException {
             final MetaData.Datum documentCategory;
             if (NoteGuesser.isNote(subject)) {
@@ -56,10 +57,10 @@ public void analyse(Document subject) throws RatDocumentAnalysisException {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY;
             } else {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_STANDARD;
-                final DocumentHeaderAnalyser headerAnalyser = new DocumentHeaderAnalyser(matcher);
+                final DocumentHeaderAnalyser headerAnalyser = new DocumentHeaderAnalyser(license);
                 headerAnalyser.analyse(subject);
             }
             subject.getMetaData().set(documentCategory);
-        }        
+        }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
index e9f658c60..5f33377d5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
@@ -22,17 +22,18 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;
+import org.apache.rat.license.ILicense;
 
 import java.io.IOException;
 import java.io.Reader;
 
 public class DocumentHeaderAnalyser implements IDocumentAnalyser {
 
-    private final IHeaderMatcher matcher;
+    private final ILicense license;
     
-    public DocumentHeaderAnalyser(final IHeaderMatcher matcher) {
+    public DocumentHeaderAnalyser(final ILicense license) {
         super();
-        this.matcher = matcher;
+        this.license = license;
     }
 
     public void analyse(Document document) throws RatDocumentAnalysisException {
@@ -40,7 +41,7 @@ public void analyse(Document document) throws RatDocumentAnalysisException {
         try {
             reader = document.reader();
             // TODO: worker function should be moved into this class
-            HeaderCheckWorker worker = new HeaderCheckWorker(reader, matcher, document);
+            HeaderCheckWorker worker = new HeaderCheckWorker(reader, license, document);
             worker.read();
         } catch (IOException e) {
             throw new RatDocumentAnalysisException("Cannot read header", e);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index 6e7890cd0..04eb94bff 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -21,6 +21,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicense;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -36,7 +37,7 @@ class HeaderCheckWorker {
 
     private final int numberOfRetainedHeaderLines;
     private final BufferedReader reader;
-    private final IHeaderMatcher matcher;
+    private final ILicense license;
     private final Document document;
     
     private boolean match = false;
@@ -50,20 +51,20 @@ class HeaderCheckWorker {
      * @param reader a <code>Reader</code> for the content, not null
      * @param name the name of the checked content, possibly null
      */
-    public HeaderCheckWorker(Reader reader, final IHeaderMatcher matcher, final Document name) {
-        this(new BufferedReader(reader), matcher, name);
+    public HeaderCheckWorker(Reader reader, final ILicense license, final Document name) {
+        this(new BufferedReader(reader), license, name);
     }
 
-    public HeaderCheckWorker(BufferedReader reader, final IHeaderMatcher matcher,
+    public HeaderCheckWorker(BufferedReader reader, final ILicense license,
             final Document name) {
-        this(reader, DEFAULT_NUMBER_OF_RETAINED_HEADER_LINES, matcher, name);
+        this(reader, DEFAULT_NUMBER_OF_RETAINED_HEADER_LINES, license, name);
     }
 
-    public HeaderCheckWorker(BufferedReader reader, int numberOfRetainedHeaderLine, final IHeaderMatcher matcher,
+    public HeaderCheckWorker(BufferedReader reader, int numberOfRetainedHeaderLine, final ILicense license,
             final Document name) {
         this.reader = reader;
         this.numberOfRetainedHeaderLines = numberOfRetainedHeaderLine;
-        this.matcher = matcher;
+        this.license = license;
         this.document = name;
     }
 
@@ -90,7 +91,7 @@ public void read() throws RatHeaderAnalysisException {
                 throw new RatHeaderAnalysisException("Cannot read header for " + document, e);
             }
             IOUtils.closeQuietly(reader);
-            matcher.reset();
+            license.reset();
         }
         finished = true;
     }
@@ -103,7 +104,10 @@ boolean readLine(StringBuilder headers) throws IOException, RatHeaderAnalysisExc
                 headers.append(line);
                 headers.append('\n');
             }
-            match = matcher.match(document.getMetaData(), line);
+            match = license.matches(line);
+            if (match) {
+                document.getMetaData().reportOnLicense(license);
+            }
             result = !match;
         }
         return result;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 55dc52c2d..03eb3228e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -27,10 +27,11 @@
 import org.apache.rat.analysis.matchers.AbstractMatcherContainer;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.SimpleLicenseFamily;
 
-public abstract class BaseLicense extends AbstractMatcherContainer {
+public abstract class BaseLicense extends AbstractMatcherContainer implements ILicense {
     private ILicenseFamily family;
     private String notes;
 
@@ -53,17 +54,15 @@ public String getNotes() {
         return notes;
     }
 
-    public final void reportOnLicense(MetaData metaData) {
-        metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
-        metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, family.getFamilyCategory()));
-        metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, family.getFamilyCategory()));
-        metaData.set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, family.getFamilyName()));
-    }
-
     @Override
     public boolean matches(String line) throws RatHeaderAnalysisException {
         return enclosed.iterator().next().matches(line);
     }
+    
+    @Override
+    public ILicense derivedFrom() {
+        return null;
+    }
 
     /**
      * Removes everything except letter or digit from text.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
similarity index 87%
rename from apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
rename to apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
index 817a5a22e..a8c4968aa 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
@@ -24,6 +24,7 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
 import java.util.regex.Pattern;
@@ -47,15 +48,16 @@
  *
  * @since Rat 0.9
  */
-public class CopyrightHeader extends BaseLicense {
+public class CopyrightLicense extends BaseLicense {
 
     
 
-    protected CopyrightHeader(ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
+    protected CopyrightLicense(ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
         super(licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
 
-    public CopyrightHeader(String id, ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
+    public CopyrightLicense(String id, ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
         super(id, licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index 36aee049b..c9893f8e0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -6,22 +6,18 @@
 import java.util.function.Predicate;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 
 public abstract class AbstractMatcherContainer extends AbstractHeaderMatcher {
-    
+
     protected Collection<IHeaderMatcher> enclosed;
 
-    
-    public AbstractMatcherContainer(String id, Collection<IHeaderMatcher> enclosed) {
+    public AbstractMatcherContainer(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id);
         this.enclosed = new ArrayList<>(enclosed);
     }
-    
-    public AbstractMatcherContainer(Collection<IHeaderMatcher> enclosed) {
+
+    public AbstractMatcherContainer(Collection<? extends IHeaderMatcher> enclosed) {
         super();
         this.enclosed = new ArrayList<>(enclosed);
     }
@@ -35,7 +31,7 @@ public void reset() {
     public final void reportFamily(Consumer<ILicenseFamily> consumer) {
         enclosed.forEach(x -> x.reportFamily(consumer));
     }
-    
+
     @Override
     public final void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
         enclosed.forEach(x -> x.extractMatcher(matchers, comparator));
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index 1c871a188..c9311e590 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -24,6 +24,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.license.ILicense;
+
 /**
  * Data about the subject.
  */
@@ -150,6 +153,15 @@ public MetaData(final ContentType contentType) {
         this.data = new ArrayList<>(16);
     }
     
+    public void reportOnLicense(ILicense license) {
+        if (license.getNotes() != null && StringUtils.isNotBlank(license.getNotes())) {
+            set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, license.getNotes()));
+        }
+        set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, license.getLicenseFamily().getFamilyCategory()));
+        set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, license.getLicenseFamily().getFamilyCategory()));
+        set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, license.getLicenseFamily().getFamilyName()));
+    }
+    
     /**
      * Gets the content type for the subject.
      * @return or null when the type is unknown
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index b6700b184..5a3dde8a3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -21,7 +21,7 @@
 import java.util.Arrays;
 
 public enum Format {
-    CONFIG( "cfg", "config");
+    XML( "xml");
     
     
     String[] suffix;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/PropertyConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/PropertyConfigurationReader.java
deleted file mode 100644
index c9f303545..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/PropertyConfigurationReader.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.configuration;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import org.apache.commons.configuration2.CompositeConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration2.builder.fluent.Parameters;
-import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.license.CopyrightHeader;
-import org.apache.rat.analysis.license.FullTextMatchingLicense;
-import org.apache.rat.analysis.license.SimplePatternBasedLicense;
-import org.apache.rat.analysis.matchers.OrMatcher;
-import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
-import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
-
-/*
- *          *  
-         *  --- CONFIG ---
-         * family.category.name=text
-         * 
-         * license.id.family=famid
-         * license.id.notes=
-         * license.id.fullText=
-         * license.id.copyright=
-         * license.id.text=
-         * license.id.spdx=
- */
-public class PropertyConfigurationReader implements Reader {
-    private final CompositeConfiguration configuration;
-
-    public PropertyConfigurationReader() {
-        configuration = new CompositeConfiguration();
-    }
-
-    @Override
-    public void add(URL url) {
-        try {
-            read(url);
-        } catch (ConfigurationException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    public void read(URL... urls) throws ConfigurationException {
-        FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
-                PropertiesConfiguration.class);
-        PropertiesBuilderParameters parameters = new Parameters().properties().setThrowExceptionOnMissing(true);
-
-        for (URL url : urls) {
-            parameters.setURL(url);
-            add(builder.configure(parameters).getConfiguration());
-        }
-    }
-
-    public void add(Configuration cfg) {
-        configuration.addConfiguration(cfg);
-    }
-
-    @Override
-    public SortedSet<ILicenseFamily> readFamilies() {
-        SortedSet<ILicenseFamily> licenseFamilies = new TreeSet<>();
-        Configuration families = configuration.subset("family");
-        Iterator<String> iter = families.getKeys();
-        while (iter.hasNext()) {
-            String cat = iter.next();
-            ILicenseFamily fam = new SimpleLicenseFamily(cat, families.getString(cat));
-            licenseFamilies.add(new SimpleLicenseFamily(cat, families.getString(cat)));
-        }
-        return licenseFamilies;
-    }
-
-    Set<String> extractKeys(Configuration cfg) {
-        Iterator<String> iter = cfg.getKeys();
-        Set<String> ids = new TreeSet<>();
-        while (iter.hasNext()) {
-            ids.add(iter.next().split("\\.")[0]);
-        }
-        return ids;
-    }
-
-    @Override
-    public Collection<IHeaderMatcher> readLicenses() {
-        SortedSet<ILicenseFamily> families = readFamilies();
-        Collection<IHeaderMatcher> result = new ArrayList<>();
-        List<IHeaderMatcher> licenses = new ArrayList<>();
-        Configuration licenseConfig = configuration.subset("license");
-        for (String id : extractKeys(licenseConfig)) {
-            Configuration lic = licenseConfig.subset(id);
-            ILicenseFamily licenseFamily = ILicenseFamily.searchSet(families, lic.getString("family"));
-            if (licenseFamily == null) {
-                throw new IllegalArgumentException(
-                        String.format("license %s uses family %s which is missing", id, lic.getString("family")));
-            }
-            Set<String> keys = extractKeys(lic);
-            String notes = lic.getString("notes", "");
-            if (keys.contains("fullText")) {
-                licenses.add(new FullTextMatchingLicense(id, licenseFamily, notes, lic.getString("fullText")));
-            }
-            if (keys.contains("copyright")) {
-                licenses.add(new CopyrightHeader(id, licenseFamily, notes, lic.getString("copyright")));
-            }
-            if (keys.contains("text")) {
-                Configuration text = lic.subset("text");
-                Set<String> txtKeys = extractKeys(text);
-                List<String> texts = txtKeys.stream().map(text::getString).collect(Collectors.toList());
-                licenses.add(
-                        new SimplePatternBasedLicense(id, licenseFamily, notes, texts.toArray(new String[texts.size()])));
-            }
-            if (keys.contains("spdx")) {
-                licenses.add(SPDXMatcherFactory.INSTANCE.register(id, licenseFamily, notes, lic.getString("spdx")));
-            }
-            if (licenses.size() == 1) {
-                result.add(licenses.get(0));
-                licenses.clear();
-            } else if (licenses.size() > 1) {
-                result.add(new OrMatcher(id, licenses));
-                licenses = new ArrayList<>();
-            }
-        }
-        return result;
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
index 7d6a9389b..22fa9cc94 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
@@ -26,6 +26,7 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
 public interface Reader {
@@ -41,5 +42,5 @@ public interface Reader {
      * Reads the configuration and extracts the BaseLicenses.
      * @return A collection of Base licenses.
      */
-    Collection<IHeaderMatcher> readLicenses();
+    Collection<ILicense> readLicenses();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
index 9f50a8b5f..d2dd1c202 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -89,7 +89,7 @@ public class Readers {
 
     static {
         readers = new HashMap<>();
-        readers.put( Format.CONFIG, new PropertyConfigurationReader());
+        readers.put( Format.XML, new XMLConfigurationReader());
     }
 
     public static Reader get(URL fileName) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index c993becd9..e0033dd2d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -18,45 +18,35 @@
  */
 package org.apache.rat.configuration;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.configuration2.CompositeConfiguration;
 import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration2.builder.fluent.Parameters;
-import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters;
-import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.license.CopyrightHeader;
-import org.apache.rat.analysis.license.FullTextMatchingLicense;
-import org.apache.rat.analysis.license.SimplePatternBasedLicense;
 import org.apache.rat.analysis.matchers.AndMatcher;
+import org.apache.rat.analysis.matchers.CopyrightMatcher;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
 import org.apache.rat.analysis.matchers.OrMatcher;
-import org.apache.rat.analysis.matchers.SPDXMatcher;
 import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.SimpleLicense;
@@ -66,6 +56,7 @@
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 /*
  *  <license id=id name=name >
@@ -79,19 +70,20 @@
  */
 
 public class XMLConfigurationReader implements Reader {
-    
-    
-    enum MatcherType { text, copyright, spdx, and, or };
-    
-    private final Document complete;
+
+    enum MatcherType {
+        text, copyright, spdx, and, or
+    };
+
+    private Document complete;
     private final Element baseElement;
     private final SortedSet<ILicense> licenses;
-    
+
     public XMLConfigurationReader() {
         try {
             complete = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
         } catch (ParserConfigurationException e) {
-            throw new IllegalStateException( "No XML parser defined", e);
+            throw new IllegalStateException("No XML parser defined", e);
         }
         baseElement = complete.createElement("rat-config");
         licenses = new TreeSet<>();
@@ -101,37 +93,35 @@ public XMLConfigurationReader() {
     public void add(URL url) {
         try {
             read(url);
-        } catch (ParserConfigurationException e) {
-            throw new RuntimeException(e);
+        } catch (ParserConfigurationException | SAXException | IOException e) {
+            throw new RuntimeException("can not parse "+url, e);
         }
 
     }
 
-    public void read(URL... urls) throws ParserConfigurationException {
+    public void read(URL... urls) throws SAXException, IOException, ParserConfigurationException {
         DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
         for (URL url : urls) {
             Document document = builder.parse(url.openStream());
             add(document);
         }
     }
-    
+
     private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
-        for (int i=0; i<list.getLength(); i++) {
+        for (int i = 0; i < list.getLength(); i++) {
             consumer.accept(list.item(i));
         }
     }
 
     public void add(Document document) {
         nodeListConsumer(document.getElementsByTagName("rat-config"),
-                (x) -> nodeListConsumer( x.getChildNodes(), baseElement::appendChild));
+                (x) -> nodeListConsumer(x.getChildNodes(), baseElement::appendChild));
     }
-    
-    
 
     @Override
     public SortedSet<ILicenseFamily> readFamilies() {
         SortedSet<ILicenseFamily> result = new TreeSet<>();
-        readLicenses().stream().map( ILicense::getLicenseFamily).forEach( result::add );
+        readLicenses().stream().map(ILicense::getLicenseFamily).forEach(result::add);
         return result;
     }
 
@@ -143,11 +133,11 @@ Set<String> extractKeys(Configuration cfg) {
         }
         return ids;
     }
-    
-    Map<String,String> attributes(Node node) {
+
+    Map<String, String> attributes(Node node) {
         NamedNodeMap nnm = node.getAttributes();
-        Map<String,String> result = new HashMap<>();
-        for (int i=0; i<nnm.getLength(); i++) {
+        Map<String, String> result = new HashMap<>();
+        for (int i = 0; i < nnm.getLength(); i++) {
             Node n = nnm.item(i);
             result.put(n.getNodeName(), n.getNodeValue());
         }
@@ -157,148 +147,121 @@ Map<String,String> attributes(Node node) {
     private IHeaderMatcher parseMatcher(Node matcherNode) {
         String hasSpaces = ".*\\s.*";
         MatcherType type = MatcherType.valueOf(matcherNode.getLocalName());
-        switch (type) { 
-        case text: 
+        switch (type) {
+        case text:
             String txt = matcherNode.getTextContent();
             return Pattern.matches(hasSpaces, txt) ? new FullTextMatcher(txt) : new SimpleTextMatcher(txt);
 
         case or:
         case and:
             List<IHeaderMatcher> children = new ArrayList<>();
-            nodeListConsumer( matcherNode.getChildNodes(), x -> children.add(parseMatcher(x)));
-            return type==MatcherType.or ? new OrMatcher( children ) : new AndMatcher( children );
-            
+            nodeListConsumer(matcherNode.getChildNodes(), x -> children.add(parseMatcher(x)));
+            return type == MatcherType.or ? new OrMatcher(children) : new AndMatcher(children);
+
         case copyright:
-            Map<String,String> attr = attributes(matcherNode);
-            return new CopyrightMatcher(attr.get('start'), attr.get('end'), attr.get('owner'));
-            
+            Map<String, String> attr = attributes(matcherNode);
+            return new CopyrightMatcher(attr.get("start"), attr.get("end"), attr.get("owner"));
+
         case spdx:
             return SPDXMatcherFactory.INSTANCE.create(attributes(matcherNode).get("name"));
         }
-        
+        throw new IllegalStateException(String.format("%s is not a matcher type", matcherNode.getLocalName()));
     }
-    
-    private ILicense parseLicense(Node licenseNode)
-    {
-       Map<String,String> attributes = attributes(licenseNode);
-       
-       ILicenseFamily family = new SimpleLicenseFamily( attributes.get("id"), attributes.get("name"));
-       IHeaderMatcher matcher[] = {null};
-       StringBuilder notesBuilder = new StringBuilder();
-       nodeListConsumer( licenseNode.getChildNodes(), x -> { 
-           if (x.getLocalName().equals("notes")) {
-               notesBuilder.append(x.getTextContent()).append("\n");
-           } else {
-               matcher[0] = parseMatcher(x);
-           }
-       });
-       ILicense derivedFrom = attributes.get("derived-from")==null?null:new ILicenseProxy(attributes.get("derived-from"));
-       String notes = notesBuilder.length() == 0 ? null : notesBuilder.toString();
-       return new SimpleLicense( family, matcher[0], derivedFrom, notes);
+
+    private ILicense parseLicense(Node licenseNode) {
+        Map<String, String> attributes = attributes(licenseNode);
+
+        ILicenseFamily family = new SimpleLicenseFamily(attributes.get("id"), attributes.get("name"));
+        IHeaderMatcher matcher[] = { null };
+        StringBuilder notesBuilder = new StringBuilder();
+        nodeListConsumer(licenseNode.getChildNodes(), x -> {
+            if (x.getLocalName().equals("notes")) {
+                notesBuilder.append(x.getTextContent()).append("\n");
+            } else {
+                matcher[0] = parseMatcher(x);
+            }
+        });
+        ILicense derivedFrom = attributes.get("derived-from") == null ? null
+                : new ILicenseProxy(attributes.get("derived-from"));
+        String notes = notesBuilder.length() == 0 ? null : notesBuilder.toString();
+        return new SimpleLicense(family, matcher[0], derivedFrom, notes);
     }
-    
+
     @Override
     public SortedSet<ILicense> readLicenses() {
         if (licenses.size() == 0) {
-            nodeListConsumer( complete.getElementsByTagName("license"), x -> licenses.add( parseLicense(x)));
+            nodeListConsumer(complete.getElementsByTagName("license"), x -> licenses.add(parseLicense(x)));
             complete = null;
         }
         return Collections.unmodifiableSortedSet(licenses);
-        /*
-        SortedSet<ILicenseFamily> families = readFamilies();
-        Collection<IHeaderMatcher> result = new ArrayList<>();
-        List<IHeaderMatcher> licenses = new ArrayList<>();
-        Configuration licenseConfig = configuration.subset("license");
-        for (String id : extractKeys(licenseConfig)) {
-            Configuration lic = licenseConfig.subset(id);
-            ILicenseFamily licenseFamily = ILicenseFamily.searchSet(families, lic.getString("family"));
-            if (licenseFamily == null) {
-                throw new IllegalArgumentException(
-                        String.format("license %s uses family %s which is missing", id, lic.getString("family")));
-            }
-            Set<String> keys = extractKeys(lic);
-            String notes = lic.getString("notes", "");
-            if (keys.contains("fullText")) {
-                licenses.add(new FullTextMatchingLicense(id, licenseFamily, notes, lic.getString("fullText")));
-            }
-            if (keys.contains("copyright")) {
-                licenses.add(new CopyrightHeader(id, licenseFamily, notes, lic.getString("copyright")));
-            }
-            if (keys.contains("text")) {
-                Configuration text = lic.subset("text");
-                Set<String> txtKeys = extractKeys(text);
-                List<String> texts = txtKeys.stream().map(text::getString).collect(Collectors.toList());
-                licenses.add(
-                        new SimplePatternBasedLicense(id, licenseFamily, notes, texts.toArray(new String[texts.size()])));
-            }
-            if (keys.contains("spdx")) {
-                licenses.add(SPDXMatcher.INSTANCE.register(id, licenseFamily, notes, lic.getString("spdx")));
-            }
-            if (licenses.size() == 1) {
-                result.add(licenses.get(0));
-                licenses.clear();
-            } else if (licenses.size() > 1) {
-                result.add(new OrMatcher(id, licenses));
-                licenses = new ArrayList<>();
-            }
-        }
-        return licenses;
-        */
     }
-    
+
     class ILicenseProxy implements ILicense {
         final String proxyId;
         ILicense wrapped;
-        
+
         ILicenseProxy(String proxyId) {
             this.proxyId = proxyId;
         }
-        
+
         private void checkProxy() {
             if (wrapped == null) {
-                wrapped = complete.stream().
+                Optional<ILicense> lic = licenses.stream()
+                        .filter(l -> l.getLicenseFamily().getFamilyCategory().equals(proxyId)).findFirst();
+                if (!lic.isPresent()) {
+                    throw new IllegalStateException(String.format("%s is not a valid family category", proxyId));
+                }
+                wrapped = lic.get();
             }
         }
 
+        @Override
         public ILicenseFamily getLicenseFamily() {
             checkProxy();
             return wrapped.getLicenseFamily();
         }
 
+        @Override
         public String getNotes() {
             checkProxy();
             return wrapped.getNotes();
         }
 
+        @Override
         public ILicense derivedFrom() {
             checkProxy();
             return wrapped.derivedFrom();
         }
 
+        @Override
         public String getId() {
             checkProxy();
             return wrapped.getId();
         }
 
+        @Override
         public void reset() {
             checkProxy();
             wrapped.reset();
         }
 
-        public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
+        @Override
+        public boolean matches(String line) throws RatHeaderAnalysisException {
             checkProxy();
-            return wrapped.match(metadata, line);
+            return wrapped.matches(line);
         }
 
+        @Override
         public void reportFamily(Consumer<ILicenseFamily> consumer) {
             checkProxy();
             wrapped.reportFamily(consumer);
         }
 
+        @Override
         public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
             checkProxy();
             wrapped.extractMatcher(consumer, comparator);
         }
-        
+
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 5ce7ef5e3..d41d001ea 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -6,15 +6,4 @@ public interface ILicense extends IHeaderMatcher {
     ILicenseFamily getLicenseFamily();
     String getNotes();
     ILicense derivedFrom();
-    
-    /*
-     * <license id=id name=name derived-from="">
-        <notes></notes>
-        <text>  </text>
-        <copyright start='' end='' owner=''/>
-        <spdx></spdx> 
-        <and> <license>...</and>
-        <or> <license>...</or> 
-    </license>
-     */
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index 1f95e6f04..032887734 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -5,17 +5,15 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.MetaData;
 
 public class SimpleLicense implements ILicense {
 
-    ILicenseFamily family;
-    IHeaderMatcher matcher;
-    ILicense derivedFrom;
-    String notes;
-    
-    public SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, ILicense derivedFrom, String notes)
-    {
+    private ILicenseFamily family;
+    private IHeaderMatcher matcher;
+    private ILicense derivedFrom;
+    private String notes;
+
+    public SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, ILicense derivedFrom, String notes) {
         this.family = family;
         this.matcher = matcher;
         this.derivedFrom = derivedFrom;
@@ -42,22 +40,27 @@ public void setDerivedFrom(ILicense derivedFrom) {
         this.derivedFrom = derivedFrom;
     }
 
+    @Override
     public String getId() {
         return matcher.getId();
     }
 
+    @Override
     public void reset() {
         matcher.reset();
     }
 
-    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
-        return matcher.match(metadata, line);
+    @Override
+    public boolean matches(String line) throws RatHeaderAnalysisException {
+        return matcher.matches(line);
     }
 
+    @Override
     public void reportFamily(Consumer<ILicenseFamily> consumer) {
         matcher.reportFamily(consumer);
     }
 
+    @Override
     public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
         matcher.extractMatcher(consumer, comparator);
     }
@@ -69,8 +72,7 @@ public ILicenseFamily getLicenseFamily() {
 
     @Override
     public String getNotes() {
-        // TODO Auto-generated method stub
-        return null;
+        return notes;
     }
 
     @Override
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index ee1ad58ca..60cd143ec 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE rat-config SYSTEM "">
 <rat-config>
 	
 <licenses>
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index 502e932c3..9636cd11e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -29,6 +29,7 @@
 import java.util.TreeMap;
 
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.license.ILicense;
 import org.junit.Test;
 
 public class DefaultsTest {
@@ -39,15 +40,15 @@ public class DefaultsTest {
     public void defaultConfigTest() {
         Defaults.builder().build();
 
-        Collection<IHeaderMatcher> families = Defaults.getLicenses();
+        Collection<ILicense> licenses = Defaults.getLicenses();
 
         Set<String> names = new HashSet<>();
-        families.forEach(x -> x.reportFamily(y -> names.add(y.getFamilyCategory())));
+        licenses.forEach(x -> x.reportFamily(y -> names.add(y.getFamilyCategory())));
         assertEquals(FAMILIES.length - 1, names.size());
         names.removeAll(Arrays.asList(FAMILIES));
         assertTrue(names.isEmpty());
 
-        Collection<IHeaderMatcher> licenses = Defaults.getLicenses();
+
         assertEquals(15, licenses.size());
         Map<String, Integer> result = new TreeMap<>();
         licenses.forEach(x -> {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 2d907a192..71e78eba1 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 
+import org.apache.rat.Defaults.LicenseCollectionMatcher;
 import org.apache.rat.analysis.matchers.OrMatcher;
 import org.apache.rat.test.utils.Resources;
 import org.apache.rat.walker.DirectoryWalker;
@@ -115,11 +116,11 @@ private static String getElementsReports(String pElementsPath) {
     public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         Defaults.builder().build();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        OrMatcher matcherMultiplexer = new OrMatcher("testing License",Defaults.getLicenses());
+        LicenseCollectionMatcher licenseMatcher = new LicenseCollectionMatcher(Defaults.getLicenses());
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setApproveDefaultLicenses(true);
-        configuration.addHeaderMatcher(matcherMultiplexer);
+        configuration.addHeaderMatcher(licenseMatcher);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
         configuration.setOut(out);
         Reporter.report(configuration);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index 5309a9de2..2f1ae54a9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -27,6 +27,7 @@
 
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.impl.MonolithicFileDocument;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 import org.apache.rat.test.utils.Resources;
@@ -35,11 +36,11 @@
 
 public class AnalyserFactoryTest {
 
-    private static IHeaderMatcher MATCHES_NOTHING_MATCHER = mock(IHeaderMatcher.class);
+    private static ILicense MATCHES_NOTHING_MATCHER = mock(ILicense.class);
 
     static {
         try {
-            when(MATCHES_NOTHING_MATCHER.match(any(), any())).thenReturn(false);
+            when(MATCHES_NOTHING_MATCHER.matches(any())).thenReturn(false);
         } catch (RatHeaderAnalysisException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
index 53a1b4677..262930dc4 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
@@ -27,6 +27,7 @@
 
 import org.apache.rat.api.Document;
 import org.apache.rat.document.MockLocation;
+import org.apache.rat.license.ILicense;
 import org.junit.Test;
 
 public class HeaderCheckWorkerTest {
@@ -34,7 +35,7 @@ public class HeaderCheckWorkerTest {
     @Test
     public void isFinished() throws Exception {
         final Document subject = new MockLocation("subject");
-        IHeaderMatcher matcher = mock(IHeaderMatcher.class);
+        ILicense matcher = mock(ILicense.class);
         HeaderCheckWorker worker = new HeaderCheckWorker(new StringReader(""), matcher, subject);
         assertFalse(worker.isFinished());
         worker.read();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
index 804bcf149..a7f5e5c74 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
@@ -148,7 +148,7 @@ private boolean processText(IHeaderMatcher matcher, String text) throws IOExcept
         String line = in.readLine();
         boolean found = false;
         while (line != null) {
-            found |= matcher.match(data, line);
+            found |= matcher.matches(line);
             line = in.readLine();
         }
         return found;
@@ -270,9 +270,9 @@ public void reset() {
 	    }
 
 	    @Override
-	    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
+	    public boolean matches(String line) throws RatHeaderAnalysisException {
 	        matchCalled++;
-	        if (wrapped.match(metadata, line)) {
+	        if (wrapped.matches(line)) {
 	            matchCount++;
 	            return true;
 	        }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrighLicenseTest.java
similarity index 91%
rename from apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
rename to apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrighLicenseTest.java
index c996fea09..297f65ae9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrighLicenseTest.java
@@ -30,7 +30,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class CopyrightHeaderTest {
+public class CopyrighLicenseTest {
 
     private static final String[] MATCHING_HEADERS =
             { "/*  Copyright 2012 FooBar.*/"
@@ -45,22 +45,22 @@ public class CopyrightHeaderTest {
             , "/*  Copyright 2013FooBar*/"
             , "/*  Copyright 2012 2013 FooBar.*/" };
 
-    private CopyrightHeader header;
+    private CopyrightLicense header;
     private MetaData metadata;
 
     @Before
     public void setUp() throws Exception {
         ILicenseFamily family = new SimpleLicenseFamily("test", "Test family");
-        header = new CopyrightHeader(family,"","FooBar");
+        header = new CopyrightLicense(family,"",null, null, "FooBar");
         metadata = new MetaData();
     }
 
     @Test
     public void match() throws Exception {
         for (String line : MATCHING_HEADERS) {
-            assertTrue("Copyright Header should be matched", header.match(metadata, line));
+            assertTrue("Copyright Header should be matched", header.matches(line));
             header.reset();
-            assertFalse("After reset, content should build up again", header.match(metadata, "New line"));
+            assertFalse("After reset, content should build up again", header.matches("New line"));
             header.reset();
         }
     }
@@ -68,9 +68,9 @@ public void match() throws Exception {
     @Test
     public void noMatch() throws Exception {
         for (String line : NON_MATCHING_HEADERS) {
-            assertFalse("Copyright Header shouldn't be matched", header.match(metadata, line));
+            assertFalse("Copyright Header shouldn't be matched", header.matches( line));
             header.reset();
-            assertTrue("After reset, content should build up again", header.match(metadata, MATCHING_HEADERS[0]));
+            assertTrue("After reset, content should build up again", header.matches(MATCHING_HEADERS[0]));
             header.reset();
         }
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
index 756cf2376..38ecf9b7c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
@@ -27,6 +27,7 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.MockLocation;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.test.utils.Resources;
 import org.junit.Assert;
 
@@ -40,7 +41,7 @@ class DirectoryScanner {
      * @param expected the expected result of the each scan
      * @throws Exception
      */
-    public static void testFilesInDir(String directory, IHeaderMatcher matcher, boolean expected) throws Exception {
+    public static void testFilesInDir(String directory, ILicense license, boolean expected) throws Exception {
         final File[] resourceFiles = Resources.getResourceFiles(directory);
         if (resourceFiles.length == 0) {
             Assert.fail("No files found under "+directory);
@@ -53,11 +54,11 @@ public static void testFilesInDir(String directory, IHeaderMatcher matcher, bool
                 br = Resources.getBufferedReader(f);
                 String line;
                 while(!result && (line = br.readLine()) != null) {
-                    result = matcher.match(subject.getMetaData(), line);
+                    result = license.matches(line);
                 }
                 assertEquals(f.toString(), expected, result);
             } finally {
-                matcher.reset();
+                license.reset();
                 IOUtils.closeQuietly(br);
             }
         }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
index 8f2f6f0fd..bf2a32d26 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
@@ -55,17 +55,16 @@ public void setUp() {
 
     @Test
     public void testMatcherLine() throws Exception {
-        final MetaData metadata = new MetaData();
-
-        multiplexer.match(metadata, LINE_ONE);
-        verify(matcherOne, times(1)).match(eq(metadata), eq(LINE_ONE));
-        verify(matcherTwo, times(1)).match(eq(metadata), eq(LINE_ONE));
-
-        multiplexer.match(metadata, LINE_TWO);
-        verify(matcherOne, times(1)).match(eq(metadata), eq(LINE_TWO));
-        verify(matcherTwo, times(1)).match(eq(metadata), eq(LINE_TWO));
-        verify(matcherOne, times(2)).match(eq(metadata), any());
-        verify(matcherTwo, times(2)).match(eq(metadata), any());
+        
+        multiplexer.matches(LINE_ONE);
+        verify(matcherOne, times(1)).matches(eq(LINE_ONE));
+        verify(matcherTwo, times(1)).matches(eq(LINE_ONE));
+
+        multiplexer.matches(LINE_TWO);
+        verify(matcherOne, times(1)).matches(eq(LINE_TWO));
+        verify(matcherTwo, times(1)).matches(eq(LINE_TWO));
+        verify(matcherOne, times(2)).matches(any());
+        verify(matcherTwo, times(2)).matches(any());
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index 4e4ecda7e..d3b964cd1 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
@@ -29,21 +30,25 @@
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.junit.Test;
+import org.xml.sax.SAXException;
 
 public class ConfigurationReaderTest {
     
     private static String[] FAMILIES = {"GEN  ", "?????", "AL   ", "OASIS", "W3CD ", "W3C  ", "GPL1 ", "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "BSD_m"};
     
     @Test
-    public void readDefault() throws ConfigurationException {
-        PropertyConfigurationReader reader = new PropertyConfigurationReader();
-        URL url = PropertyConfigurationReader.class.getResource("/org/apache/rat/default.config");
+    public void readDefault() throws ConfigurationException, SAXException, IOException, ParserConfigurationException {
+        XMLConfigurationReader reader = new XMLConfigurationReader();
+        URL url = XMLConfigurationReader.class.getResource("/org/apache/rat/default.config");
         reader.read(url);
         List<String> familyCategories = Arrays.asList(FAMILIES);
         Set<String> readCategories = reader.readFamilies().stream().map(ILicenseFamily::getFamilyCategory).collect(Collectors.toSet());
@@ -51,7 +56,7 @@ public void readDefault() throws ConfigurationException {
         readCategories.removeAll(familyCategories);
         assertTrue(readCategories.isEmpty());
         
-        Collection<IHeaderMatcher> licenses = reader.readLicenses();
+        Collection<ILicense> licenses = reader.readLicenses();
         assertEquals(15, licenses.size());
         Map<String,Integer> result = new TreeMap<>();
         for (IHeaderMatcher license : licenses) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
index da12da7e7..df8d67800 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
@@ -24,8 +24,8 @@
 public class FormatTest {
     @Test
     public void fromNameTest() {
-        assertEquals(Format.CONFIG, Format.fromName("foo/x.config"));
-        assertEquals(Format.CONFIG, Format.fromName("x.cfg"));
+        assertEquals(Format.XML, Format.fromName("foo/x.xml"));
+        assertEquals(Format.XML, Format.fromName("x.xml"));
         assertThrows(IllegalArgumentException.class, () ->Format.fromName("junk"));
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
index 78302b394..591d0bd6c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
@@ -26,8 +26,8 @@
 public class ReadersTest {
     @Test
     public void getTest() throws MalformedURLException {
-        assertEquals(PropertyConfigurationReader.class, Readers.get( "foo/x.config").getClass());
-        assertEquals(PropertyConfigurationReader.class, Readers.get("x.cfg").getClass());
+        assertEquals(XMLConfigurationReader.class, Readers.get( "foo/x.config").getClass());
+        assertEquals(XMLConfigurationReader.class, Readers.get("x.cfg").getClass());
         assertThrows( IllegalArgumentException.class, () -> Readers.get("x.junk"));
     }
 }

From efc02572cb9f50cf7cbf18d5619d4c018504ddb0 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 11 Sep 2023 08:57:34 +0200
Subject: [PATCH 083/299] cleaned up code

---
 .../GeneratedLicenseNotRequired.java          | 110 ------
 .../analysis/matchers/SimpleRegexMatcher.java |  56 +++
 .../analysis/matchers/SimpleTextMatcher.java  |   6 +-
 .../main/resources/org/apache/rat/default.xml | 328 ++++++++++++------
 4 files changed, 271 insertions(+), 229 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
deleted file mode 100644
index be39e68db..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequired.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.generation;
-
-import java.util.regex.Pattern;
-
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.SimpleLicenseFamily;
-
-public class GeneratedLicenseNotRequired extends BaseLicense {
-
-    private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
-    private static final Pattern[] EMPTY_PATTERN_ARRAY = new Pattern[0];
-
-    private static final String[] DEFAULT_PHRASES = {
-        "generated by Cayenne",
-        "Generated By:JJTree",
-        "Generated By:JavaCC",
-        "THIS FILE IS AUTOMATICALLY GENERATED",
-        "NOTE: this file is autogenerated by XBeans",
-        "This file was automatically generated by ",
-        "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!",
-        "# Microsoft Developer Studio Generated NMAKE File",
-        "# Microsoft Developer Studio Generated Build File",
-        "Generated from configure.ac by autoheader",
-        "generated automatically by aclocal",
-        "build.xml generated by maven from project.xml",
-        "This file was generated by",
-        "This file has been automatically generated.",
-        "Automatically generated - do not modify!",
-        "Javadoc style sheet",
-        "SOURCE FILE GENERATATED",
-        "Generated by the Batik",
-        "this file is autogenerated",
-        "This class was autogenerated",
-        "Generated by Maven",
-        "Autogenerated by Thrift",
-        "DO NOT EDIT THIS FILE - it is machine generated",
-        "This class was generated by",
-        "Generated by javadoc"};
-    
-    
-    // Uses either patterns or strings currently (not both)
-    private final Pattern[] linePatterns;
-    private final String[] phrases;
-    
-    public GeneratedLicenseNotRequired() {
-        this(DEFAULT_PHRASES);
-    }
-    
-    public GeneratedLicenseNotRequired(final Pattern[] linePatterns) {
-        super(new SimpleLicenseFamily(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN, "Generated Code"), "");
-        this.linePatterns = linePatterns;
-        this.phrases = EMPTY_STRING_ARRAY;
-    }
-
-    public GeneratedLicenseNotRequired(final String[] lines) {
-        super(new SimpleLicenseFamily(MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN, "Generated Code"), "");
-        this.linePatterns = EMPTY_PATTERN_ARRAY;
-        this.phrases = lines;
-    }
-
-    @Override
-    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
-        boolean result = false;
-        for (Pattern pat : linePatterns) {
-            if (pat.matcher(line).matches()) {
-                result = true;
-                reportOnLicense(metadata);
-                break;
-            }
-        }
-        for(String phrase : phrases) {
-            if (line.contains(phrase)) {
-                result = true;
-                reportOnLicense(metadata);
-                break;
-            }                
-        }
-        return result;
-    }
-
-//    public void reportOnLicense(Document subject) {
-//        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN);
-//    }
-
-    public void reset() {
-        // stateless
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
new file mode 100644
index 000000000..a33bded35
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.matchers;
+
+import java.util.regex.Pattern;
+
+/**
+ * @since Rat 0.8
+ */
+public class SimpleRegexMatcher extends AbstractHeaderMatcher {
+    private Pattern pattern;
+
+    /**
+     * Creates a pattern based license with full documentation.
+     * 
+     * @param pLicenseFamilyCategory
+     * @param pLicenseFamilyName
+     * @param pNotes
+     * @param pPatterns
+     */
+    public SimpleRegexMatcher(Pattern pattern) {
+        super();
+        this.pattern = pattern;
+    }
+
+    public SimpleRegexMatcher(String id, Pattern pattern) {
+        super(id);
+        this.pattern = pattern;
+    }
+
+    @Override
+    public boolean matches(String line) {
+        return line != null && pattern.matcher(line).matches();
+    }
+
+    @Override
+    public void reset() {
+        // Nothing to do
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index 9138b3ed8..52ee66e43 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -18,10 +18,6 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
-
 /**
  * @since Rat 0.8
  */
@@ -46,7 +42,7 @@ public SimpleTextMatcher(String id, String pattern) {
         this.pattern = pattern;
     }
 
-    
+    @Override
     public boolean matches(String line) {
         return line != null && line.contains(pattern);
     }
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index 60cd143ec..258541349 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -1,9 +1,6 @@
-<!DOCTYPE rat-config SYSTEM "">
+<?xml version="1.0" encoding="UTF-8"?>
 <rat-config>
-	
-<licenses>
-
-
+	<licenses>
 <!--
 	<license id=id name=name>
 		<notes></notes>
@@ -15,113 +12,216 @@
 	</license>
 -->
 
-<license id="AL" name="Apache License Version 2.0">
-	<any>
-		<text>Licensed under the Apache License, Version 2.0 (the "License")</text>
-		<text>Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</text>
-		<text>http://www.apache.org/licenses/LICENSE-2.0</text>
-		<text>https://www.apache.org/licenses/LICENSE-2.0</text>
-		<text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
-		<text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
-		<text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
-		<text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
-		<spdx name='Apache-2.0'/>
-	</any>
-</license>
-
-<license id="ASL" name="Applied Apahce License Version 2.0">
-	<all>
-		<license-ref refid="AL"/>
-		<copyright start="" end="" owner=""/>
-	</all>
-</license>
-
-<license id="CDDL1" name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
-	<any>
-		<text>The contents of this file are subject to the terms of the Common Development\nand Distribution License("CDDL") (the "License"). You may not use this file\nexcept in compliance with the License.</text>
-		<spdx name='CDDL-1.0'/>
-	</any>
-</license>
-
-<license id="CDDL1" name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
-	<any>
-		<text>The contents of this file are subject to the terms of the Common Development\nand Distribution License("CDDL") (the "License"). You may not use this file\nexcept in compliance with the License.</text>
-		<spdx name='CDDL-1.0'/>
-	</any>
-</license>
-
-<license id="ILUMOS" name="ILLUMOS CDDL1 Derived license" derived-from='CDDL1'>
-	<note>modified CDDL1 license</note>
-	<any>
-		<text>The contents of this file are subject to the terms of the\nCommon Development and Distribution License (the "License")\nYou may not use this file except in compliance with the License.\n</text>
-	</any>
-</license>
-
-<license id="DOJO" name="DOJO License" derived-from="BSD">
-	<text>http://dojotoolkit.org/community/licensing.shtml</text>
-</license>
-
-<license id="GEN" name="Generated files" />
-	<text file="generation-keywords"/>
-</license>
-
-<license id="GPL1" name="GNU General Public License, version 1">
-	<any>
-		</text>This program is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 1, or (at your option)\n any later version.</text>text>
-		<spdx name='GPL-1.0-only'/>
-	</any>
-</license>
-
-<license id="GPL2" name="GNU General Public License, version 2">
-	<any>
-		</text>This program is free software; you can redistribute it and/or\n modify it under the terms of the GNU General Public License\n as published by the Free Software Foundation; either version 2\n of the License, or (at your option) any later version.</text>
-		<spdx name='GPL-2.0-only'/>
-	</any>
-</license>
-
-<license id="GPL3" name="GNU General Public License, version 3">
-	<any>
-		</text>This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.</text>
-		<spdx name='GPL-3.0-only'/>
-	</any>
-</license>
-
-<license id="MIT" name="The MIT License">
-	<any>
-		</text>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</text>
-		<spdx name='MIT'/>
-	</any>
-</license>
-
-<license id="OASIS" name="OASIS Open License">
-	<notes>No modifications allowed</notes>
-	<all>
-		</text>This document and translations of it may be copied and furnished to others and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared copied published and distributed</text>
-		<copyright owner="OASIS Open"/>
-	</all>
-</license>
-
-<license id="TMF" name="The Telemanagement Forum License" derived-from="BSD">
-	<any>
-		</text>TMF854 Version 1.0</text>
-		<copyrigth owner="TeleManagement Forum"/>
-	</any>
-</license>
-
-
-<license id="W3C" name="W3C Software Copyright">
-	<notes>Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.</notes>
-	<any>
-		</text>http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</text>
-		<spdx name='W3C'/>
-	</any>
-</license>
-
-<license id="W3CD" name="W3C Document Copyright">
-	<notes>Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.</notes>
-	</text>http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</text>
-</license>
-
-</licenses>
+		<license id="AL" name="Apache License Version 2.0">
+			<any>
+				<text>Licensed under the Apache License, Version 2.0 (the
+					"License")</text>
+				<text>Licensed to the Apache Software Foundation (ASF) under one
+					or more contributor license agreements; and to You under the
+					Apache License, Version 2.0.</text>
+				<text>http://www.apache.org/licenses/LICENSE-2.0</text>
+				<text>https://www.apache.org/licenses/LICENSE-2.0</text>
+				<text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
+				<text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
+				<text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
+				<text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
+				<spdx name='Apache-2.0' />
+			</any>
+		</license>
+
+		<license id="ASL" name="Applied Apahce License Version 2.0">
+			<all>
+				<license-ref refid="AL" />
+				<copyright start="" end="" owner="" />
+			</all>
+		</license>
+
+		<license id="CDDL1"
+			name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
+			<any>
+				<text>The contents of this file are subject to the terms of the
+					Common Development\nand Distribution License("CDDL") (the
+					"License"). You may not use this file\nexcept in compliance
+					with the License.</text>
+				<spdx name='CDDL-1.0' />
+			</any>
+		</license>
+
+		<license id="CDDL1"
+			name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
+			<any>
+				<text>The contents of this file are subject to the terms of the
+					Common Development\nand Distribution License("CDDL") (the
+					"License"). You may not use this file\nexcept in compliance
+					with the License.</text>
+				<spdx name='CDDL-1.0' />
+			</any>
+		</license>
+
+		<license id="ILUMOS" name="ILLUMOS CDDL1 Derived license"
+			derived-from='CDDL1'>
+			<note>modified CDDL1 license</note>
+			<any>
+				<text>The contents of this file are subject to the terms of
+					the\nCommon Development and Distribution License (the
+					"License")\nYou may not use this file except in compliance
+					with the License.\n</text>
+			</any>
+		</license>
+
+		<license id="DOJO" name="DOJO License" derived-from="BSD">
+			<text>http://dojotoolkit.org/community/licensing.shtml</text>
+		</license>
+
+		<license id="GEN" name="Generated files">
+			<text file="generation-keywords" />
+		</license>
+
+		<license id="GPL1" name="GNU General Public License, version 1">
+			<any>
+				<text>This program is free software; you can
+					redistribute it and/or modify\n it under the terms of the
+					GNU
+					General Public License as published by\n the Free Software
+					Foundation; either version 1, or (at your option)\n any
+					later
+					version.</text>
+
+				<spdx name='GPL-1.0-only' />
+			</any>
+		</license>
+
+		<license id="GPL2" name="GNU General Public License, version 2">
+			<any>
+				<text>This program is free software; you can
+					redistribute it and/or\n modify it under the terms of the
+					GNU
+					General Public License\n as published by the Free Software
+					Foundation; either version 2\n of the License, or (at your
+					option) any later version.</text>
+				<spdx
+					name='GPL-2.0-only' />
+			</any>
+		</license>
+
+		<license id="GPL3" name="GNU General Public License, version 3">
+			<any>
+				<text>This program is free software: you can
+					redistribute it and/or modify\n it under the terms of the
+					GNU
+					General Public License as published by\n the Free Software
+					Foundation, either version 3 of the License, or\n (at your
+					option) any later version.</text>
+				<spdx
+					name='GPL-3.0-only' />
+			</any>
+		</license>
+
+		<license id="MIT" name="The MIT License">
+			<any>
+				<text>Permission is hereby granted, free of charge, to
+					any person obtaining a copy of this software and associated
+					documentation files (the \"Software\"), to deal in the
+					Software
+					without restriction, including without limitation the rights
+					to
+					use, copy, modify, merge, publish, distribute, sublicense,
+					and/or sell copies of the Software, and to permit persons to
+					whom the Software is furnished to do so, subject to the
+					following conditions: The above copyright notice and this
+					permission notice shall be included in all copies or
+					substantial
+					portions of the Software. THE SOFTWARE IS PROVIDED "AS IS",
+					WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+					BUT
+					NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+					FOR A
+					PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+					THE
+					AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+					DAMAGES OR
+					OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+					OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+					SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</text>
+				<spdx
+					name='MIT' />
+			</any>
+		</license>
+
+		<license id="OASIS" name="OASIS Open License">
+			<notes>No modifications allowed</notes>
+			<all>
+				<text>This document and translations of it may be
+					copied and furnished to others and derivative works that
+					comment
+					on or otherwise explain it or assist in its implementation
+					may
+					be prepared copied published and distributed</text>
+				<copyright
+					owner="OASIS Open" />
+			</all>
+		</license>
+
+		<license id="TMF" name="The Telemanagement Forum License"
+			derived-from="BSD">
+			<any>
+				<text>TMF854 Version 1.0</text>
+				<copyrigth
+					owner="TeleManagement Forum" />
+			</any>
+		</license>
+
+
+		<license id="W3C" name="W3C Software Copyright">
+			<notes>
+				Note that W3C requires a NOTICE. All modifications require
+				notes. See
+				http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.</notes>
+			<any>
+				<text>
+					http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</text>
+				<spdx
+					name='W3C' />
+			</any>
+		</license>
+
+		<license id="W3CD" name="W3C Document Copyright">
+			<notes>
+				Note that W3CD does not allow modifications. See
+				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.</notes>
+			<text>
+				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</text>
+		</license>
+
+		<license id="GEN" name="Generated Code">
+			<notes>
+				Code files that are autmoatically generated.</notes>
+			<text>
+				generated by Cayenne</text>
+			<text>Generated By:JJTree</text>
+			<text>Generated By:JavaCC</text>
+			<text>THIS FILE IS AUTOMATICALLY GENERATED</text>
+			<text>NOTE: this file is autogenerated by XBeans</text>
+			<text>This file was automatically generated by</text>
+			<text># WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!</text>
+			<text># Microsoft Developer Studio Generated NMAKE File</text>
+			<text># Microsoft Developer Studio Generated Build File</text>
+			<text>Generated from configure.ac by autoheader</text>
+			<text>generated automatically by aclocal</text>
+			<text>build.xml generated by maven from project.xml</text>
+			<text>This file was generated by</text>
+			<text>This file has been automatically generated.</text>
+			<text>Automatically generated - do not modify!</text>
+			<text>Javadoc style sheet</text>
+			<text>SOURCE FILE GENERATATED</text>
+			<text>Generated by the Batik</text>
+			<text>this file is autogenerated</text>
+			<text>This class was autogenerated</text>
+			<text>Generated by Maven</text>
+			<text>Autogenerated by Thrift</text>
+			<text>DO NOT EDIT THIS FILE - it is machine generated</text>
+			<text>This class was generated by</text>
+			<text>Generated by javadoc</text>
+		</license>
+	</licenses>
 </rat-config>
-            
\ No newline at end of file

From fc3e8c526b0038122fb8f922b81072cc0f73a2a0 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 13 Sep 2023 17:18:52 +0200
Subject: [PATCH 084/299] added tests, cleaned up code

---
 .../apache/rat/ConfigurationException.java    |   2 +-
 .../main/java/org/apache/rat/Defaults.java    |  27 +-
 .../src/main/java/org/apache/rat/Report.java  |   2 +-
 .../org/apache/rat/ReportConfiguration.java   |  24 +-
 .../apache/rat/analysis/IHeaderMatcher.java   |  40 +--
 .../rat/analysis/license/BaseLicense.java     |  15 +-
 .../analysis/license/CopyrightLicense.java    |   3 -
 .../license/FullTextMatchingLicense.java      |  11 -
 .../matchers/AbstractHeaderMatcher.java       |  21 +-
 .../matchers/AbstractMatcherContainer.java    |  14 -
 .../rat/analysis/matchers/AndMatcher.java     |  19 +-
 .../analysis/matchers/CopyrightMatcher.java   |  83 +++--
 .../analysis/matchers/FullTextMatcher.java    |  19 +-
 .../rat/analysis/matchers/NotMatcher.java     |  28 ++
 .../rat/analysis/matchers/OrMatcher.java      |   9 +-
 .../analysis/matchers/SPDXMatcherFactory.java |  21 +-
 .../analysis/matchers/SimpleTextMatcher.java  |   5 +
 .../java/org/apache/rat/api/MetaData.java     |   2 +-
 .../{Reader.java => LicenseReader.java}       |   2 +-
 .../org/apache/rat/configuration/Readers.java |   8 +-
 .../configuration/XMLConfigurationReader.java | 214 +++++++++----
 .../java/org/apache/rat/license/ILicense.java |   8 +-
 .../org/apache/rat/license/SimpleLicense.java |  24 +-
 .../rat/license/SimpleLicenseFamily.java      |   3 +
 .../rat/report/xml/XmlReportFactory.java      |  14 +-
 .../main/resources/org/apache/rat/default.xml | 165 +++++-----
 .../java/org/apache/rat/DefaultsTest.java     |  44 +--
 .../test/java/org/apache/rat/ReportTest.java  |   3 +-
 .../rat/analysis/AnalyserFactoryTest.java     |   5 -
 .../analysis/license/AbstractLicenseTest.java | 159 ++++++++++
 .../analysis/license/AbstractMatcherTest.java | 296 ------------------
 .../license/ApacheSoftwareLicenseTest.java    |  59 ++--
 .../AppliedApacheSoftwareLicense20Test.java   | 114 -------
 .../AppliedApacheSoftwareLicenseTest.java     |  52 +++
 .../analysis/license/CDDL1LicenseTest.java    |  53 ++--
 .../analysis/license/CopyrighLicenseTest.java |  77 -----
 ...23LicenseTest.java => GPLLicenseTest.java} |  24 +-
 .../license/GeneratedLicenseTest.java         |  47 +++
 .../IllumosLicenseTest.java}                  |  44 +--
 .../rat/analysis/license/MITLicenseTest.java  |  12 +-
 .../analysis/license/OASISLicenseTest.java    |  37 +--
 .../rat/analysis/license/OrMatcherTest.java   |  18 --
 .../rat/analysis/license/W3CLicenseTest.java  |  40 +--
 .../matchers/CopyrightMatcherTest.java        | 138 ++++++++
 .../rat/analysis/matchers/NotMatcherTest.java |  29 ++
 .../ConfigurationReaderTest.java              |  55 +---
 .../apache/rat/configuration/ReadersTest.java |   4 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |   9 +-
 .../apache/rat/report/xml/XmlReportTest.java  |   5 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    |   2 +-
 .../java/org/apache/rat/anttasks/Report.java  |   2 +-
 51 files changed, 966 insertions(+), 1145 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
 rename apache-rat-core/src/main/java/org/apache/rat/configuration/{Reader.java => LicenseReader.java} (97%)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrighLicenseTest.java
 rename apache-rat-core/src/test/java/org/apache/rat/analysis/license/{GPL123LicenseTest.java => GPLLicenseTest.java} (77%)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
 rename apache-rat-core/src/test/java/org/apache/rat/analysis/{generation/GeneratedLicenseNotRequiredTest.java => license/IllumosLicenseTest.java} (56%)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
index 98519e83f..3c6755dbb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
@@ -1,6 +1,6 @@
 package org.apache.rat;
 
-public class ConfigurationException extends Exception {
+public class ConfigurationException extends RuntimeException {
 
     public ConfigurationException(String message, Throwable cause) {
         super(message, cause);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index b30404ffd..29ed0eac7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -35,7 +35,7 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.configuration.Reader;
+import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.Readers;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
@@ -45,7 +45,7 @@
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
  */
 public class Defaults {
-    static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.config");
+    static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.xml");
 
     /**
      * no instances
@@ -53,7 +53,7 @@ public class Defaults {
     private Defaults() {
     }
 
-    private static Collection<ILicense> licenses = new ArrayList<>();
+    private static SortedSet<ILicense> licenses = new TreeSet<>();
     private static SortedSet<ILicenseFamily> licenseFamilies = new TreeSet<>();
 
     public static Builder builder() {
@@ -67,7 +67,7 @@ public static void clear() {
 
     private static void readConfigFiles(Collection<URL> urls) {
         for (URL url : urls) {
-            Reader reader = Readers.get(url);
+            LicenseReader reader = Readers.get(url);
             reader.add(url);
             licenseFamilies.addAll(reader.readFamilies());
             licenses.addAll(reader.readLicenses());
@@ -93,8 +93,8 @@ public static ILicense createDefaultMatcher() {
         return new LicenseCollectionMatcher(licenses);
     }
 
-    public static Collection<ILicense> getLicenses() {
-        return Collections.unmodifiableCollection(licenses);
+    public static Set<ILicense> getLicenses() {
+        return Collections.unmodifiableSet(licenses);
     }
 
     public static Set<String> getLicenseNames() {
@@ -184,16 +184,6 @@ public boolean matches(String line) throws RatHeaderAnalysisException {
             return false;
         }
 
-        @Override
-        public void reportFamily(Consumer<ILicenseFamily> consumer) {
-            enclosed.stream().forEach(x -> x.reportFamily(consumer));
-        }
-
-        @Override
-        public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
-            enclosed.stream().forEach(x -> x.extractMatcher(consumer, comparator));
-        }
-
         @Override
         public ILicenseFamily getLicenseFamily() {
             return family;
@@ -208,5 +198,10 @@ public String getNotes() {
         public ILicense derivedFrom() {
             return null;
         }
+
+        @Override
+        public int compareTo(ILicense arg0) {
+            return ILicense.getComparator().compare(this, arg0);
+        }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index dbd2acc87..dd5092f91 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -64,7 +64,7 @@ public class Report {
 
     public static final void main(String[] args) throws Exception {
         try (final ReportConfiguration configuration = new ReportConfiguration()) {
-            configuration.addHeaderMatcher(Defaults.createDefaultMatcher());
+            configuration.addLicense(Defaults.createDefaultMatcher());
             configuration.setApproveDefaultLicenses(true);
             Options opts = buildOptions();
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 569389a2e..8597fb42c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -30,8 +30,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.Defaults.LicenseCollectionMatcher;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.IReportable;
 
@@ -41,7 +41,7 @@
  * and invoke the {@link Report}.
  */
 public class ReportConfiguration implements AutoCloseable {
-    private List<IHeaderMatcher> headerMatcher = new ArrayList<>();
+    private List<ILicense> licenses = new ArrayList<>();
     private List<ILicenseFamily> approvedLicenseNames = new ArrayList<>();
     private boolean addingLicenses;
     private boolean addingLicensesForced;
@@ -123,14 +123,14 @@ public void setApproveDefaultLicenses(boolean approveDefaultLicenses) {
      *
      * @return the header matcher.
      */
-    public IHeaderMatcher getHeaderMatcher() {
-        if (headerMatcher.isEmpty()) {
+    public ILicense getLicense() {
+        if (licenses.isEmpty()) {
             return null;
         }
-        if (headerMatcher.size() == 1) {
-            return headerMatcher.get(0);
+        if (licenses.size() == 1) {
+            return licenses.get(0);
         }
-        return new OrMatcher("Report matchers", headerMatcher);
+        return new LicenseCollectionMatcher(licenses);
     }
 
     /**
@@ -138,8 +138,8 @@ public IHeaderMatcher getHeaderMatcher() {
      *
      * @param headerMatcher header matcher.
      */
-    public void addHeaderMatcher(IHeaderMatcher headerMatcher) {
-        this.headerMatcher.add(headerMatcher);
+    public void addLicense(ILicense headerMatcher) {
+        this.licenses.add(headerMatcher);
     }
 
     /**
@@ -238,11 +238,11 @@ public void setAddingLicenses(boolean addingLicenses) {
         this.addingLicenses = addingLicenses;
     }
 
-    public void validate(Consumer<String> logger) throws ConfigurationException {
+    public void validate(Consumer<String> logger) {
         if (reportable == null) {
             throw new ConfigurationException("Reportable may not be null");
         }
-        if (headerMatcher.size() == 0) {
+        if (licenses.size() == 0) {
             throw new ConfigurationException("You must specify at least one license" + " matcher");
         }
         if (styleSheet != null && !isStyleReport()) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 0c058a292..6d22385cf 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -15,16 +15,9 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis;
 
-import java.util.Collection;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
 /**
  * Matches text headers to known licenses.
  */
@@ -32,18 +25,21 @@ public interface IHeaderMatcher {
 
     /**
      * Get the identifier for this matcher.
+     * 
      * @return the Identifier for this matcher.
      */
     String getId();
+
     /**
-     * Resets this matches.
-     * Subsequent calls to {@link #match} will accumulate new text.
+     * Resets this matches. Subsequent calls to {@link #match} will accumulate new
+     * text.
      */
     void reset();
 
     /**
-     * Matches the text accumulated to licenses.
-     * TODO probably a poor design choice - hope to fix later
+     * Matches the text accumulated to licenses. TODO probably a poor design choice
+     * - hope to fix later
+     * 
      * @param subject current document.
      * @param line next line of text, not null
      * 
@@ -51,23 +47,5 @@ public interface IHeaderMatcher {
      * 
      * @throws RatHeaderAnalysisException in case of internal RAT errors.
      */
-    boolean matches(String line) throws RatHeaderAnalysisException;
-    
-    /**
-     * Report the license family for this and any contained implementations.
-     * @param consumer the consumer to report to.
-     */
-    void reportFamily(Consumer<ILicenseFamily> consumer);
-    
-    /**
-     * If this HeaderMatcher has an associated LicenseFamily and it matches the comparator then call
-     * the consumer. If this HeaderMatcher is a collection of HeaderMatchers then make the call on each of the 
-     * enclosed HeaderMatchers.
-     * 
-     * @param consumer The consumer for the HeaderMatcher.
-     * @param comparator the test for calling the consumer.
-     */
-    void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator);
-    
-    
+    boolean matches(String line);
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 03eb3228e..7badbffe0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -34,22 +34,35 @@
 public abstract class BaseLicense extends AbstractMatcherContainer implements ILicense {
     private ILicenseFamily family;
     private String notes;
+    private ILicense derivedFrom;
 
     public BaseLicense(ILicenseFamily family, String notes, IHeaderMatcher matcher) {
         this(null, family, notes, matcher);
     }
 
     public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher) {
+        this(null, family, notes, matcher, null);
+    }
+    
+    public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher, ILicense derivedFrom) {
         super(String.format("%s:%s:%s/%s", idPrefix == null ? "" : idPrefix, family.getFamilyCategory(),
                 matcher.getClass().getSimpleName(), matcher.getId()), Arrays.asList(matcher));
         this.family = family;
         this.notes = notes;
+        this.derivedFrom = derivedFrom;
     }
 
     public ILicenseFamily getLicenseFamily() {
         return family;
     }
 
+
+    @Override
+    public int compareTo(ILicense arg0) {
+        return ILicense.getComparator().compare(this, arg0);
+    }
+
+    
     public String getNotes() {
         return notes;
     }
@@ -61,7 +74,7 @@ public boolean matches(String line) throws RatHeaderAnalysisException {
     
     @Override
     public ILicense derivedFrom() {
-        return null;
+        return derivedFrom;
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
index a8c4968aa..2ee0995f7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
@@ -50,8 +50,6 @@
  */
 public class CopyrightLicense extends BaseLicense {
 
-    
-
     protected CopyrightLicense(ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
         super(licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
@@ -59,5 +57,4 @@ protected CopyrightLicense(ILicenseFamily licenseFamily, String notes, String st
     public CopyrightLicense(String id, ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
         super(id, licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index fb2ca1801..ed0409f19 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -40,17 +40,6 @@
  */
 public class FullTextMatchingLicense extends BaseLicense {
 
-    // Number of match characters assumed to be present on first line
-    private static final int DEFAULT_INITIAL_LINE_LENGTH = 20;
-
-    private String fullText;
-
-    private String firstLine;
-
-    private boolean seenFirstLine = false;
-
-    private final StringBuilder buffer = new StringBuilder();
-
     public FullTextMatchingLicense(ILicenseFamily family, String notes, String fullText) {
         super(family, notes, new FullTextMatcher(fullText));
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
index 5902b111e..419d42e12 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
@@ -1,22 +1,17 @@
 package org.apache.rat.analysis.matchers;
 
 import java.util.UUID;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
 
 public abstract class AbstractHeaderMatcher implements IHeaderMatcher {
-    
+
     private String id;
-    
+
     protected AbstractHeaderMatcher() {
         this(UUID.randomUUID().toString());
     }
-    
+
     protected AbstractHeaderMatcher(String id) {
         this.id = id;
     }
@@ -26,16 +21,6 @@ public String getId() {
         return id;
     }
 
-    @Override
-    public void reportFamily(Consumer<ILicenseFamily> consumer) {
-        // by default do nothing.
-    }
-
-    @Override
-    public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
-        // by default do nothing
-    }
-
     @Override
     public String toString() {
         return getId();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index c9893f8e0..4205c7616 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -2,11 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.license.ILicenseFamily;
 
 public abstract class AbstractMatcherContainer extends AbstractHeaderMatcher {
 
@@ -26,15 +23,4 @@ public AbstractMatcherContainer(Collection<? extends IHeaderMatcher> enclosed) {
     public void reset() {
         enclosed.stream().forEach(x -> x.reset());
     }
-
-    @Override
-    public final void reportFamily(Consumer<ILicenseFamily> consumer) {
-        enclosed.forEach(x -> x.reportFamily(consumer));
-    }
-
-    @Override
-    public final void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
-        enclosed.forEach(x -> x.extractMatcher(matchers, comparator));
-    }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
index a4d14458e..f4063e085 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -1,27 +1,18 @@
 package org.apache.rat.analysis.matchers;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
 
 public class AndMatcher extends AbstractMatcherContainer {
     private boolean[] flags = null;
-    
+
     public AndMatcher(String id, Collection<IHeaderMatcher> enclosed) {
         super(id, enclosed);
         flags = new boolean[enclosed.size()];
     }
-    
+
     public AndMatcher(Collection<IHeaderMatcher> enclosed) {
         super(enclosed);
         flags = new boolean[enclosed.size()];
@@ -34,11 +25,11 @@ public void reset() {
     }
 
     @Override
-    public boolean matches(String line) throws RatHeaderAnalysisException {
+    public boolean matches(String line) {
         boolean result = true;
         Iterator<IHeaderMatcher> iter = enclosed.iterator();
-        int i=0;
-        while(iter.hasNext()) {
+        int i = 0;
+        while (iter.hasNext()) {
             if (flags[i]) {
                 iter.next();
             } else {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index a24eccacd..08b2fb6a6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -21,6 +21,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * Matches a typical Copyright header line only based on a regex pattern which
  * allows for one (starting) year or year range, and a configurable copyright
@@ -46,72 +48,65 @@
  */
 public class CopyrightMatcher extends AbstractHeaderMatcher {
 
-    private static final String COPYRIGHT_PATTERN_DEFN = "(\\b)?\\([Cc]\\)|©|Copyright\\b";
+    private static final String COPYRIGHT_SYMBOL_DEFN = "\\([Cc]\\)|©";
+    private static final String COPYRIGHT_PATTERN_DEFN = "(\\b)?" + COPYRIGHT_SYMBOL_DEFN + "|Copyright\\b";
     private static final Pattern COPYRIGHT_PATTERN = Pattern.compile(COPYRIGHT_PATTERN_DEFN);
+    private static final String ONE_PART = "\\s+((" + COPYRIGHT_SYMBOL_DEFN + ")\\s+)?%s";
+    private static final String TWO_PART = "\\s+((" + COPYRIGHT_SYMBOL_DEFN + ")\\s+)?%s,?\\s+%s";
 
-    private Pattern datePattern;
-    private String owner;
-    private boolean answered;
+    private final Pattern dateOwnerPattern;
+    private final Pattern ownerDatePattern;
 
     public CopyrightMatcher(String start, String stop, String owner) {
         super();
-        if (start != null) {
-            if (stop != null) {
-                datePattern = Pattern.compile(String.format("\\b%s\\s?-\\s?%s\\b", start, stop));
+        String dateDefn = "";
+        if (StringUtils.isNotEmpty(start)) {
+            if (StringUtils.isNotEmpty(stop)) {
+                dateDefn = String.format("%s\\s*-\\s*%s", start.trim(), stop.trim());
             } else {
-                datePattern = Pattern.compile(String.format("\\b%s\\b", start));
+                dateDefn = start.trim();
+            }
+        }
+        if (StringUtils.isEmpty(owner)) {
+            // no owner
+            if (StringUtils.isEmpty(dateDefn)) {
+                dateDefn = "[0-9]{4}";
             }
+            dateOwnerPattern = Pattern.compile(String.format(ONE_PART, dateDefn));
+            ownerDatePattern = null;
         } else {
-            datePattern = null;
+            if (StringUtils.isEmpty(dateDefn)) {
+                // no date
+                dateOwnerPattern = Pattern.compile(String.format(ONE_PART, owner));
+                ownerDatePattern = null;
+            } else {
+                dateOwnerPattern = Pattern.compile(String.format(TWO_PART, dateDefn, owner));
+                ownerDatePattern = Pattern.compile(String.format(TWO_PART, owner, dateDefn));
+            }
         }
-        this.owner = owner;
-        this.answered = false;
     }
 
     @Override
     public boolean matches(String line) {
-        return answered ? false : processLine(line);
-    }
-
-    private boolean processLine(String line) {
-        String buffer = null;
         Matcher matcher = COPYRIGHT_PATTERN.matcher(line);
-        if (matcher.matches()) {
-            buffer = line.substring(matcher.end());
-        }
-
-        if (buffer != null) {
-            // check for 2 options "date owner"
-            // "owner date"
-            if (owner == null) {
-                matcher = datePattern.matcher(buffer);
-                if (matcher.matches() && matcher.start() == 0) {
-                    answered = true;
-                    return true;
-                }
-            } else {
-                if (datePattern != null) {
-                    matcher = datePattern.matcher(buffer);
-                    if (!matcher.matches()) {
-                        return false;
-                    }
-                    if (matcher.start() == 0) {
-                        buffer = buffer.substring(matcher.end());
-                    }
-                }
-                buffer.trim();
-                if (buffer.startsWith(owner)) {
-                    answered = true;
+        if (matcher.find()) {
+            String buffer = line.substring(matcher.end());
+            matcher = dateOwnerPattern.matcher(buffer);
+            if (matcher.find() && matcher.start() == 0) {
+                return true;
+            }
+            if (ownerDatePattern != null) {
+                matcher = ownerDatePattern.matcher(buffer);
+                if (matcher.find() && matcher.start() == 0) {
                     return true;
                 }
             }
-
+            return false;
         }
         return false;
     }
 
     @Override
     public void reset() {
-        answered = false;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
index e32b5586a..cbcb09eca 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -19,11 +19,6 @@
 package org.apache.rat.analysis.matchers;
 
 import java.util.Locale;
-import java.util.UUID;
-
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
 
 /**
  * Accumulates all letters and numbers contained inside the header and compares
@@ -48,6 +43,8 @@ public class FullTextMatcher extends AbstractHeaderMatcher {
 
     private boolean seenFirstLine = false;
 
+    private boolean result = false;
+
     private final StringBuilder buffer = new StringBuilder();
 
     public FullTextMatcher(String fullText) {
@@ -55,19 +52,18 @@ public FullTextMatcher(String fullText) {
         setFullText(fullText);
     }
 
-
     public FullTextMatcher(String id, String fullText) {
         super(id);
         setFullText(fullText);
     }
-    
+
     /**
      * Removes everything except letter or digit from text.
      * 
      * @param text The text to remove extra chars from.
      * @return the pruned text.
      */
-    protected final String prune(String text) {
+    public static final String prune(String text) {
         final int length = text.length();
         final StringBuilder buffer = new StringBuilder(length);
         for (int i = 0; i < length; i++) {
@@ -94,7 +90,10 @@ public final boolean hasFullText() {
     }
 
     @Override
-    public boolean matches(String line) throws RatHeaderAnalysisException {
+    public boolean matches(String line) {
+        if (result) {
+            return true;
+        }
         final String inputToMatch = prune(line).toLowerCase(Locale.ENGLISH);
         if (seenFirstLine) { // Accumulate more input
             buffer.append(inputToMatch);
@@ -113,6 +112,7 @@ public boolean matches(String line) throws RatHeaderAnalysisException {
 
         if (buffer.length() >= fullText.length()) { // we have enough data to match
             if (buffer.toString().contains(fullText)) {
+                result = true;
                 return true; // we found a match
             }
             // buffer contains first line but does not contain full text
@@ -136,5 +136,6 @@ public void reset() {
     private void init() {
         buffer.setLength(0);
         seenFirstLine = false;
+        result = false;
     }
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
new file mode 100644
index 000000000..de110db97
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
@@ -0,0 +1,28 @@
+package org.apache.rat.analysis.matchers;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class NotMatcher extends AbstractHeaderMatcher {
+
+    private final IHeaderMatcher enclosed;
+
+    public NotMatcher(IHeaderMatcher enclosed) {
+        super();
+        this.enclosed = enclosed;
+    }
+
+    public NotMatcher(String id, IHeaderMatcher enclosed) {
+        super(id);
+        this.enclosed = enclosed;
+    }
+
+    @Override
+    public boolean matches(String line) {
+        return !enclosed.matches(line);
+    }
+
+    @Override
+    public void reset() {
+        enclosed.reset();
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
index e42fff066..70baaa1ef 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
@@ -1,15 +1,8 @@
 package org.apache.rat.analysis.matchers;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
 
 public class OrMatcher extends AbstractMatcherContainer {
 
@@ -22,7 +15,7 @@ public OrMatcher(String id, Collection<IHeaderMatcher> enclosed) {
     }
 
     @Override
-    public boolean matches(String line) throws RatHeaderAnalysisException {
+    public boolean matches(String line) {
         for (IHeaderMatcher matcher : enclosed) {
             if (matcher.matches(line)) {
                 return true;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index 23d6288a0..7e21a8a72 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -20,17 +20,10 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
 
 /**
  * Defines a matcher for an SPDX tag. SPDX tag is of the format
@@ -57,7 +50,7 @@ public class SPDXMatcherFactory {
 
     private String lastLine;
     private Match lastMatch;
-    
+
     /**
      * Constructor.
      * 
@@ -79,7 +72,7 @@ public IHeaderMatcher create(String spdxId) {
         return matcher;
     }
 
-    private boolean check(String line, Match caller) throws RatHeaderAnalysisException {
+    private boolean check(String line, Match caller) {
         if (lastLine == null || !lastLine.equals(line)) {
             Matcher matcher = groupSelector.matcher(line);
             if (matcher.find()) {
@@ -92,8 +85,7 @@ private boolean check(String line, Match caller) throws RatHeaderAnalysisExcepti
     }
 
     public class Match extends AbstractHeaderMatcher {
-        private String spdx;
-
+        
         /**
          * Constructor.
          * 
@@ -103,9 +95,8 @@ public class Match extends AbstractHeaderMatcher {
          * @param licenseFamilyName the RAT license family name for the license.
          * @param notes The notes for this matcher.
          */
-        Match(final String spdxId ) {
-            super("SPDX:"+spdxId);
-            spdx = spdxId;
+        Match(final String spdxId) {
+            super("SPDX:" + spdxId);
         }
 
         @Override
@@ -113,7 +104,7 @@ public void reset() {
         }
 
         @Override
-        public boolean matches(String line) throws RatHeaderAnalysisException {
+        public boolean matches(String line) {
             return SPDXMatcherFactory.this.check(line, this);
         }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index 52ee66e43..7419b5b13 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -18,6 +18,8 @@
  */
 package org.apache.rat.analysis.matchers;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * @since Rat 0.8
  */
@@ -34,6 +36,9 @@ public class SimpleTextMatcher extends AbstractHeaderMatcher {
      */
     public SimpleTextMatcher(String pattern) {
         super();
+        if (StringUtils.isBlank(pattern)) {
+            throw new IllegalArgumentException( "Pattern may not be null, empty or blank");
+        }
         this.pattern = pattern;
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index c9311e590..b64e95960 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -154,7 +154,7 @@ public MetaData(final ContentType contentType) {
     }
     
     public void reportOnLicense(ILicense license) {
-        if (license.getNotes() != null && StringUtils.isNotBlank(license.getNotes())) {
+        if (StringUtils.isNotBlank(license.getNotes())) {
             set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, license.getNotes()));
         }
         set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, license.getLicenseFamily().getFamilyCategory()));
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
similarity index 97%
rename from apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
rename to apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index 22fa9cc94..92e5d07fc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Reader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -29,7 +29,7 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-public interface Reader {
+public interface LicenseReader {
     void add(URL url);
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
index d2dd1c202..de059d57c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -85,14 +85,14 @@ public class Readers {
      * license.id.spdx=
      */
 
-    private static Map<Format,Reader> readers;
+    private static Map<Format,LicenseReader> readers;
 
     static {
         readers = new HashMap<>();
         readers.put( Format.XML, new XMLConfigurationReader());
     }
 
-    public static Reader get(URL fileName) {
+    public static LicenseReader get(URL fileName) {
         return readers.get(Format.fromName(fileName.getFile()));
     }
     
@@ -100,11 +100,11 @@ private Readers() {
         // do not instantiate
     }
 
-    public static Reader get(File file) throws MalformedURLException {
+    public static LicenseReader get(File file) throws MalformedURLException {
         return get(file.toURI().toURL());
     }
     
-    public static Reader get(String fileName) throws MalformedURLException {
+    public static LicenseReader get(String fileName) throws MalformedURLException {
         return get(new File(fileName));
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index e0033dd2d..765f28d36 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -18,32 +18,42 @@
  */
 package org.apache.rat.configuration;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.commons.configuration2.Configuration;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.analysis.matchers.AndMatcher;
 import org.apache.rat.analysis.matchers.CopyrightMatcher;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
+import org.apache.rat.analysis.matchers.NotMatcher;
 import org.apache.rat.analysis.matchers.OrMatcher;
 import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
@@ -69,42 +79,72 @@
     </license>
  */
 
-public class XMLConfigurationReader implements Reader {
+public class XMLConfigurationReader implements LicenseReader {
 
     enum MatcherType {
-        text, copyright, spdx, and, or
+        text, copyright, spdx, any, all, license_ref, not
     };
 
-    private Document complete;
+    private Document document;
     private final Element baseElement;
+    private final Element licensesElement;
     private final SortedSet<ILicense> licenses;
 
     public XMLConfigurationReader() {
         try {
-            complete = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+            document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
         } catch (ParserConfigurationException e) {
             throw new IllegalStateException("No XML parser defined", e);
         }
-        baseElement = complete.createElement("rat-config");
-        licenses = new TreeSet<>();
+        baseElement = document.createElement("rat-config");
+        document.appendChild(baseElement);
+        licensesElement = document.createElement("licenses");
+        baseElement.appendChild(licensesElement);
+        licenses = new TreeSet<>((x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily()));
     }
 
-    @Override
-    public void add(URL url) {
+    public void printDocument(OutputStream out) {
+        printDocument(out, document);
+    }
+
+    public void printDocument(OutputStream out, Document document) {
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer;
         try {
-            read(url);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            throw new RuntimeException("can not parse "+url, e);
+            transformer = tf.newTransformer();
+
+            transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
+            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+
+            transformer.transform(new DOMSource(document), new StreamResult(new OutputStreamWriter(out, "UTF-8")));
+        } catch (TransformerException | UnsupportedEncodingException e) {
+            e.printStackTrace(new PrintStream(out));
         }
+    }
 
+    @Override
+    public void add(URL url) {
+        read(url);
     }
 
-    public void read(URL... urls) throws SAXException, IOException, ParserConfigurationException {
-        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+    public void read(URL... urls) {
+        DocumentBuilder builder;
+        try {
+            builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        } catch (ParserConfigurationException e) {
+            throw new ConfigurationException("Unable to create DOM builder", e);
+        }
         for (URL url : urls) {
-            Document document = builder.parse(url.openStream());
-            add(document);
+            try {
+                add(builder.parse(url.openStream()));
+            } catch (SAXException | IOException e) {
+                throw new ConfigurationException("Unable to read url: " + url, e);
+            }
         }
+
     }
 
     private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
@@ -113,9 +153,12 @@ private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
         }
     }
 
-    public void add(Document document) {
-        nodeListConsumer(document.getElementsByTagName("rat-config"),
-                (x) -> nodeListConsumer(x.getChildNodes(), baseElement::appendChild));
+    public void add(Document newDoc) {
+        printDocument(System.out, newDoc);
+        List<Node> lst = new ArrayList<>();
+        nodeListConsumer(newDoc.getElementsByTagName("license"), lst::add);
+        nodeListConsumer(newDoc.getElementsByTagName("license"),
+                (n) -> licensesElement.appendChild(baseElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
     }
 
     @Override
@@ -125,15 +168,6 @@ public SortedSet<ILicenseFamily> readFamilies() {
         return result;
     }
 
-    Set<String> extractKeys(Configuration cfg) {
-        Iterator<String> iter = cfg.getKeys();
-        Set<String> ids = new TreeSet<>();
-        while (iter.hasNext()) {
-            ids.add(iter.next().split("\\.")[0]);
-        }
-        return ids;
-    }
-
     Map<String, String> attributes(Node node) {
         NamedNodeMap nnm = node.getAttributes();
         Map<String, String> result = new HashMap<>();
@@ -144,28 +178,81 @@ Map<String, String> attributes(Node node) {
         return result;
     }
 
+    private IHeaderMatcher createTextMatcher(String txt) {
+        boolean complex = txt.contains(" ") | txt.contains("\\t") | txt.contains("\\n") | txt.contains("\\r")
+                | txt.contains("\\f") | txt.contains("\\v");
+        return complex ? new FullTextMatcher(txt) : new SimpleTextMatcher(txt);
+    }
+
+    /**
+     * Reads a text file. Each line becomes a text matcher in the resulting List.
+     * 
+     * @param resourceName the name of the resource to read.
+     * @return a List of Matchers, one for each non empty line in the input file.
+     */
+    private List<IHeaderMatcher> readTextResource(String resourceName) {
+        URL url = XMLConfigurationReader.class.getResource(resourceName);
+        List<IHeaderMatcher> matchers = new ArrayList<>();
+        try (final InputStream in = url.openStream()) {
+            BufferedReader buffer = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+            String txt;
+            while (null != (txt = buffer.readLine())) {
+                txt = txt.trim();
+                if (StringUtils.isNotBlank(txt)) {
+                    matchers.add(createTextMatcher(txt));
+                }
+            }
+            return matchers;
+        } catch (IOException e) {
+            throw new ConfigurationException("Unable to read matching text file: " + resourceName, e);
+        }
+    }
+
     private IHeaderMatcher parseMatcher(Node matcherNode) {
-        String hasSpaces = ".*\\s.*";
-        MatcherType type = MatcherType.valueOf(matcherNode.getLocalName());
+        Map<String, String> attr = attributes(matcherNode);
+        MatcherType type = MatcherType.valueOf(matcherNode.getNodeName());
+        List<IHeaderMatcher> children;
+
         switch (type) {
         case text:
-            String txt = matcherNode.getTextContent();
-            return Pattern.matches(hasSpaces, txt) ? new FullTextMatcher(txt) : new SimpleTextMatcher(txt);
+            return createTextMatcher(matcherNode.getTextContent().trim());
 
-        case or:
-        case and:
-            List<IHeaderMatcher> children = new ArrayList<>();
-            nodeListConsumer(matcherNode.getChildNodes(), x -> children.add(parseMatcher(x)));
-            return type == MatcherType.or ? new OrMatcher(children) : new AndMatcher(children);
+        case any:
+        case all:
+
+            if (attr.get("resource") != null) {
+                children = readTextResource(attr.get("resource"));
+            } else {
+                children = new ArrayList<>();
+                nodeListConsumer(matcherNode.getChildNodes(), x -> {
+                    if (x.getNodeType() == Node.ELEMENT_NODE) {
+                        children.add(parseMatcher(x));
+                    }
+                });
+            }
+            return type == MatcherType.any ? new OrMatcher(children) : new AndMatcher(children);
 
         case copyright:
-            Map<String, String> attr = attributes(matcherNode);
             return new CopyrightMatcher(attr.get("start"), attr.get("end"), attr.get("owner"));
 
         case spdx:
-            return SPDXMatcherFactory.INSTANCE.create(attributes(matcherNode).get("name"));
+            return SPDXMatcherFactory.INSTANCE.create(attr.get("name"));
+        case license_ref:
+            return new ILicenseProxy(attr.get("refid"));
+
+        case not:
+            children = new ArrayList<>();
+            nodeListConsumer(matcherNode.getChildNodes(), x -> {
+                if (x.getNodeType() == Node.ELEMENT_NODE) {
+                    children.add(parseMatcher(x));
+                }
+            });
+            if (children.size() != 1) {
+                throw new ConfigurationException("'Not' type matcher requires one and only one enclosed matcher");
+            }
+            return new NotMatcher(children.get(0));
         }
-        throw new IllegalStateException(String.format("%s is not a matcher type", matcherNode.getLocalName()));
+        throw new ConfigurationException(String.format("%s is not a matcher type", matcherNode.getNodeName()));
     }
 
     private ILicense parseLicense(Node licenseNode) {
@@ -175,23 +262,25 @@ private ILicense parseLicense(Node licenseNode) {
         IHeaderMatcher matcher[] = { null };
         StringBuilder notesBuilder = new StringBuilder();
         nodeListConsumer(licenseNode.getChildNodes(), x -> {
-            if (x.getLocalName().equals("notes")) {
-                notesBuilder.append(x.getTextContent()).append("\n");
-            } else {
-                matcher[0] = parseMatcher(x);
+            if (x.getNodeType() == Node.ELEMENT_NODE) {
+                if (x.getNodeName().equals("note")) {
+                    notesBuilder.append(x.getTextContent()).append("\n");
+                } else {
+                    matcher[0] = parseMatcher(x);
+                }
             }
         });
         ILicense derivedFrom = attributes.get("derived-from") == null ? null
                 : new ILicenseProxy(attributes.get("derived-from"));
-        String notes = notesBuilder.length() == 0 ? null : notesBuilder.toString();
+        String notes = StringUtils.defaultIfBlank(notesBuilder.toString().trim(), null);
         return new SimpleLicense(family, matcher[0], derivedFrom, notes);
     }
 
     @Override
     public SortedSet<ILicense> readLicenses() {
         if (licenses.size() == 0) {
-            nodeListConsumer(complete.getElementsByTagName("license"), x -> licenses.add(parseLicense(x)));
-            complete = null;
+            nodeListConsumer(document.getElementsByTagName("license"), x -> licenses.add(parseLicense(x)));
+            document = null;
         }
         return Collections.unmodifiableSortedSet(licenses);
     }
@@ -206,8 +295,9 @@ class ILicenseProxy implements ILicense {
 
         private void checkProxy() {
             if (wrapped == null) {
-                Optional<ILicense> lic = licenses.stream()
-                        .filter(l -> l.getLicenseFamily().getFamilyCategory().equals(proxyId)).findFirst();
+                ILicenseFamily testLic = new SimpleLicenseFamily(proxyId, "searching proxy");
+                Optional<ILicense> lic = licenses.stream().filter(l -> l.getLicenseFamily().compareTo(testLic) == 0)
+                        .findFirst();
                 if (!lic.isPresent()) {
                     throw new IllegalStateException(String.format("%s is not a valid family category", proxyId));
                 }
@@ -246,22 +336,14 @@ public void reset() {
         }
 
         @Override
-        public boolean matches(String line) throws RatHeaderAnalysisException {
+        public boolean matches(String line) {
             checkProxy();
             return wrapped.matches(line);
         }
 
         @Override
-        public void reportFamily(Consumer<ILicenseFamily> consumer) {
-            checkProxy();
-            wrapped.reportFamily(consumer);
+        public int compareTo(ILicense arg0) {
+            return ILicense.getComparator().compare(this, arg0);
         }
-
-        @Override
-        public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
-            checkProxy();
-            wrapped.extractMatcher(consumer, comparator);
-        }
-
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index d41d001ea..ff107e1b5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -1,9 +1,15 @@
 package org.apache.rat.license;
 
+import java.util.Comparator;
+
 import org.apache.rat.analysis.IHeaderMatcher;
 
-public interface ILicense extends IHeaderMatcher {
+public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
     ILicenseFamily getLicenseFamily();
     String getNotes();
     ILicense derivedFrom();
+    
+    static Comparator<ILicense> getComparator() {
+        return (x,y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily());
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index 032887734..e9a86a6d5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -1,10 +1,6 @@
 package org.apache.rat.license;
 
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 
 public class SimpleLicense implements ILicense {
 
@@ -20,6 +16,11 @@ public SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, ILicense der
         this.notes = notes;
     }
 
+    @Override
+    public String toString() {
+        return family.toString();
+    }
+
     public ILicenseFamily getFamily() {
         return family;
     }
@@ -51,23 +52,18 @@ public void reset() {
     }
 
     @Override
-    public boolean matches(String line) throws RatHeaderAnalysisException {
+    public boolean matches(String line) {
         return matcher.matches(line);
     }
 
     @Override
-    public void reportFamily(Consumer<ILicenseFamily> consumer) {
-        matcher.reportFamily(consumer);
-    }
-
-    @Override
-    public void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator) {
-        matcher.extractMatcher(consumer, comparator);
+    public ILicenseFamily getLicenseFamily() {
+        return family;
     }
 
     @Override
-    public ILicenseFamily getLicenseFamily() {
-        return family;
+    public int compareTo(ILicense other) {
+        return ILicense.getComparator().compare(this, other);
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
index bc6ca019a..bde1a1e67 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
@@ -34,6 +34,9 @@ public SimpleLicenseFamily(String familyId, String familyName) {
     public SimpleLicenseFamily() {
     }
 
+    public String toString() {
+        return String.format("%s %s",  getFamilyCategory(), getFamilyName());
+    }
     public final void setFamilyName(String familyName) {
         this.familyName = familyName;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
index ae3c23b6b..66c8888e3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
@@ -40,19 +40,19 @@
  */
 public class XmlReportFactory {
     public static final RatReport createStandardReport(IXmlWriter writer,
-            final ClaimStatistic pStatistic, ReportConfiguration pConfiguration) {
+            final ClaimStatistic statistic, ReportConfiguration configuration) {
         final List<RatReport> reporters = new ArrayList<>();
-        if (pStatistic != null) {
-            reporters.add(new ClaimAggregator(pStatistic));
+        if (statistic != null) {
+            reporters.add(new ClaimAggregator(statistic));
         }
-        if (pConfiguration.isAddingLicenses()) {
-            reporters.add(new LicenseAddingReport(pConfiguration.getCopyrightMessage(), pConfiguration.isAddingLicensesForced()));
+        if (configuration.isAddingLicenses()) {
+            reporters.add(new LicenseAddingReport(configuration.getCopyrightMessage(), configuration.isAddingLicensesForced()));
         }
         reporters.add(new SimpleXmlClaimReporter(writer));
 
         final IDocumentAnalyser analyser =
-            DefaultAnalyserFactory.createDefaultAnalyser(pConfiguration.getHeaderMatcher());
-        final DefaultPolicy policy = new DefaultPolicy(pConfiguration.getApprovedLicenseNames(), pConfiguration.isApproveDefaultLicenses());
+            DefaultAnalyserFactory.createDefaultAnalyser(configuration.getLicense());
+        final DefaultPolicy policy = new DefaultPolicy(configuration.getApprovedLicenseNames(), configuration.isApproveDefaultLicenses());
 
         final IDocumentAnalyser[] analysers = {analyser, policy};
         DocumentAnalyserMultiplexer analysisMultiplexer = new DocumentAnalyserMultiplexer(analysers);
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index 258541349..cc953a3a9 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -1,38 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rat-config>
 	<licenses>
-<!--
+		<!--
 	<license id=id name=name>
-		<notes></notes>
+		<note></note>
 	    <text>  </text>
 		<copyright start='' end='' owner=''/>
 		<spdx name=''/> 
 		<and> <license>...</and>
 		<or> <license>...</or> 
+		<license_ref refid='licenceid' />
 	</license>
 -->
 
 		<license id="AL" name="Apache License Version 2.0">
-			<any>
-				<text>Licensed under the Apache License, Version 2.0 (the
-					"License")</text>
-				<text>Licensed to the Apache Software Foundation (ASF) under one
-					or more contributor license agreements; and to You under the
-					Apache License, Version 2.0.</text>
-				<text>http://www.apache.org/licenses/LICENSE-2.0</text>
-				<text>https://www.apache.org/licenses/LICENSE-2.0</text>
-				<text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
-				<text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
-				<text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
-				<text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
-				<spdx name='Apache-2.0' />
-			</any>
+			<all>
+				<any>
+					<text>Licensed under the Apache License, Version 2.0 (the
+						"License")</text>
+					<text>Licensed to the Apache Software Foundation (ASF) under
+						one
+						or more contributor license agreements; and to You under
+						the
+						Apache License, Version 2.0.</text>
+					<text>http://www.apache.org/licenses/LICENSE-2.0</text>
+					<text>https://www.apache.org/licenses/LICENSE-2.0</text>
+					<text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
+					<text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
+					<text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
+					<text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
+					<spdx name='Apache-2.0' />
+				</any>
+				<not>
+					<copyright />
+				</not>
+			</all>
 		</license>
 
 		<license id="ASL" name="Applied Apahce License Version 2.0">
 			<all>
-				<license-ref refid="AL" />
-				<copyright start="" end="" owner="" />
+				<any>
+					<text>Licensed under the Apache License, Version 2.0 (the
+						"License")</text>
+					<text>Licensed to the Apache Software Foundation (ASF) under
+						one
+						or more contributor license agreements; and to You under
+						the
+						Apache License, Version 2.0.</text>
+					<text>http://www.apache.org/licenses/LICENSE-2.0</text>
+					<text>https://www.apache.org/licenses/LICENSE-2.0</text>
+					<text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
+					<text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
+					<text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
+					<text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
+					<spdx name='Apache-2.0' />
+				</any>
+				<copyright />
 			</all>
 		</license>
 
@@ -40,32 +63,21 @@
 			name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
 			<any>
 				<text>The contents of this file are subject to the terms of the
-					Common Development\nand Distribution License("CDDL") (the
-					"License"). You may not use this file\nexcept in compliance
-					with the License.</text>
-				<spdx name='CDDL-1.0' />
-			</any>
-		</license>
-
-		<license id="CDDL1"
-			name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
-			<any>
-				<text>The contents of this file are subject to the terms of the
-					Common Development\nand Distribution License("CDDL") (the
-					"License"). You may not use this file\nexcept in compliance
+					Common Development and Distribution License("CDDL") (the
+					"License"). You may not use this file except in compliance
 					with the License.</text>
 				<spdx name='CDDL-1.0' />
 			</any>
 		</license>
 
-		<license id="ILUMOS" name="ILLUMOS CDDL1 Derived license"
+		<license id="ILLUMOS" name="ILLUMOS CDDL1 Derived license"
 			derived-from='CDDL1'>
-			<note>modified CDDL1 license</note>
+			<note>Modified CDDL1 license</note>
 			<any>
 				<text>The contents of this file are subject to the terms of
-					the\nCommon Development and Distribution License (the
-					"License")\nYou may not use this file except in compliance
-					with the License.\n</text>
+					the Common Development and Distribution License (the
+					"License") You may not use this file except in compliance
+					with the License. </text>
 			</any>
 		</license>
 
@@ -73,17 +85,19 @@
 			<text>http://dojotoolkit.org/community/licensing.shtml</text>
 		</license>
 
-		<license id="GEN" name="Generated files">
-			<text file="generation-keywords" />
+		<license id="GEN" name="Generated Files">
+			<note>
+				Files that are autmoatically generated.</note>
+			<any resource="/org/apache/rat/generation-keywords.txt" />
 		</license>
 
 		<license id="GPL1" name="GNU General Public License, version 1">
 			<any>
-				<text>This program is free software; you can
-					redistribute it and/or modify\n it under the terms of the
-					GNU
-					General Public License as published by\n the Free Software
-					Foundation; either version 1, or (at your option)\n any
+				<text>This program is free software; you can redistribute it
+					and/or modify
+					it under the terms of the GNU
+					General Public License as published by the Free Software
+					Foundation; either version 1, or (at your option) any
 					later
 					version.</text>
 
@@ -94,10 +108,10 @@
 		<license id="GPL2" name="GNU General Public License, version 2">
 			<any>
 				<text>This program is free software; you can
-					redistribute it and/or\n modify it under the terms of the
+					redistribute it and/or modify it under the terms of the
 					GNU
-					General Public License\n as published by the Free Software
-					Foundation; either version 2\n of the License, or (at your
+					General Public License as published by the Free Software
+					Foundation; either version 2 of the License, or (at your
 					option) any later version.</text>
 				<spdx
 					name='GPL-2.0-only' />
@@ -107,10 +121,10 @@
 		<license id="GPL3" name="GNU General Public License, version 3">
 			<any>
 				<text>This program is free software: you can
-					redistribute it and/or modify\n it under the terms of the
+					redistribute it and/or modify it under the terms of the
 					GNU
-					General Public License as published by\n the Free Software
-					Foundation, either version 3 of the License, or\n (at your
+					General Public License as published by the Free Software
+					Foundation, either version 3 of the License, or (at your
 					option) any later version.</text>
 				<spdx
 					name='GPL-3.0-only' />
@@ -149,7 +163,7 @@
 		</license>
 
 		<license id="OASIS" name="OASIS Open License">
-			<notes>No modifications allowed</notes>
+			<note>No modifications allowed</note>
 			<all>
 				<text>This document and translations of it may be
 					copied and furnished to others and derivative works that
@@ -158,7 +172,7 @@
 					may
 					be prepared copied published and distributed</text>
 				<copyright
-					owner="OASIS Open" />
+					owner="OASIS Open" start="[0-9]{4}" />
 			</all>
 		</license>
 
@@ -166,17 +180,16 @@
 			derived-from="BSD">
 			<any>
 				<text>TMF854 Version 1.0</text>
-				<copyrigth
+				<copyright
 					owner="TeleManagement Forum" />
 			</any>
 		</license>
 
-
 		<license id="W3C" name="W3C Software Copyright">
-			<notes>
-				Note that W3C requires a NOTICE. All modifications require
-				notes. See
-				http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.</notes>
+			<note>Note that W3C requires a NOTICE.</note>
+			<note>All modifications require notes.</note>
+			<note>
+				See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.</note>
 			<any>
 				<text>
 					http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</text>
@@ -186,42 +199,12 @@
 		</license>
 
 		<license id="W3CD" name="W3C Document Copyright">
-			<notes>
-				Note that W3CD does not allow modifications. See
-				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.</notes>
+			<note>
+				Note that W3CD does not allow modifications.</note>
+			<note>
+				See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.</note>
 			<text>
 				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</text>
 		</license>
-
-		<license id="GEN" name="Generated Code">
-			<notes>
-				Code files that are autmoatically generated.</notes>
-			<text>
-				generated by Cayenne</text>
-			<text>Generated By:JJTree</text>
-			<text>Generated By:JavaCC</text>
-			<text>THIS FILE IS AUTOMATICALLY GENERATED</text>
-			<text>NOTE: this file is autogenerated by XBeans</text>
-			<text>This file was automatically generated by</text>
-			<text># WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!</text>
-			<text># Microsoft Developer Studio Generated NMAKE File</text>
-			<text># Microsoft Developer Studio Generated Build File</text>
-			<text>Generated from configure.ac by autoheader</text>
-			<text>generated automatically by aclocal</text>
-			<text>build.xml generated by maven from project.xml</text>
-			<text>This file was generated by</text>
-			<text>This file has been automatically generated.</text>
-			<text>Automatically generated - do not modify!</text>
-			<text>Javadoc style sheet</text>
-			<text>SOURCE FILE GENERATATED</text>
-			<text>Generated by the Batik</text>
-			<text>this file is autogenerated</text>
-			<text>This class was autogenerated</text>
-			<text>Generated by Maven</text>
-			<text>Autogenerated by Thrift</text>
-			<text>DO NOT EDIT THIS FILE - it is machine generated</text>
-			<text>This class was generated by</text>
-			<text>Generated by javadoc</text>
-		</license>
 	</licenses>
 </rat-config>
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index 9636cd11e..09e9f716f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -22,56 +22,26 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
+import java.util.TreeSet;
 
-import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.license.ILicense;
 import org.junit.Test;
 
 public class DefaultsTest {
-    private static String[] FAMILIES = { "GEN  ", "?????", "AL   ", "OASIS", "W3CD ", "W3C  ", "GPL1 ", "GPL2 ",
-            "GPL3 ", "MIT  ", "CDDL1", "BSD_m" };
+    private static final String[] FAMILIES = { "GEN  ", "ASL  ", "AL   ", "DOJO ", "OASIS", "W3CD ", "W3C  ", "GPL1 ",
+            "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "ILLUM", "TMF  " };
 
     @Test
     public void defaultConfigTest() {
         Defaults.builder().build();
 
-        Collection<ILicense> licenses = Defaults.getLicenses();
+        Set<ILicense> licenses = Defaults.getLicenses();
 
-        Set<String> names = new HashSet<>();
-        licenses.forEach(x -> x.reportFamily(y -> names.add(y.getFamilyCategory())));
-        assertEquals(FAMILIES.length - 1, names.size());
+        Set<String> names = new TreeSet<>();
+        licenses.forEach(x -> names.add(x.getLicenseFamily().getFamilyCategory()));
+        assertEquals(FAMILIES.length, names.size());
         names.removeAll(Arrays.asList(FAMILIES));
         assertTrue(names.isEmpty());
-
-
-        assertEquals(15, licenses.size());
-        Map<String, Integer> result = new TreeMap<>();
-        licenses.forEach(x -> {
-            x.reportFamily(y -> {
-                String cat = y.getFamilyCategory();
-                Integer i = result.get(cat);
-                if (i == null) {
-                    result.put(cat, 1);
-                } else {
-                    result.put(cat, 1 + i.intValue());
-                }
-            });
-        });
-        assertEquals(4, result.get("AL   ").intValue());
-        assertEquals(2, result.get("BSD_m").intValue());
-        assertEquals(3, result.get("CDDL1").intValue());
-        assertEquals(2, result.get("GEN  ").intValue());
-        assertEquals(2, result.get("GPL1 ").intValue());
-        assertEquals(2, result.get("GPL2 ").intValue());
-        assertEquals(2, result.get("GPL3 ").intValue());
-        assertEquals(2, result.get("MIT  ").intValue());
-        assertEquals(2, result.get("OASIS").intValue());
-        assertEquals(2, result.get("W3C  ").intValue());
-        assertEquals(1, result.get("W3CD ").intValue());
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 71e78eba1..e3a718b55 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -29,7 +29,6 @@
 import java.util.Arrays;
 
 import org.apache.rat.Defaults.LicenseCollectionMatcher;
-import org.apache.rat.analysis.matchers.OrMatcher;
 import org.apache.rat.test.utils.Resources;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Test;
@@ -120,7 +119,7 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setApproveDefaultLicenses(true);
-        configuration.addHeaderMatcher(licenseMatcher);
+        configuration.addLicense(licenseMatcher);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
         configuration.setOut(out);
         Reporter.report(configuration);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index 2f1ae54a9..213320bc2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -39,12 +39,7 @@ public class AnalyserFactoryTest {
     private static ILicense MATCHES_NOTHING_MATCHER = mock(ILicense.class);
 
     static {
-        try {
             when(MATCHES_NOTHING_MATCHER.matches(any())).thenReturn(false);
-        } catch (RatHeaderAnalysisException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
     }
 
     private StringWriter out;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
new file mode 100644
index 000000000..873d1aaeb
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.license;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.Defaults;
+import org.apache.rat.analysis.matchers.FullTextMatcher;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Test to see if short form license information will be recognized correctly.
+ *
+ */
+abstract public class AbstractLicenseTest {
+    private static int NAME = 0;
+    private static int TEXT = 1;
+    protected MetaData data;
+
+    private final String category;
+    private final String name;
+    private final String notes;
+    private final String[][] targets;
+
+    @BeforeClass
+    public static void init() {
+        Defaults.builder().build();
+    }
+
+    @AfterClass
+    public static void shutdown() {
+        Defaults.clear();
+    }
+
+    protected AbstractLicenseTest(String cat, String name, String notes, String[][] targets) {
+        this.category = ILicenseFamily.makeCategory(cat);
+        this.name = name;
+        this.notes = notes;
+        this.targets = targets;
+    }
+
+    @Before
+    public void setup() {
+        data = new MetaData();
+    }
+
+    protected static ILicense extractCategory(String category) {
+        ILicenseFamily testingFamily = new SimpleLicenseFamily(category, "Testing category");
+        List<ILicense> matchers = new ArrayList<>();
+        Defaults.getLicenses().stream().filter(x -> x.getLicenseFamily().compareTo(testingFamily) == 0)
+                .forEach(matchers::add);
+        if (matchers.isEmpty()) {
+            fail("No machers for category: " + category);
+        }
+        if (matchers.size() > 1) {
+            fail("Too many matchers for category: " + category);
+        }
+        return matchers.get(0);
+    }
+
+    @Test
+    public void testMatchProcessing() throws IOException {
+        ILicense license = extractCategory(category);
+        try {
+            for (String[] target : targets) {
+                if (processText(license, target[TEXT])) {
+                    data.reportOnLicense(license);
+                    assertNotNull("No URL HEADER CATEGORY", data.get(MetaData.RAT_URL_HEADER_CATEGORY));
+                    assertEquals(license.toString(), category, data.get(MetaData.RAT_URL_HEADER_CATEGORY).getValue());
+                    assertNotNull("No URL LICENSE FAMILY CATEGORY", data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY));
+                    assertEquals(license.toString(), category,
+                            data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue());
+                    if (StringUtils.isNotBlank(notes)) {
+                        assertNotNull("No URL HEADER SAMPLE", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
+                        assertEquals(license.toString(), FullTextMatcher.prune(notes),
+                                FullTextMatcher.prune(data.get(MetaData.RAT_URL_HEADER_SAMPLE).getValue()));
+                    } else {
+                        assertNull("URL HEADER SAMPLE was not null", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
+                    }
+                    assertNotNull("No URL LICENSE FAMILY NAME", data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
+                    assertEquals(license.toString(), name, data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue());
+                    data.clear();
+                } else {
+                    fail(license + " was not matched by " + target[NAME]);
+                }
+                license.reset();
+            }
+        } finally {
+            license.reset();
+        }
+
+    }
+
+    private boolean processText(ILicense license, String text) throws IOException {
+        try (BufferedReader in = new BufferedReader(new StringReader(text))) {
+            String line;
+            while (null != (line = in.readLine())) {
+                if (license.matches(line)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    @Test
+    public void testEmbeddedStrings() throws IOException {
+        String formats[] = { "%s", "now is not the time %s for copyright", "#%s", "##%s", "## %s", "##%s##", "## %s ##",
+                "/*%s*/", "/* %s */" };
+
+        ILicense license = extractCategory(category);
+        try {
+            for (String[] target : targets) {
+                for (String fmt : formats) {
+                    boolean found = processText(license, String.format(fmt, target[TEXT]));
+                    license.reset();
+                    assertTrue(String.format("%s %s did not match pattern '%s' for target string %s", category, name,
+                            fmt, target[NAME]), found);
+                }
+            }
+        } finally {
+            license.reset();
+        }
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
deleted file mode 100644
index a7f5e5c74..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractMatcherTest.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import org.apache.rat.Defaults;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.license.SimpleLicenseFamily;
-import org.apache.rat.license.ILicenseFamily;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test to see if short form license information will be recognized correctly.
- *
- */
-abstract public class AbstractMatcherTest {
-    private static int NAME=0;
-    private static int NOTES=1;
-    private static int TEXT=2;
-	protected MetaData data;
-	protected static Collection<IHeaderMatcher> instrumented;
-	private final String category;
-	private final String name;
-	private final String[][]targets;
-    
-    @BeforeClass
-    public static void init() {
-        Defaults.builder().build();
-        instrumented = Defaults.getLicenses().stream().map( Instrumentation::wrap ).collect(Collectors.toList());
-    }
-    
-    @AfterClass
-    public static void shutdown() {
-        Defaults.clear();
-        instrumented = null;
-    }
-    
-    protected AbstractMatcherTest(String cat, String name, String[][]targets) {
-        this.category = ILicenseFamily.makeCategory(cat);
-        this.name = name;
-        this.targets = targets;
-    }
-    
-	@Before
-	public void setup() {
-	    data = new MetaData();
-	}
-	
-	protected static Collection<IHeaderMatcher> extractCategory(String category) {
-	    String cat = ILicenseFamily.makeCategory(category);
-	    List<IHeaderMatcher> matchers = new ArrayList<>();
-	    instrumented.forEach( x -> x.extractMatcher(matchers::add, 
-                target -> target.getFamilyCategory().equals(cat)));
-	    if (matchers.isEmpty()) {
-	        fail("No machers for category: "+category);
-	    }
-	    return matchers;
-	}
-	
-	@Test
-	public void testMatchProcessing() throws RatHeaderAnalysisException, IOException {
-        Collection<IHeaderMatcher> matchers = extractCategory(category);
-        for (IHeaderMatcher matcher : matchers) {
-            for (String[] target : targets) {
-                if (processText(matcher, target[TEXT])) {
-                    assertEquals(matcher.toString(), category, data.get(MetaData.RAT_URL_HEADER_CATEGORY).getValue());
-                    assertEquals(matcher.toString(), category, data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue());
-                    assertEquals(matcher.toString(), target[NOTES], data.get(MetaData.RAT_URL_HEADER_SAMPLE).getValue());
-                    assertEquals(matcher.toString(), name, data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue());
-                    data.clear();
-                }
-                matcher.reset();
-            }
-        }
-        List<String> notMatched = new ArrayList<>();
-        List<String> notReset = new ArrayList<>();
-        for (IHeaderMatcher matcher : matchers) {
-            if (!(matcher instanceof Instrumentation))
-            {
-                fail( "Matcher was not instrumented: "+matcher);
-            } else {
-                Instrumentation instrumented = (Instrumentation) matcher;
-                if (!instrumented.wasMatched())
-                {
-                    notMatched.add( instrumented.toString() );
-                }
-                if (!instrumented.wasReset()) {
-                    notReset.add( instrumented.toString() );
-                }
-            }
-        }
-        if (!(notMatched.isEmpty() && notReset.isEmpty())) {
-            StringBuilder failMsg = new StringBuilder();
-            if (! notMatched.isEmpty()) {
-                failMsg.append("The following matchers were not matched:\n");
-                notMatched.forEach( t -> failMsg.append("\t").append(t).append("\n"));
-                failMsg.append("\n");
-            }
-            if (! notReset.isEmpty()) {
-                failMsg.append("The following matchers were not reset:\n");
-                notReset.forEach( t -> failMsg.append("\t").append(t).append("\n"));
-                failMsg.append("\n");
-            }
-            fail(failMsg.toString());
-        }
-	}
-	
-	private boolean processText(IHeaderMatcher matcher, String text) throws IOException, RatHeaderAnalysisException {
-	    BufferedReader in = new BufferedReader(new StringReader(text));
-        String line = in.readLine();
-        boolean found = false;
-        while (line != null) {
-            found |= matcher.matches(line);
-            line = in.readLine();
-        }
-        return found;
-	}
-	@Test
-	public void testEmbeddedStrings() throws RatHeaderAnalysisException, IOException {
-	    String formats[] = { "%s", "now is not the time %s for copyright",
-	        "#%s", "##%s", "## %s", "##%s##", "## %s ##", "/*%s*/","/* %s */"};
-
-        Collection<IHeaderMatcher> matchers = extractCategory(category);
-        for (String[] target : targets) {
-            for (String fmt : formats) {
-                boolean found = false;
-                for (IHeaderMatcher matcher : matchers) {
-                    found |= processText(matcher, String.format(fmt, target[TEXT]));
-                    matcher.reset();
-                }
-                assertTrue( String.format( "%s %s did not match pattern '%s' for target string %s", category, name, fmt, target[NAME]), found);
-            }
-        }
-	}
-	
-	@Test
-	public void testReportFamily() {
-	    Collection<IHeaderMatcher> matchers = extractCategory(category);
-	    ILicenseFamily lst[] = { null }; 
-	    for (IHeaderMatcher matcher : matchers) {
-	        matcher.reportFamily(x -> lst[0] = x);
-	        assertEquals( "Error with "+matcher.getId(), category, lst[0].getFamilyCategory());
-	        assertEquals( "Error with "+matcher.getId(), name, lst[0].getFamilyName());
-	    }
-	}
-	
-	//void extractMatcher(Consumer<IHeaderMatcher> consumer, Predicate<ILicenseFamily> comparator);
-	@Test
-    public void testExtractMatcher() {
-	    
-        Collection<IHeaderMatcher> matchers = extractCategory(category);
-        Collection<IHeaderMatcher> found = new ArrayList<>();
-        for (IHeaderMatcher matcher : matchers) {
-            matcher.extractMatcher( found::add,  target -> target.getFamilyCategory().equals(category));
-        }
-        assertEquals( matchers.size(), found.size());
-        
-        found.clear();
-        for (IHeaderMatcher matcher : matchers) {
-            matcher.extractMatcher( found::add,  target -> target.getFamilyCategory().equals("not a valid category"));
-        }
-        assertEquals( 0, found.size());
-    }
-	
-	public static class Instrumentation implements IHeaderMatcher {
-        private IHeaderMatcher wrapped;
-        private int resetCount = 0;
-        private int matchCount = 0;
-        private int matchCalled = 0;
-        
-	    public int getMatchCalled() {
-            return matchCalled;
-        }
-
-        public IHeaderMatcher getWrapped() {
-	        return wrapped;
-	    }
-
-	    @Override
-	    public String toString() {
-	        return getId();
-	    }
-	    
-	    @Override
-	    public String getId() {
-	        return String.format("[Instrumented] %s", wrapped.getId());
-	    }
-
-	    public boolean wasReset() {
-	        return resetCount > 0;
-	    }
-
-	    public boolean wasMatched() {
-	        return matchCount > 0;
-	    }
-
-	    public void setWrapped(IHeaderMatcher wrapped) {
-	        this.wrapped = wrapped;
-	    }
-
-	    public int getResetCount() {
-	        return resetCount;
-	    }
-
-	    public void setResetCount(int resetCount) {
-	        this.resetCount = resetCount;
-	    }
-
-	    public int getMatchCount() {
-	        return matchCount;
-	    }
-
-	    public void setMatchCount(int matchCount) {
-	        this.matchCount = matchCount;
-	    }
-
-	    static Instrumentation wrap(IHeaderMatcher target) {
-	        if (target instanceof Instrumentation) {
-	            return (Instrumentation) target;
-	        }
-	        return new Instrumentation(target);
-	    }
-
-	    private Instrumentation(IHeaderMatcher target) {
-	        this.wrapped = target;
-	    }
-
-	    @Override
-	    public void reset() {
-	        resetCount++;
-	        wrapped.reset();
-	    }
-
-	    @Override
-	    public boolean matches(String line) throws RatHeaderAnalysisException {
-	        matchCalled++;
-	        if (wrapped.matches(line)) {
-	            matchCount++;
-	            return true;
-	        }
-	        return false;
-	    }
-
-	    @Override
-	    public void reportFamily(Consumer<ILicenseFamily> consumer) {
-	        wrapped.reportFamily(consumer);
-	    }
-
-	    @Override
-	    public void extractMatcher(Consumer<IHeaderMatcher> matchers, Predicate<ILicenseFamily> comparator) {
-	        Collection<IHeaderMatcher> captured = new ArrayList<>();
-	        wrapped.extractMatcher(captured::add, comparator);
-	        captured.stream().map(Instrumentation::wrap).forEach(matchers::accept);
-	    }
-
-	}
-
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
index e77bb188d..c2938e141 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
@@ -18,28 +18,25 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.junit.Test;
-import org.apache.rat.analysis.IHeaderMatcher;
-
 /**
  * Apache Software License detection tests.
  *
  */
-public class ApacheSoftwareLicenseTest extends AbstractMatcherTest {
+public class ApacheSoftwareLicenseTest extends AbstractLicenseTest {
 
     private static String category = "AL";
     private static String name = "Apache License Version 2.0";
     private static String[][] targets = {
-            { "short", "", "Licensed under the Apache License, Version 2.0 (the \"License\")" },
-            { "short2", "",
+            { "short", "Licensed under the Apache License, Version 2.0 (the \"License\")" },
+            { "short2",
                     "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0." },
-            { "http", "", "http://www.apache.org/licenses/LICENSE-2.0" },
-            { "https", "", "https://www.apache.org/licenses/LICENSE-2.0" },
-            { "html", "", "http://www.apache.org/licenses/LICENSE-2.0.html" },
-            { "htmls", "", "https://www.apache.org/licenses/LICENSE-2.0.html" },
-            { "txt", "", "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-            { "txts", "", "https://www.apache.org/licenses/LICENSE-2.0.txt" },
-            { "fullTxt", "",
+            { "http", "http://www.apache.org/licenses/LICENSE-2.0" },
+            { "https", "https://www.apache.org/licenses/LICENSE-2.0" },
+            { "html", "http://www.apache.org/licenses/LICENSE-2.0.html" },
+            { "htmls", "https://www.apache.org/licenses/LICENSE-2.0.html" },
+            { "txt", "http://www.apache.org/licenses/LICENSE-2.0.txt" },
+            { "txts", "https://www.apache.org/licenses/LICENSE-2.0.txt" },
+            { "fullTxt",
                     "Licensed under the Apache License, Version 2.0 (the \"License\")\nyou may not use this file except "
                             + "in compliance with the License.\nYou may obtain a copy of the License at\n"
                             + "http://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable "
@@ -47,30 +44,26 @@ public class ApacheSoftwareLicenseTest extends AbstractMatcherTest {
                             + "distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either "
                             + "express or implied.\nSee the License for the specific language governing permissions and\n"
                             + "limitations under the License.\n" },
-            { "spdx-tab", "", "SPDX-License-Identifier:\tApache-2.0" },
-            { "spdx-space", "", "SPDX-License-Identifier: Apache-2.0" },
-            { "long text", "", "/*\n"
-                    + " *  Copyright 2012-2013 FooBar.\n"
-                    + " *\n"
-                    + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
-                    + " *  you may not use this file except in compliance with the License.\n"
-                    + " *\n"
-                    + " *  You may obtain a copy of the License at\n"
-                    + " *       http://www.apache.org/licenses/LICENSE-2.0\n"
-                    + " *\n"
-                    + " *  Unless required by applicable law or agreed to in writing, software\n"
-                    + " *  distributed under the License is distributed on an \"AS IS\" BASIS,\n"
-                    + " *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
-                    + " *  See the License for the specific language governing permissions and\n"
-                    + " *  limitations under the License.\n"
-                    + " */\n"}
-    
+            { "spdx-tab", "SPDX-License-Identifier:\tApache-2.0" },
+            { "spdx-space", "SPDX-License-Identifier: Apache-2.0" },
+            { "long text",
+                    "/*\n" + " *  Copyright 2012-2013 FooBar.\n" + " *\n"
+                            + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
+                            + " *  you may not use this file except in compliance with the License.\n" + " *\n"
+                            + " *  You may obtain a copy of the License at\n"
+                            + " *       http://www.apache.org/licenses/LICENSE-2.0\n" + " *\n"
+                            + " *  Unless required by applicable law or agreed to in writing, software\n"
+                            + " *  distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+                            + " *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+                            + " *  See the License for the specific language governing permissions and\n"
+                            + " *  limitations under the License.\n" + " */\n" }
+
     };
 
     public ApacheSoftwareLicenseTest() {
-        super(category, name, targets);
+        super(category, name, null, targets);
     }
-    
+
 //
 //    @Test(timeout = 2000) // may need to be adjusted if many more files are added
 //    public void goodFiles() throws Exception {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
deleted file mode 100644
index 2b93e8963..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.apache.rat.test.utils.Resources;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class AppliedApacheSoftwareLicense20Test {
-
-    private static final String HEADER
-            = "/*\n"
-            + " *  Copyright 2012-2013 FooBar.\n"
-            + " *\n"
-            + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
-            + " *  you may not use this file except in compliance with the License.\n"
-            + " *\n"
-            + " *  You may obtain a copy of the License at\n"
-            + " *       http://www.apache.org/licenses/LICENSE-2.0\n"
-            + " *\n"
-            + " *  Unless required by applicable law or agreed to in writing, software\n"
-            + " *  distributed under the License is distributed on an \"AS IS\" BASIS,\n"
-            + " *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
-            + " *  See the License for the specific language governing permissions and\n"
-            + " *  limitations under the License.\n"
-            + " */\n";
-/*
-    private AppliedApacheSoftwareLicense20 license;
-
-    private MockClaimReporter reporter;
-
-    @Before
-    public void setUp() throws Exception {
-        license = new AppliedApacheSoftwareLicense20("FooBar");
-        reporter = new MockClaimReporter();
-    }
-
-    @Test
-    public void match() throws Exception {
-        BufferedReader in = new BufferedReader(new StringReader(HEADER));
-        String line = in.readLine();
-        boolean result = false;
-        final Document subject = new MockLocation("subject");
-        while (line != null) {
-            result = license.match(subject, line);
-            line = in.readLine();
-        }
-        assertTrue("Applied AL2.0 license should be matched", result);
-        license.reset();
-        result = license.match(subject, "New line");
-        assertFalse("After reset, content should build up again", result);
-    }
-
-    @Test
-    public void noMatch() throws Exception {
-        BufferedReader in = null;
-        try {
-            in = Resources.getBufferedResourceReader("elements/Source.java");
-            String line = in.readLine();
-            boolean result = false;
-            final Document subject = new MockLocation("subject");
-            while (line != null) {
-                result = license.match(subject, line);
-                line = in.readLine();
-            }
-            assertFalse("Applied AL2.0 license should not be matched", result);
-            license.reset();
-        } finally {
-            IOUtils.closeQuietly(in);
-        }
-    }
-
-    @Test(timeout = 2000) // may need to be adjusted if many more files are added
-    public void goodFiles() throws Exception {
-        DirectoryScanner.testFilesInDir("appliedAL20/good", license, true);
-    }
-
-    @Test(timeout = 2000) // may need to be adjusted if many more files are added
-    public void baddFiles() throws Exception {
-        DirectoryScanner.testFilesInDir("appliedAL20/bad", license, false);
-    }
-*/
-    @Test
-    public void dummy() {
-        fail( "Unimplemented test class");
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
new file mode 100644
index 000000000..b87862878
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.license;
+
+public class AppliedApacheSoftwareLicenseTest extends AbstractLicenseTest {
+
+    private static String CATEGORY = "ASL";
+    private static String NAME = "Applied Apahce License Version 2.0";
+    private static String[][] targets = { { "simple", "/*\n" + " *  Copyright 2012-2013 FooBar.\n" + " *\n"
+            + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
+            + " *  you may not use this file except in compliance with the License.\n" + " *\n"
+            + " *  You may obtain a copy of the License at\n" + " *       http://www.apache.org/licenses/LICENSE-2.0\n"
+            + " *\n" + " *  Unless required by applicable law or agreed to in writing, software\n"
+            + " *  distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+            + " *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+            + " *  See the License for the specific language governing permissions and\n"
+            + " *  limitations under the License.\n" + " */\n" } };
+
+    public AppliedApacheSoftwareLicenseTest() {
+        super(CATEGORY, NAME, null, targets);
+    }
+    /*
+      
+    
+    @Test(timeout = 2000) // may need to be adjusted if many more files are added
+    public void goodFiles() throws Exception {
+        DirectoryScanner.testFilesInDir("appliedAL20/good", license, true);
+    }
+    
+    @Test(timeout = 2000) // may need to be adjusted if many more files are added
+    public void baddFiles() throws Exception {
+        DirectoryScanner.testFilesInDir("appliedAL20/bad", license, false);
+    }
+    */
+
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
index 677c37769..9a5614599 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
@@ -18,45 +18,28 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class CDDL1LicenseTest extends AbstractMatcherTest {
+public class CDDL1LicenseTest extends AbstractLicenseTest {
     private static String category = "CDDL1";
     private static String name = "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
     private static String[][] targets = {
-            { "fullTxt", "", "The contents of this file are subject to the terms of the Common Development\n"
-                    + "and Distribution License(\"CDDL\") (the \"License\"). You may not use this file\n"
-                    + "except in compliance with the License.\n\n"},
-            { "longerTxt", "",
-                " DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.\n\n"
-                        + "Copyright 2011-2013 Tirasa. All rights reserved.\n\n"
-                        + "The contents of this file are subject to the terms of the Common Development\n"
-                        + "and Distribution License(\"CDDL\") (the \"License\"). You may not use this file\n"
-                        + "except in compliance with the License.\n\n"
-                        + "You can obtain a copy of the License at https://oss.oracle.com/licenses/CDDL\n"
-                        + "See the License for the specific language governing permissions and limitations\n"
-                        + "under the License." },
-            { "spdx-tab", "", "SPDX-License-Identifier:\tCDDL-1.0" },
-            { "spdx-space", "", "SPDX-License-Identifier: CDDL-1.0" },
-            { "illumos", "", "The contents of this file are subject to the terms of the\n"
-                    + "Common Development and Distribution License (the \"License\")\n"
-                    + "You may not use this file except in compliance with the License.\n"}
-    };
-    
+            { "fullTxt",
+                    "The contents of this file are subject to the terms of the Common Development "
+                            + "and Distribution License(\"CDDL\") (the \"License\"). You may not use this file "
+                            + "except in compliance with the License.  " },
+            { "longerTxt",
+                    " DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.  "
+                            + "Copyright 2011-2013 Tirasa. All rights reserved.  "
+                            + "The contents of this file are subject to the terms of the Common Development "
+                            + "and Distribution License(\"CDDL\") (the \"License\"). You may not use this file "
+                            + "except in compliance with the License.  "
+                            + "You can obtain a copy of the License at https://oss.oracle.com/licenses/CDDL "
+                            + "See the License for the specific language governing permissions and limitations "
+                            + "under the License." },
+            { "spdx-tab", "SPDX-License-Identifier:\tCDDL-1.0" },
+            { "spdx-space", "SPDX-License-Identifier: CDDL-1.0" } };
+
     public CDDL1LicenseTest() {
-        super(category, name, targets);
+        super(category, name, null, targets);
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrighLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrighLicenseTest.java
deleted file mode 100644
index 297f65ae9..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrighLicenseTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.license.SimpleLicenseFamily;
-import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class CopyrighLicenseTest {
-
-    private static final String[] MATCHING_HEADERS =
-            { "/*  Copyright 2012 FooBar.*/"
-            , "/*  copyright 2012 foobar.*/"
-            , "/*  Copyright 2012-2013 FooBar.*/" };
-    private static final String[] NON_MATCHING_HEADERS =
-            { "/*  Copyright*/"
-            , "/*  Copyright FooBar.*/"
-            , "/*  Copyright 2013*/"
-            , "/*  Copyright 123a*/"
-            , "/*  Copyright 123f oobar*/"
-            , "/*  Copyright 2013FooBar*/"
-            , "/*  Copyright 2012 2013 FooBar.*/" };
-
-    private CopyrightLicense header;
-    private MetaData metadata;
-
-    @Before
-    public void setUp() throws Exception {
-        ILicenseFamily family = new SimpleLicenseFamily("test", "Test family");
-        header = new CopyrightLicense(family,"",null, null, "FooBar");
-        metadata = new MetaData();
-    }
-
-    @Test
-    public void match() throws Exception {
-        for (String line : MATCHING_HEADERS) {
-            assertTrue("Copyright Header should be matched", header.matches(line));
-            header.reset();
-            assertFalse("After reset, content should build up again", header.matches("New line"));
-            header.reset();
-        }
-    }
-
-    @Test
-    public void noMatch() throws Exception {
-        for (String line : NON_MATCHING_HEADERS) {
-            assertFalse("Copyright Header shouldn't be matched", header.matches( line));
-            header.reset();
-            assertTrue("After reset, content should build up again", header.matches(MATCHING_HEADERS[0]));
-            header.reset();
-        }
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPL123LicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
similarity index 77%
rename from apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPL123LicenseTest.java
rename to apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
index 58b60a867..284e685c5 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPL123LicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
@@ -30,41 +30,41 @@
  * GPL1 to GPL3.
  */
 @RunWith(Parameterized.class)
-public class GPL123LicenseTest extends AbstractMatcherTest {
+public class GPLLicenseTest extends AbstractLicenseTest {
 
     private static Object[] GPL1 = { "GPL1", "GNU General Public License, version 1", new String[][] {
-            { "fulltext", "", "This program is free software; you can redistribute it and/or modify\n "
+            { "fulltext", "This program is free software; you can redistribute it and/or modify\n "
                     + "it under the terms of the GNU General Public License as published by\n "
                     + "the Free Software Foundation; either version 1, or (at your option)\n " + "any later version." },
-            { "spdx-tab", "", "SPDX-License-Identifier:\tGPL-1.0-only" },
-            { "spdx-space", "", "SPDX-License-Identifier: GPL-1.0-only" }, } };
+            { "spdx-tab", "SPDX-License-Identifier:\tGPL-1.0-only" },
+            { "spdx-space", "SPDX-License-Identifier: GPL-1.0-only" }, } };
 
     private static Object[] GPL2 = { "GPL2", "GNU General Public License, version 2",
             new String[][] {
-                    { "fulltext", "",
+                    { "fulltext",
                             "This program is free software; you can redistribute it and/or\n"
                                     + "modify it under the terms of the GNU General Public License\n"
                                     + "as published by the Free Software Foundation; either version 2\n"
                                     + "of the License, or (at your option) any later version." },
-                    { "spdx-tab", "", "SPDX-License-Identifier:\tGPL-2.0-only" },
-                    { "spdx-space", "", "SPDX-License-Identifier: GPL-2.0-only" }, } };
+                    { "spdx-tab", "SPDX-License-Identifier:\tGPL-2.0-only" },
+                    { "spdx-space", "SPDX-License-Identifier: GPL-2.0-only" }, } };
 
     private static Object[] GPL3 = { "GPL3", "GNU General Public License, version 3",
             new String[][] {
-                    { "fulltext", "",
+                    { "fulltext",
                             "This program is free software: you can redistribute it and/or modify\n"
                                     + "    it under the terms of the GNU General Public License as published by\n"
                                     + "    the Free Software Foundation, either version 3 of the License, or\n"
                                     + "    (at your option) any later version." },
-                    { "spdx-tab", "", "SPDX-License-Identifier:\tGPL-3.0-only" },
-                    { "spdx-space", "", "SPDX-License-Identifier: GPL-3.0-only" }, } };
+                    { "spdx-tab", "SPDX-License-Identifier:\tGPL-3.0-only" },
+                    { "spdx-space", "SPDX-License-Identifier: GPL-3.0-only" }, } };
 
     @Parameters
     public static Collection<Object[]> data() {
         return Arrays.asList(GPL1, GPL2, GPL3);
     }
 
-    public GPL123LicenseTest(String cat, String name, String[][] targets) {
-        super(cat, name, targets);
+    public GPLLicenseTest(String cat, String name, String[][] targets) {
+        super(cat, name, null, targets);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
new file mode 100644
index 000000000..0b772a7d7
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.license;
+
+public class GeneratedLicenseTest extends AbstractLicenseTest {
+    private static String category = "GEN";
+    private static String name = "Generated Files";
+    private static String notes = "Files that are autmoatically generated.";
+    private static String[][] targets = { { "Cayenne", "generated by Cayenne" }, { "JJTree", "Generated By:JJTree" },
+            { "JavaCC", "Generated By:JavaCC" }, { "AUTOMATIC", "THIS FILE IS AUTOMATICALLY GENERATED" },
+            { "XBeans", "NOTE: this file is autogenerated by XBeans" },
+            { "automatic", "This file was automatically generated by" },
+            { "do not edit", "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!" },
+            { "NMAKE", "# Microsoft Developer Studio Generated NMAKE File" },
+            { "MDS Build", "# Microsoft Developer Studio Generated Build File" },
+            { "autoheader", "Generated from configure.ac by autoheader" },
+            { "aclocal", "generated automatically by aclocal" },
+            { "maven project", "build.xml generated by maven from project.xml" },
+            { "generated", "This file was generated by" }, { "auto", "This file has been automatically generated." },
+            { "do not modify", "Automatically generated - do not modify!" }, { "javadoc style", "Javadoc style sheet" },
+            { "SOURCE", "SOURCE FILE GENERATATED" }, { "Batik", "Generated by the Batik" },
+            { "file autogenerated", "this file is autogenerated" },
+            { "class autogenerated", "This class was autogenerated" }, { "maven", "Generated by Maven" },
+            { "Thrift", "Autogenerated by Thrift" },
+            { "machine generated", "DO NOT EDIT THIS FILE - it is machine generated" },
+            { "generated by", "This class was generated by" }, { "javadoc", "Generated by javadoc" } };
+
+    public GeneratedLicenseTest() {
+        super(category, name, notes, targets);
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
similarity index 56%
rename from apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
rename to apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
index d94e3d41b..a821f185e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
@@ -16,34 +16,34 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */
-package org.apache.rat.analysis.generation;
+package org.apache.rat.analysis.license;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.regex.Pattern;
-
-import org.apache.rat.api.MetaData;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.api.Document;
+import org.apache.rat.document.MockLocation;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class GeneratedLicenseNotRequiredTest {
+import java.util.HashMap;
+import java.util.Map;
 
-    private GeneratedLicenseNotRequired license;
-    private MockClaimReporter reporter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-    @Before
-    public void setUp() throws Exception {
-        Pattern[] patterns = { Pattern.compile(".*Generated") };
-        license = new GeneratedLicenseNotRequired(patterns);
-        reporter = new MockClaimReporter();
+public class IllumosLicenseTest extends AbstractLicenseTest {
+    private static String category = "ILLUMOS";
+    private static String name = "ILLUMOS CDDL1 Derived license";
+    private static String note = "Modified CDDL1 license";
+    private static String[][] targets = {
+            { "illumos", "The contents of this file are subject to the terms of the "
+                    + "Common Development and Distribution License (the \"License\") "
+                    + "You may not use this file except in compliance with the License. "}
+    };
+    
+    public IllumosLicenseTest() {
+        super(category, name, note, targets);
     }
 
-    @Test
-    public void match() throws Exception {
-        MetaData metadata = new MetaData();
-        assertFalse("Does not match regex", license.match(metadata, "Not at all"));
-        assertTrue("Matches regex", license.match(metadata, "This is Generated"));
-    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
index b8617016b..f0b257226 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
@@ -31,17 +31,17 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class MITLicenseTest extends AbstractMatcherTest 
+public class MITLicenseTest extends AbstractLicenseTest 
 {
-    private static String category = "MIT";
+    private static String cat = "MIT";
     private static String name = "The MIT License";
     private static String[][] targets = {
-            { "fulltext", "", "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \\\"Software\\\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."},
-            { "spdx-tab", "", "SPDX-License-Identifier:\tMIT" },
-            { "spdx-space", "", "SPDX-License-Identifier: MIT" },
+            { "fulltext", "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \\\"Software\\\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."},
+            { "spdx-tab", "SPDX-License-Identifier:\tMIT" },
+            { "spdx-space", "SPDX-License-Identifier: MIT" },
     };
     
     public MITLicenseTest() {
-        super( category, name , targets);
+        super( cat, name , null, targets);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
index ee68b29ac..ded57e31a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
@@ -18,42 +18,29 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.apache.rat.test.utils.Resources;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class OASISLicenseTest extends AbstractMatcherTest {
+public class OASISLicenseTest extends AbstractLicenseTest {
 
     private static String category = "OASIS";
     private static String name = "OASIS Open License";
-    private static String[][] targets = {
-            { "fulltext", "No modifications allowed", "This document and translations of it may be copied and furnished to others and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared copied published and distributed"},
-            {"copyright", "No modifications allowed", ".*Copyright\\s.*OASIS Open.*"}
-    };
-    
-    
+    private static String notes = "No modifications allowed";
+    private static String[][] targets = { { "fulltext",
+            "This document and translations of it may be copied and furnished to "
+                    + "others and derivative works that comment on or otherwise explain it or assist "
+                    + "in its implementation may be prepared copied published and distributed"
+                    + "\\nCopyright OAISIS Open, 1999" }, };
+
     public OASISLicenseTest() {
-        super( category, name , targets);
+        super(category, name, notes, targets);
     }
-   /*
+    /*
     @Test(timeout = 2000) // may need to be adjusted if many more files are added
     public void goodFiles() throws Exception {
         DirectoryScanner.testFilesInDir("oasis/good", license, true);
     }
-
+    
     @Test(timeout = 2000) // may need to be adjusted if many more files are added
     public void baddFiles() throws Exception {
         DirectoryScanner.testFilesInDir("oasis/bad", license, false);
     }
-*/
+    */
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
index bf2a32d26..689361507 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
@@ -77,22 +77,4 @@ public void testReset() {
         verify(matcherOne, times(2)).reset();
         verify(matcherTwo, times(2)).reset();
     }
-
-    @Test
-    public void testReportFamily() {
-        Consumer<ILicenseFamily> consumer = mock(Consumer.class);
-        multiplexer.reportFamily(consumer);
-        verify(matcherOne, times(1)).reportFamily(eq(consumer));
-        verify(matcherTwo, times(1)).reportFamily(eq(consumer));
-    }
-
-    @Test
-    public void testExtractMatcher() {
-        Predicate<ILicenseFamily> comparator = mock(Predicate.class);
-        Consumer<IHeaderMatcher> consumer = mock(Consumer.class);
-
-        multiplexer.extractMatcher(consumer, comparator);
-        verify(matcherOne, times(1)).extractMatcher(eq(consumer), eq(comparator));
-        verify(matcherTwo, times(1)).extractMatcher(eq(consumer), eq(comparator));
-    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
index a24cb1839..0f4c51477 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
@@ -18,43 +18,35 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.api.Document;
+import java.util.Arrays;
+import java.util.Collection;
 
-import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
-import org.junit.Before;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-
 @RunWith(Parameterized.class)
-public class W3CLicenseTest extends AbstractMatcherTest {
+public class W3CLicenseTest extends AbstractLicenseTest {
 
-    private static String W3C_note = "Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.";
-    private static Object[] W3C = { "W3C", "W3C Software Copyright",
-            new String[][] {
-                    { "fulltext", W3C_note, "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231" },
-                    { "spdx-tab", W3C_note, "SPDX-License-Identifier:\tW3C" },
-                    { "spdx-space", W3C_note, "SPDX-License-Identifier: W3C" }, } };
+    private static String W3C_note = "Note that W3C requires a NOTICE.\n" + "All modifications require notes.\n"
+            + "See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.";
+    private static Object[] W3C = { "W3C", "W3C Software Copyright", W3C_note,
+            new String[][] { { "fulltext", "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231" },
+                    { "spdx-tab", "SPDX-License-Identifier:\tW3C" },
+                    { "spdx-space", "SPDX-License-Identifier: W3C" }, } };
 
-    private static String W3CD_note = "Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";
-    private static Object[] W3CD = { "W3CD", "W3C Document Copyright", new String[][] {
-            { "fulltext", W3CD_note, "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" }, } };
+    private static String W3CD_note = "Note that W3CD does not allow modifications.\n"
+            + "See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";
+    private static Object[] W3CD = { "W3CD", "W3C Document Copyright", W3CD_note, new String[][] {
+            { "fulltext", "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" }, } };
 
-    @Parameters
+    @Parameters(name = "{0}")
     public static Collection<Object[]> data() {
         return Arrays.asList(W3C, W3CD);
     }
 
-    public W3CLicenseTest(String cat, String name, String[][] targets) {
-        super(cat, name, targets);
+    public W3CLicenseTest(String cat, String name, String note, String[][] targets) {
+        super(cat, name, note, targets);
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
new file mode 100644
index 000000000..131a237b9
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.matchers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class CopyrightMatcherTest {
+    private final static int NAME = 0;
+    private final static int TEXT = 1;
+    // to be added
+    private static String[] prefix = { "Copyright", "©", "(C)", "(c)" };
+
+    private final static String[] D = { "-d", " 1990-1991" };
+    private final static String[] DO = { "-d-o", " 1990-1991 an owner" };
+    private final static String[] OD = { "-o-d", " an owner 1990-1991" };
+    private final static String[] DOS = { "-d-o-s", " 1990 - 1991 an owner" };
+    private final static String[] ODS = { "-o-d-s", " an owner 1990 - 1991" };
+    private final static String[] S = { "-s", " 1990" };
+    private final static String[] O = { "-o", " an owner" };
+    private final static String[] OS = { "-o-s", " an owner 1990" };
+    private final static String[] SO = { "-s-o", " 1990 an owner" };
+
+    private static final int TOTAL_TESTS = prefix.length * 9;
+
+    static Object[] startStopOwner = { "start-stop-owner", "1990", "1991", "an owner",
+            new String[][] { DO, OD, DOS, ODS }, new String[][] { D, S, O, OS, SO } };
+    static Object[] startOwner = { "start-owner", "1990", null, "an owner", new String[][] { OS, SO, OD, ODS },
+            new String[][] { D, DO, DOS, S, O } };
+    static Object[] start = { "start", "1990", null, null, new String[][] { D, DO, DOS, S, SO },
+            new String[][] { OD, ODS, O, OS } };
+    static Object[] owner = { "owner", null, null, "an owner", new String[][] { O, OD, ODS, OS },
+            new String[][] { DO, DOS, S, D, SO } };
+    static Object[] nada = { "nada", null, null, null, new String[][] { D, DO, DOS, S, SO },
+            new String[][] { OD, ODS, O, OS } };
+
+    private final CopyrightMatcher matcher;
+    private final String[][] pass;
+    private final String[][] fail;
+    private final String testName;
+
+    @Parameters(name = "{0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(expandResults(startStopOwner), expandResults(startOwner), expandResults(start),
+                expandResults(owner), expandResults(nada));
+    }
+
+    private static Object[] expandResults(Object[] source) {
+        Object[] result = new Object[6];
+        result[0] = source[0];
+        result[1] = source[1];
+        result[2] = source[2];
+        result[3] = source[3];
+
+        List<String[]> arry = new ArrayList<>();
+        for (String pfx : prefix) {
+            Arrays.stream((String[][]) source[4]).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
+                    .forEach(arry::add);
+        }
+        result[4] = arry.toArray(new String[arry.size()][2]);
+        arry.clear();
+
+        for (String pfx : prefix) {
+            Arrays.stream((String[][]) source[5]).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
+                    .forEach(arry::add);
+        }
+        result[5] = arry.toArray(new String[arry.size()][2]);
+        return result;
+    }
+
+    private static void verify(String testName, String[][] pass, String[][] fail) {
+        assertEquals("Wrong number of pass/fail tests", TOTAL_TESTS, pass.length + fail.length);
+        Set<String> passSet = new HashSet<String>();
+        Arrays.stream(pass).forEach(s -> passSet.add(s[0]));
+        Set<String> failSet = new HashSet<String>();
+        Arrays.stream(fail).forEach(s -> failSet.add(s[0]));
+        for (String s : passSet) {
+            assertFalse(String.format("%s is in both pass and fail sets for %s", s, testName), failSet.contains(s));
+        }
+    }
+
+    public CopyrightMatcherTest(String testName, String start, String stop, String owner, String[][] pass,
+            String[][] fail) {
+        verify(testName, pass, fail);
+        matcher = new CopyrightMatcher(start, stop, owner);
+        this.pass = pass;
+        this.fail = fail;
+        this.testName = testName;
+    }
+
+    @Test
+    public void testPass() {
+        for (String[] target : pass) {
+            String errMsg = String.format("%s:%s failed", testName, target[NAME]);
+            assertTrue(errMsg, matcher.matches(target[TEXT]));
+            matcher.reset();
+        }
+    }
+
+    @Test
+    public void testFail() {
+        for (String[] target : fail) {
+            String errMsg = String.format("%s:%s passed", testName, target[NAME]);
+            assertFalse(errMsg, matcher.matches(target[TEXT]));
+            matcher.reset();
+        }
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
new file mode 100644
index 000000000..9d7ff0293
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
@@ -0,0 +1,29 @@
+package org.apache.rat.analysis.matchers;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.junit.Test;
+
+public class NotMatcherTest {
+
+    @Test
+    public void testTrue() {
+        IHeaderMatcher enclosed = mock(IHeaderMatcher.class);
+        when(enclosed.matches(any())).thenReturn(true);
+        NotMatcher matcher = new NotMatcher(enclosed);
+        assertFalse( matcher.matches("dummy"));
+    }
+    
+    @Test
+    public void testFalse() {
+        IHeaderMatcher enclosed = mock(IHeaderMatcher.class);
+        when(enclosed.matches(any())).thenReturn(false);
+        NotMatcher matcher = new NotMatcher(enclosed);
+        assertTrue( matcher.matches("dummy"));
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index d3b964cd1..e96625358 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -16,71 +16,32 @@
  */
 package org.apache.rat.configuration;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.junit.Test;
-import org.xml.sax.SAXException;
 
 public class ConfigurationReaderTest {
-    
-    private static String[] FAMILIES = {"GEN  ", "?????", "AL   ", "OASIS", "W3CD ", "W3C  ", "GPL1 ", "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "BSD_m"};
-    
+
+    private static String[] FAMILIES = { "GEN  ", "AL   ", "ASL  ", "TMF  ", "DOJO ", "OASIS", "W3CD ", "W3C  ",
+            "GPL1 ", "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "ILLUM" };
+
     @Test
-    public void readDefault() throws ConfigurationException, SAXException, IOException, ParserConfigurationException {
+    public void readDefault() {
         XMLConfigurationReader reader = new XMLConfigurationReader();
-        URL url = XMLConfigurationReader.class.getResource("/org/apache/rat/default.config");
+        URL url = XMLConfigurationReader.class.getResource("/org/apache/rat/default.xml");
         reader.read(url);
         List<String> familyCategories = Arrays.asList(FAMILIES);
-        Set<String> readCategories = reader.readFamilies().stream().map(ILicenseFamily::getFamilyCategory).collect(Collectors.toSet());
+        List<String> readCategories = reader.readFamilies().stream().map(ILicenseFamily::getFamilyCategory)
+                .collect(Collectors.toList());
         assertTrue(readCategories.containsAll(familyCategories));
         readCategories.removeAll(familyCategories);
         assertTrue(readCategories.isEmpty());
-        
-        Collection<ILicense> licenses = reader.readLicenses();
-        assertEquals(15, licenses.size());
-        Map<String,Integer> result = new TreeMap<>();
-        for (IHeaderMatcher license : licenses) {
-            license.reportFamily( c -> { 
-                Integer i = result.get(c.getFamilyCategory());
-                if (i == null) {
-                    result.put(c.getFamilyCategory(), 1);
-                } else {
-                    result.put(c.getFamilyCategory(), 1+i.intValue());
-                }
-            });
-        }
- 
-        assertEquals(3,result.get("AL   ").intValue());
-        assertEquals(2,result.get("BSD_m").intValue());
-        assertEquals(3,result.get("CDDL1").intValue());
-        assertEquals(2,result.get("GEN  ").intValue());
-        assertEquals(2,result.get("GPL1 ").intValue());
-        assertEquals(2,result.get("GPL2 ").intValue());
-        assertEquals(2,result.get("GPL3 ").intValue());
-        assertEquals(2,result.get("MIT  ").intValue());
-        assertEquals(2,result.get("OASIS").intValue());
-        assertEquals(2,result.get("W3C  ").intValue());
-        assertEquals(1,result.get("W3CD ").intValue());
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
index 591d0bd6c..5bc95bdec 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
@@ -26,8 +26,8 @@
 public class ReadersTest {
     @Test
     public void getTest() throws MalformedURLException {
-        assertEquals(XMLConfigurationReader.class, Readers.get( "foo/x.config").getClass());
-        assertEquals(XMLConfigurationReader.class, Readers.get("x.cfg").getClass());
+        assertEquals(XMLConfigurationReader.class, Readers.get( "foo/x.xml").getClass());
+        assertEquals(XMLConfigurationReader.class, Readers.get("x.xml").getClass());
         assertThrows( IllegalArgumentException.class, () -> Readers.get("x.junk"));
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 4ea5bcd84..5104eaa58 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -21,6 +21,8 @@
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.SimpleLicenseFamily;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.report.xml.writer.IXmlWriter;
@@ -65,13 +67,14 @@ private void report(DirectoryWalker directory, RatReport report) throws Exceptio
     public void standardReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         
-        final IHeaderMatcher mockLicenseMatcher = mock(IHeaderMatcher.class);
-        when(mockLicenseMatcher.match(any(),any())).thenReturn( true );
+        final ILicense mockLicense = mock(ILicense.class);
+        when(mockLicense.matches(any())).thenReturn( true );
+        when(mockLicense.getLicenseFamily()).thenReturn( new SimpleLicenseFamily( "TEST", "Testing family"));
         
         DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY);
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.addHeaderMatcher(mockLicenseMatcher);
+        configuration.addLicense(mockLicense);
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
         report(directory, report);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index 3b88145ac..9e4546a6c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -23,6 +23,7 @@
 import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.AbstractReport;
 import org.apache.rat.report.RatReport;
@@ -61,8 +62,8 @@ public void setUp() throws Exception {
         writer = new XmlWriter(out);
         writer.startDocument();
         final SimpleXmlClaimReporter reporter = new SimpleXmlClaimReporter(writer);
-        final IHeaderMatcher matcher = mock(IHeaderMatcher.class);
-        when(matcher.match(any(),any())).thenReturn( false );
+        final ILicense matcher = mock(ILicense.class);
+        when(matcher.matches(any())).thenReturn( false );
 
         IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(matcher);
         final List<AbstractReport> reporters = new ArrayList<>();
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 410cc3e3c..769c1e4aa 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -530,7 +530,7 @@ protected ClaimStatistic createReport(Writer out, InputStream style)
     protected ReportConfiguration getConfiguration()
             throws MojoFailureException, MojoExecutionException {
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.addHeaderMatcher(new HeaderMatcherMultiplexer(
+        configuration.addLicense(new HeaderMatcherMultiplexer(
                 mergeLicenseMatchers()));
         configuration.addApprovedLicenseNames(mergeApprovedLicenseNames());
         configuration.setApproveDefaultLicenses(addDefaultLicenseMatchers);
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index b1d076d77..c4c1000e9 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -126,7 +126,7 @@ public void add(ResourceCollection rc) {
      * @param matcher Adds a license matcher.
      */
     public void add(IHeaderMatcher matcher) {
-        configuration.addHeaderMatcher(matcher);
+        configuration.addLicense(matcher);
     }
 
     public void add(ILicenseFamily license) {

From afbebc547427bcda8a8896badd0fcd6a9066ac96 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Thu, 14 Sep 2023 22:25:02 +0200
Subject: [PATCH 085/299] fixed most testing issues

---
 .../main/java/org/apache/rat/Defaults.java    |  49 ++++-
 .../src/main/java/org/apache/rat/Report.java  |  76 ++++++-
 .../org/apache/rat/ReportConfiguration.java   |  81 +++++--
 .../main/java/org/apache/rat/Reporter.java    |   2 +-
 .../rat/analysis/DefaultAnalyserFactory.java  |  12 +-
 .../rat/analysis/license/BaseLicense.java     |  19 +-
 .../analysis/license/CopyrightLicense.java    |  31 ++-
 .../license/FullTextMatchingLicense.java      |   5 -
 .../license/SimplePatternBasedLicense.java    |   8 +-
 .../matchers/AbstractHeaderMatcher.java       |   8 +-
 .../matchers/AbstractMatcherContainer.java    |   2 +-
 .../analysis/matchers/CopyrightMatcher.java   |   6 +-
 .../analysis/matchers/FullTextMatcher.java    |   3 +-
 .../rat/analysis/matchers/NotMatcher.java     |   3 +-
 .../analysis/matchers/SimpleRegexMatcher.java |   3 +-
 .../analysis/matchers/SimpleTextMatcher.java  |   9 +-
 .../java/org/apache/rat/api/MetaData.java     |   2 +
 .../rat/configuration/LicenseReader.java      |  22 +-
 .../configuration/XMLConfigurationReader.java | 207 ++++++++++--------
 .../java/org/apache/rat/license/ILicense.java |  55 +++++
 .../apache/rat/license/ILicenseFamily.java    |  38 ++--
 .../org/apache/rat/policy/DefaultPolicy.java  |  59 +++--
 .../org/apache/rat/report/IReportable.java    |   8 +
 .../rat/report/xml/XmlReportFactory.java      |   2 +-
 .../main/resources/org/apache/rat/default.xml |  71 +++---
 .../java/org/apache/rat/DefaultsTest.java     |   2 +-
 .../test/java/org/apache/rat/ReportTest.java  |   9 +-
 .../ConfigurationReaderTest.java              |   2 +-
 .../apache/rat/policy/DefaultPolicyTest.java  | 105 ++++-----
 29 files changed, 561 insertions(+), 338 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 29ed0eac7..b7f913d99 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -32,6 +32,7 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
@@ -45,7 +46,9 @@
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
  */
 public class Defaults {
-    static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.xml");
+    public enum Filter { all, approved, none };
+    
+    private static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.xml");
 
     /**
      * no instances
@@ -53,8 +56,10 @@ public class Defaults {
     private Defaults() {
     }
 
-    private static SortedSet<ILicense> licenses = new TreeSet<>();
+    private static Filter approvalFilter = Filter.approved;
+    private static SortedSet<ILicense> licenses = new TreeSet<>(ILicense.getComparator());
     private static SortedSet<ILicenseFamily> licenseFamilies = new TreeSet<>();
+    private static SortedSet<ILicenseFamily> approvedLicenseFamilies = new TreeSet<>();
 
     public static Builder builder() {
         return new Builder();
@@ -64,13 +69,14 @@ public static void clear() {
         licenses.clear();
         licenseFamilies.clear();
     }
-
+    
     private static void readConfigFiles(Collection<URL> urls) {
         for (URL url : urls) {
             LicenseReader reader = Readers.get(url);
             reader.add(url);
             licenseFamilies.addAll(reader.readFamilies());
             licenses.addAll(reader.readLicenses());
+            approvedLicenseFamilies.addAll(reader.approvedLicenseFamilies());
         }
     }
 
@@ -90,19 +96,39 @@ public static InputStream getDefaultStyleSheet() {
     }
 
     public static ILicense createDefaultMatcher() {
-        return new LicenseCollectionMatcher(licenses);
+        return new LicenseCollectionMatcher(getLicenses());
     }
 
-    public static Set<ILicense> getLicenses() {
-        return Collections.unmodifiableSet(licenses);
+    /**
+     * Returns the set of defined licenses unless filter is set to no-defaults.
+     * if no-defaults was set then an empty set is returned.
+     * @return The set of defined licenses.
+     */
+    public static SortedSet<ILicense> getLicenses() {
+        switch (approvalFilter) {
+        case all :
+        case approved:
+            return Collections.unmodifiableSortedSet(licenses);
+        case none:
+            default:
+        return Collections.emptySortedSet();
+        }
     }
 
     public static Set<String> getLicenseNames() {
-        return licenseFamilies.stream().map(ILicenseFamily::getFamilyName).collect(Collectors.toSet());
+        return getLicenseFamilies().stream().map(ILicenseFamily::getFamilyName).collect(Collectors.toSet());
     }
 
     public static SortedSet<ILicenseFamily> getLicenseFamilies() {
-        return Collections.unmodifiableSortedSet(licenseFamilies);
+        switch (approvalFilter) {
+        case all:
+            return Collections.unmodifiableSortedSet(licenseFamilies);
+        case approved:
+            return Collections.unmodifiableSortedSet(approvedLicenseFamilies);
+        case none:
+            default:
+        return Collections.emptySortedSet();
+        }
     }
 
     public static class Builder {
@@ -147,6 +173,11 @@ public Builder remove(File file) throws MalformedURLException {
         public Builder noDefault() {
             return remove(DEFAULT_CONFIG_URL);
         }
+        
+        public Builder setApprovalFilter(Filter filter) {
+            approvalFilter = filter;
+            return this;
+        }
 
         public void build() {
             Defaults.readConfigFiles(fileNames);
@@ -174,7 +205,7 @@ public void reset() {
         }
 
         @Override
-        public boolean matches(String line) throws RatHeaderAnalysisException {
+        public boolean matches(String line) {
             for (ILicense license : enclosed) {
                 if (license.matches(line)) {
                     this.family = license.getLicenseFamily();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index dd5092f91..b8924f06a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -51,21 +51,65 @@
 import org.apache.rat.walker.DirectoryWalker;
 
 public class Report {
+    /**
+     * Adds license headers to files missing headers.
+     */
+    private static final String ADD = "A";
+    private static final String ADD_OLD="a";
+    /**
+     * Forces changes to be written to new files.
+     */
+    private static final String FORCE = "f";
+    /**
+     * Defines the copyright header to add to the file.
+     */
+    private static final String COPYRIGHT = "c";
+    /**
+     * Name of File to exclude from report consideration.
+     */
     private static final String EXCLUDE_CLI = "e";
+    /**
+     * Name of file that contains a list of files to exclude from report consideration.
+     */
     private static final String EXCLUDE_FILE_CLI = "E";
+    /**
+     * The stylesheet to use to style the XML output.
+     */
     private static final String STYLESHEET_CLI = "s";
+    /**
+     * Produce help
+     */
     private static final String HELP = "h";
+    /**
+     * Flag to identify a file with license definitions.
+     */
     private static final String LICENSES = "licenses";
-    private static final String NO_DEFAULTS = "no-defaults";
+    /**
+     * Do not use the default files.
+     */
+    private static final String NO_DEFAULTS = "no-default-licenses";
+    private static final String ALL_DEFAULT_LICENSES = "all-default-licenses";
+    /**
+     * List the licenses that were used for the run.
+     */
     private static final String LIST_LICENSES = "list-licenses";
-    private static final String LIST_LICENSE_FAMILIES = "list-license-families";
+    /**
+     * List the approved families for the run.
+     */
+    private static final String LIST_LICENSE_FAMILIES = "list-approved-families";
+    
+    /*
+     * Format used for listing license families
+     */
     private static final String LICENSE_FAMILY_FORMAT = "\t%s: %s\n";
+    
+    /**
+     * Format used for listing licenses.
+     */
     private static final String LICENSE_FORMAT = "%s:\t%s\n\t\t%s\n";
 
     public static final void main(String[] args) throws Exception {
         try (final ReportConfiguration configuration = new ReportConfiguration()) {
-            configuration.addLicense(Defaults.createDefaultMatcher());
-            configuration.setApproveDefaultLicenses(true);
             Options opts = buildOptions();
 
             CommandLine cl = null;
@@ -111,7 +155,11 @@ public static final void main(String[] args) throws Exception {
 
                 Defaults.Builder defaults = Defaults.builder();
                 if (cl.hasOption(NO_DEFAULTS)) {
-                    defaults.noDefault();
+                    defaults.setApprovalFilter(Defaults.Filter.none);
+                } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
+                    defaults.setApprovalFilter(Defaults.Filter.all);
+                } else {
+                    defaults.setApprovalFilter(Defaults.Filter.approved);
                 }
                 if (cl.hasOption(LICENSES)) {
                     for (String fn : cl.getOptionValues(LICENSES)) {
@@ -119,6 +167,8 @@ public static final void main(String[] args) throws Exception {
                     }
                 }
                 defaults.build();
+                configuration.addLicense(Defaults.createDefaultMatcher());
+                configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
                 if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
                     listLicenseFamilies(System.out);
                 }
@@ -197,7 +247,13 @@ private static Options buildOptions() {
         Option help = new Option(HELP, "help", false, "Print help for the RAT command line interface and exit");
         opts.addOption(help);
 
-        opts.addOption(null, NO_DEFAULTS, false, "Ignore default configuration");
+        OptionGroup defaultHandling = new OptionGroup();
+        String defaultHandlingText=" By default all approved default licenses are used";
+        Option noDefaults = new Option(null, NO_DEFAULTS, false, "Ignore default configuration."+defaultHandlingText);
+        Option allDefaults = new Option(null, ALL_DEFAULT_LICENSES, false, "Approve all default licenses"+defaultHandlingText);
+        defaultHandling.addOption(noDefaults);
+        defaultHandling.addOption(allDefaults);
+        
         opts.addOption(null, LICENSES, true, "File names or URLs for license definitions");
         opts.addOption(null, LIST_LICENSES, false, "List all active licenses");
         opts.addOption(null, LIST_LICENSE_FAMILIES, false, "List all defined license families");
@@ -209,17 +265,17 @@ private static Options buildOptions() {
 
         // RAT-85/RAT-203: Deprecated! added only for convenience and for backwards
         // compatibility
-        Option addLicence = new Option("a", "addLicence", false, addLicenseDesc);
+        Option addLicence = new Option(ADD_OLD, "addLicence", false, addLicenseDesc);
         addLicenseGroup.addOption(addLicence);
-        Option addLicense = new Option("A", "addLicense", false, addLicenseDesc);
+        Option addLicense = new Option(ADD, "addLicense", false, addLicenseDesc);
         addLicenseGroup.addOption(addLicense);
         opts.addOptionGroup(addLicenseGroup);
 
-        Option write = new Option("f", "force", false,
+        Option write = new Option(FORCE, "force", false,
                 "Forces any changes in files to be written directly to the source files (i.e. new files are not created)");
         opts.addOption(write);
 
-        Option copyright = new Option("c", "copyright", true,
+        Option copyright = new Option(COPYRIGHT, "copyright", true,
                 "The copyright message to use in the license headers, usually in the form of \"Copyright 2008 Foo\"");
         opts.addOption(copyright);
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 8597fb42c..1176013dd 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -27,18 +27,20 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
 
 import org.apache.rat.Defaults.LicenseCollectionMatcher;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.policy.DefaultPolicy;
 import org.apache.rat.report.IReportable;
 
 /**
- * A configuration object is used by the frontend to invoke the {@link Report}.
- * Basically, the sole purpose of the frontends is to create the configuration
- * and invoke the {@link Report}.
+ * A configuration object is used by the front end to invoke the {@link Reporter}.
+ * Basically, the sole purpose of the front ends is to create the configuration
+ * and invoke the {@link Reporter}.
  */
 public class ReportConfiguration implements AutoCloseable {
     private List<ILicense> licenses = new ArrayList<>();
@@ -46,45 +48,74 @@ public class ReportConfiguration implements AutoCloseable {
     private boolean addingLicenses;
     private boolean addingLicensesForced;
     private String copyrightMessage;
-    private boolean approveDefaultLicenses = true;
     private OutputStream out = null;
     private boolean styleReport = true;
     private InputStream styleSheet = null;
     private IReportable reportable = null;
     private FilenameFilter inputFileFilter = null;
 
+    /**
+     * @return The filename filter for the potential input files.
+     */
     public FilenameFilter getInputFileFilter() {
         return inputFileFilter;
     }
 
+    /**
+     * @param inputFileFilter the filter to filter the on disk files being evaluated.
+     */
     public void setInputFileFilter(FilenameFilter inputFileFilter) {
         this.inputFileFilter = inputFileFilter;
     }
 
+    /**
+     * @return the thing being reported on.
+     */
     public IReportable getReportable() {
         return reportable;
     }
 
+    /**
+     * @param reportable the thing being reported on.
+     */
     public void setReportable(IReportable reportable) {
         this.reportable = reportable;
     }
 
+    /**
+     * @return the XSLT style sheet to style the report with. 
+     */
     public InputStream getStyleSheet() {
         return styleSheet;
     }
 
+    /**
+     * 
+     * @param styleSheet the XSLT style sheet to style the report with. 
+     */
     public void setStyleSheet(InputStream styleSheet) {
         this.styleSheet = styleSheet;
     }
 
+    /**
+     * 
+     * @return True if the XML report should be styled.
+     */
     public boolean isStyleReport() {
         return styleReport;
     }
 
+    /**
+     * 
+     * @param styleReport true if the XML report should be styled
+     */
     public void setStyleReport(boolean styleReport) {
         this.styleReport = styleReport;
     }
 
+    /**
+     * @param out The stream to write the output to.
+     */
     public void setOut(OutputStream out) {
         this.out = out;
     }
@@ -99,7 +130,6 @@ public OutputStream getOutput() {
     }
 
     /**
-     * Returns a PrintWriter that wraps the output stream.
      * 
      * @return A PrintWriter that wraps the output stream.
      */
@@ -107,21 +137,11 @@ public PrintWriter getWriter() {
         return new PrintWriter(new OutputStreamWriter(getOutput(), Charset.forName("UTF-8")));
     }
 
-    /**
-     * @return whether default licenses shall be approved by default.
-     */
-    public boolean isApproveDefaultLicenses() {
-        return approveDefaultLicenses;
-    }
-
-    public void setApproveDefaultLicenses(boolean approveDefaultLicenses) {
-        this.approveDefaultLicenses = approveDefaultLicenses;
-    }
 
     /**
-     * Returns the header matcher.
+     * Returns the license that is the combination of all licenses being tested.
      *
-     * @return the header matcher.
+     * @return the license matcher, or null if no licenses are specified.
      */
     public ILicense getLicense() {
         if (licenses.isEmpty()) {
@@ -134,16 +154,23 @@ public ILicense getLicense() {
     }
 
     /**
-     * Sets the header matcher.
+     * Adds licenses to the list of licenses to be checked.
      *
-     * @param headerMatcher header matcher.
+     * @param license The license t oadd.
      */
-    public void addLicense(ILicense headerMatcher) {
-        this.licenses.add(headerMatcher);
+    public void addLicense(ILicense license) {
+        this.licenses.add(license);
     }
 
     /**
-     * Returns the set of approved license names.
+     * Adds licenses to the list of licenses to be checked.
+     *
+     * @param license The license t oadd.
+     */
+    public void addLicenses(Collection<ILicense> licenses) {
+        this.licenses.addAll(licenses);
+    }
+    /**
      *
      * @return the set of approved license names.
      */
@@ -174,7 +201,7 @@ public void addApprovedLicenseName(ILicenseFamily approvedLicenseName) {
      *
      * @param approvedLicenseNames set of approved license names.
      */
-    public void addApprovedLicenseNames(List<ILicenseFamily> approvedLicenseNames) {
+    public void addApprovedLicenseNames(Collection<ILicenseFamily> approvedLicenseNames) {
         this.approvedLicenseNames.addAll(approvedLicenseNames);
     }
 
@@ -238,6 +265,10 @@ public void setAddingLicenses(boolean addingLicenses) {
         this.addingLicenses = addingLicenses;
     }
 
+    /**
+     * Validates that the configuration is valid.
+     * @param logger the system to write warnings to.
+     */
     public void validate(Consumer<String> logger) {
         if (reportable == null) {
             throw new ConfigurationException("Reportable may not be null");
@@ -249,6 +280,10 @@ public void validate(Consumer<String> logger) {
             logger.accept("Ignoring stylesheet '%s' because styling is not selected");
         }
     }
+    
+    public DefaultPolicy getDefaultPolicy() {
+        return new DefaultPolicy(getApprovedLicenseNames());
+    }
 
     @Override
     public void close() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index c3f389d74..b0a01a5bd 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -84,7 +84,7 @@ public static ClaimStatistic report(ReportConfiguration configuration) throws Ex
                     configuration.setStyleSheet(Defaults.getDefaultStyleSheet());
                 }
                 PipedReader reader = new PipedReader();
-                PipedWriter writer = new PipedWriter();
+                PipedWriter writer = new PipedWriter(reader);
                 ReportTransformer transformer = new ReportTransformer(configuration.getWriter(),
                         configuration.getStyleSheet(), reader);
                 Thread transformerThread = new Thread(transformer);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index dd8678b56..dcb255879 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -47,20 +47,20 @@ public DefaultAnalyser(final ILicense license) {
         }
 
         @Override
-        public void analyse(Document subject) throws RatDocumentAnalysisException {
+        public void analyse(Document document) throws RatDocumentAnalysisException {
             final MetaData.Datum documentCategory;
-            if (NoteGuesser.isNote(subject)) {
+            if (NoteGuesser.isNote(document)) {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_NOTICE;
-            } else if (ArchiveGuesser.isArchive(subject)) {
+            } else if (ArchiveGuesser.isArchive(document)) {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_ARCHIVE;
-            } else if (BinaryGuesser.isBinary(subject)) {
+            } else if (BinaryGuesser.isBinary(document)) {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY;
             } else {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_STANDARD;
                 final DocumentHeaderAnalyser headerAnalyser = new DocumentHeaderAnalyser(license);
-                headerAnalyser.analyse(subject);
+                headerAnalyser.analyse(document);
             }
-            subject.getMetaData().set(documentCategory);
+            document.getMetaData().set(documentCategory);
         }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 7badbffe0..ab7883ceb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -19,17 +19,11 @@
 package org.apache.rat.analysis.license;
 
 import java.util.Arrays;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.analysis.matchers.AbstractMatcherContainer;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
 
 public abstract class BaseLicense extends AbstractMatcherContainer implements ILicense {
     private ILicenseFamily family;
@@ -43,8 +37,9 @@ public BaseLicense(ILicenseFamily family, String notes, IHeaderMatcher matcher)
     public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher) {
         this(null, family, notes, matcher, null);
     }
-    
-    public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher, ILicense derivedFrom) {
+
+    public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher,
+            ILicense derivedFrom) {
         super(String.format("%s:%s:%s/%s", idPrefix == null ? "" : idPrefix, family.getFamilyCategory(),
                 matcher.getClass().getSimpleName(), matcher.getId()), Arrays.asList(matcher));
         this.family = family;
@@ -52,26 +47,26 @@ public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeader
         this.derivedFrom = derivedFrom;
     }
 
+    @Override
     public ILicenseFamily getLicenseFamily() {
         return family;
     }
 
-
     @Override
     public int compareTo(ILicense arg0) {
         return ILicense.getComparator().compare(this, arg0);
     }
 
-    
+    @Override
     public String getNotes() {
         return notes;
     }
 
     @Override
-    public boolean matches(String line) throws RatHeaderAnalysisException {
+    public boolean matches(String line) {
         return enclosed.iterator().next().matches(line);
     }
-    
+
     @Override
     public ILicense derivedFrom() {
         return derivedFrom;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
index 2ee0995f7..6eb02531a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
@@ -18,33 +18,29 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.analysis.matchers.CopyrightMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.api.MetaData.Datum;
-import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-import java.util.regex.Pattern;
-
 /**
- * Matches a typical Copyright header line only based on a regex pattern
- * which allows for one (starting) year or year range, and a
- * configurable copyright owner.
+ * Matches a typical Copyright header line only based on a regex pattern which
+ * allows for one (starting) year or year range, and a configurable copyright
+ * owner. <br>
  * <br>
- * <br>The matching is done case insensitive<br>
+ * The matching is done case insensitive<br>
  * <br>
- * Example supported Copyright header lines, using copyright owner &quot;FooBar&quot;
+ * Example supported Copyright header lines, using copyright owner
+ * &quot;FooBar&quot;
  * <ul>
  * <li>* Copyright 2010 FooBar. *</li>
  * <li>* Copyright 2010-2012 FooBar. *</li>
  * <li>*copyright 2012 foobar*</li>
  * </ul>
- * <p>Note also that the copyright owner is appended to the regex pattern, so
- * can support additional regex but also requires escaping where needed,<br>
- * e.g. use &quot;FooBar \(www\.foobar\.com\)&quot; for matching &quot;FooBar (www.foobar.com)&quot;</p>
+ * <p>
+ * Note also that the copyright owner is appended to the regex pattern, so can
+ * support additional regex but also requires escaping where needed,<br>
+ * e.g. use &quot;FooBar \(www\.foobar\.com\)&quot; for matching &quot;FooBar
+ * (www.foobar.com)&quot;
+ * </p>
  *
  * @since Rat 0.9
  */
@@ -54,7 +50,8 @@ protected CopyrightLicense(ILicenseFamily licenseFamily, String notes, String st
         super(licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
 
-    public CopyrightLicense(String id, ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
+    public CopyrightLicense(String id, ILicenseFamily licenseFamily, String notes, String start, String stop,
+            String owner) {
         super(id, licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index ed0409f19..09c1cc181 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -18,12 +18,7 @@
  */
 package org.apache.rat.analysis.license;
 
-import java.util.Locale;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 
 /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
index bab738a5c..9e3fb2a30 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -23,10 +23,8 @@
 import java.util.stream.Collectors;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.analysis.matchers.OrMatcher;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 
 /**
@@ -35,14 +33,14 @@
 public class SimplePatternBasedLicense extends BaseLicense {
 
     private static IHeaderMatcher getMatcher(String[] patterns) {
-        if (patterns.length == 1)
-        {
+        if (patterns.length == 1) {
             return new SimpleTextMatcher(patterns[0]);
-        } 
+        }
         Collection<IHeaderMatcher> collection = Arrays.stream(patterns).map(SimpleTextMatcher::new)
                 .collect(Collectors.toList());
         return new OrMatcher(collection);
     }
+
     /**
      * Creates a pattern based license with full documentation.
      * 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
index 419d42e12..a579b9c76 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
@@ -8,12 +8,12 @@ public abstract class AbstractHeaderMatcher implements IHeaderMatcher {
 
     private String id;
 
-    protected AbstractHeaderMatcher() {
-        this(UUID.randomUUID().toString());
-    }
+//    protected AbstractHeaderMatcher() {
+//        this(null);
+//    }
 
     protected AbstractHeaderMatcher(String id) {
-        this.id = id;
+        this.id = id == null ? UUID.randomUUID().toString() : id;
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index 4205c7616..0d0a610ba 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -15,7 +15,7 @@ public AbstractMatcherContainer(String id, Collection<? extends IHeaderMatcher>
     }
 
     public AbstractMatcherContainer(Collection<? extends IHeaderMatcher> enclosed) {
-        super();
+        super(null);
         this.enclosed = new ArrayList<>(enclosed);
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index 08b2fb6a6..dffa74fc9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -58,7 +58,11 @@ public class CopyrightMatcher extends AbstractHeaderMatcher {
     private final Pattern ownerDatePattern;
 
     public CopyrightMatcher(String start, String stop, String owner) {
-        super();
+        this(null, start, stop, owner);
+    }
+    
+    public CopyrightMatcher(String id, String start, String stop, String owner) {
+        super(id);
         String dateDefn = "";
         if (StringUtils.isNotEmpty(start)) {
             if (StringUtils.isNotEmpty(stop)) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
index cbcb09eca..9964e4e3d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -48,8 +48,7 @@ public class FullTextMatcher extends AbstractHeaderMatcher {
     private final StringBuilder buffer = new StringBuilder();
 
     public FullTextMatcher(String fullText) {
-        super();
-        setFullText(fullText);
+        this(null,fullText);
     }
 
     public FullTextMatcher(String id, String fullText) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
index de110db97..ef2f4ebd4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
@@ -7,8 +7,7 @@ public class NotMatcher extends AbstractHeaderMatcher {
     private final IHeaderMatcher enclosed;
 
     public NotMatcher(IHeaderMatcher enclosed) {
-        super();
-        this.enclosed = enclosed;
+        this(null, enclosed);
     }
 
     public NotMatcher(String id, IHeaderMatcher enclosed) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
index a33bded35..4b035b631 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
@@ -35,8 +35,7 @@ public class SimpleRegexMatcher extends AbstractHeaderMatcher {
      * @param pPatterns
      */
     public SimpleRegexMatcher(Pattern pattern) {
-        super();
-        this.pattern = pattern;
+        this(null, pattern);
     }
 
     public SimpleRegexMatcher(String id, Pattern pattern) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index 7419b5b13..cc142da58 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -35,15 +35,14 @@ public class SimpleTextMatcher extends AbstractHeaderMatcher {
      * @param pPatterns
      */
     public SimpleTextMatcher(String pattern) {
-        super();
-        if (StringUtils.isBlank(pattern)) {
-            throw new IllegalArgumentException( "Pattern may not be null, empty or blank");
-        }
-        this.pattern = pattern;
+        this(null,pattern);
     }
 
     public SimpleTextMatcher(String id, String pattern) {
         super(id);
+        if (StringUtils.isBlank(pattern)) {
+            throw new IllegalArgumentException( "Pattern may not be null, empty or blank");
+        }
         this.pattern = pattern;
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index b64e95960..26a4a9512 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -26,6 +26,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
 
 /**
  * Data about the subject.
@@ -161,6 +162,7 @@ public void reportOnLicense(ILicense license) {
         set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, license.getLicenseFamily().getFamilyCategory()));
         set(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, license.getLicenseFamily().getFamilyName()));
     }
+
     
     /**
      * Gets the content type for the subject.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index 92e5d07fc..5d77be7f9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -20,27 +20,37 @@
 
 import java.net.URL;
 import java.util.Collection;
-import java.util.Map;
 import java.util.SortedSet;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
 public interface LicenseReader {
+    /**
+     * Adds a URL to the set of files to be read.
+     * @param url the URL to read.
+     */
     void add(URL url);
 
     /**
-     * Reads the configuration and extracts the Family metadata indexed by category id.
+     * Reads the configuration and extracts the Family metadata indexed by category
+     * id.
+     * 
      * @return SortedSet of ILicenseFamily objects
      */
     SortedSet<ILicenseFamily> readFamilies();
-    
+
     /**
      * Reads the configuration and extracts the BaseLicenses.
+     * 
      * @return A collection of Base licenses.
      */
     Collection<ILicense> readLicenses();
+
+    /**
+     * Reads the configuration and extracts the list of approved licenses.
+     * 
+     * @return The list of approved licenses.
+     */
+    Collection<ILicenseFamily> approvedLicenseFamilies();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 765f28d36..97e680d36 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -28,12 +28,14 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.SortedSet;
+import java.util.Stack;
 import java.util.TreeSet;
 import java.util.function.Consumer;
 
@@ -69,6 +71,7 @@
 import org.xml.sax.SAXException;
 
 /*
+ *  <licenses> 
  *  <license id=id name=name >
         <notes></notes>
         <text>  </text>
@@ -76,19 +79,40 @@
         <spdx></spdx> 
         <and> <license>...</and>
         <or> <license>...</or> 
+        <matcher_ref refid='' />
     </license>
+    </licenses>
+    <approved>
+        <family refid=''>
+    </approved>
  */
 
 public class XMLConfigurationReader implements LicenseReader {
 
     enum MatcherType {
-        text, copyright, spdx, any, all, license_ref, not
+        text, copyright, spdx, any, all, matcher_ref, not
     };
+    
+    enum AttributeName {
+        id, name, license_ref, refid, start, end, owner, resource, derived_from;
+    }
 
+    private final static String ROOT = "rat-config";
+    private final static String LICENSES = "licenses";
+    private final static String LICENSE = "license";
+    private final static String APPROVED = "approved";
+    private final static String FAMILY = "family";
+    private final static String NOTE = "note";
+    
     private Document document;
-    private final Element baseElement;
+    private final Element rootElement;
     private final Element licensesElement;
+    private final Element approvedElement;
+    
     private final SortedSet<ILicense> licenses;
+    private final Map<String,IHeaderMatcher> matchers;
+    private final SortedSet<ILicenseFamily> licenseFamilies;
+    private final SortedSet<ILicenseFamily> approvedFamilies;
 
     public XMLConfigurationReader() {
         try {
@@ -96,11 +120,16 @@ public XMLConfigurationReader() {
         } catch (ParserConfigurationException e) {
             throw new IllegalStateException("No XML parser defined", e);
         }
-        baseElement = document.createElement("rat-config");
-        document.appendChild(baseElement);
-        licensesElement = document.createElement("licenses");
-        baseElement.appendChild(licensesElement);
+        rootElement = document.createElement(ROOT);
+        document.appendChild(rootElement);
+        licensesElement = document.createElement(LICENSES);
+        rootElement.appendChild(licensesElement);
+        approvedElement = document.createElement(APPROVED);
+        rootElement.appendChild(approvedElement);
         licenses = new TreeSet<>((x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily()));
+        approvedFamilies = new TreeSet<>();
+        licenseFamilies = new TreeSet<>();
+        matchers = new HashMap<>();
     }
 
     public void printDocument(OutputStream out) {
@@ -154,34 +183,37 @@ private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
     }
 
     public void add(Document newDoc) {
-        printDocument(System.out, newDoc);
         List<Node> lst = new ArrayList<>();
-        nodeListConsumer(newDoc.getElementsByTagName("license"), lst::add);
-        nodeListConsumer(newDoc.getElementsByTagName("license"),
-                (n) -> licensesElement.appendChild(baseElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
+        nodeListConsumer(newDoc.getElementsByTagName(LICENSE), lst::add);
+        nodeListConsumer(newDoc.getElementsByTagName(LICENSE),
+                (n) -> licensesElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
+        nodeListConsumer(newDoc.getElementsByTagName(APPROVED),
+                (n) -> licensesElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
+
     }
 
     @Override
     public SortedSet<ILicenseFamily> readFamilies() {
-        SortedSet<ILicenseFamily> result = new TreeSet<>();
-        readLicenses().stream().map(ILicense::getLicenseFamily).forEach(result::add);
-        return result;
+        if (licenses.size() == 0) {
+            readLicenses();
+        }
+        return Collections.unmodifiableSortedSet(licenseFamilies);
     }
 
-    Map<String, String> attributes(Node node) {
+    Map<AttributeName, String> attributes(Node node) {
         NamedNodeMap nnm = node.getAttributes();
-        Map<String, String> result = new HashMap<>();
+        Map<AttributeName, String> result = new HashMap<>();
         for (int i = 0; i < nnm.getLength(); i++) {
             Node n = nnm.item(i);
-            result.put(n.getNodeName(), n.getNodeValue());
+            result.put(AttributeName.valueOf(n.getNodeName()), n.getNodeValue());
         }
         return result;
     }
 
-    private IHeaderMatcher createTextMatcher(String txt) {
+    private IHeaderMatcher createTextMatcher(String id, String txt) {
         boolean complex = txt.contains(" ") | txt.contains("\\t") | txt.contains("\\n") | txt.contains("\\r")
                 | txt.contains("\\f") | txt.contains("\\v");
-        return complex ? new FullTextMatcher(txt) : new SimpleTextMatcher(txt);
+        return complex ? new FullTextMatcher(id, txt) : new SimpleTextMatcher(id, txt);
     }
 
     /**
@@ -199,7 +231,7 @@ private List<IHeaderMatcher> readTextResource(String resourceName) {
             while (null != (txt = buffer.readLine())) {
                 txt = txt.trim();
                 if (StringUtils.isNotBlank(txt)) {
-                    matchers.add(createTextMatcher(txt));
+                    matchers.add(createTextMatcher(null,txt));
                 }
             }
             return matchers;
@@ -209,19 +241,21 @@ private List<IHeaderMatcher> readTextResource(String resourceName) {
     }
 
     private IHeaderMatcher parseMatcher(Node matcherNode) {
-        Map<String, String> attr = attributes(matcherNode);
+        Map<AttributeName, String> attr = attributes(matcherNode);
         MatcherType type = MatcherType.valueOf(matcherNode.getNodeName());
         List<IHeaderMatcher> children;
+        IHeaderMatcher result = null;
+        String id = attr.get(AttributeName.id);
 
         switch (type) {
         case text:
-            return createTextMatcher(matcherNode.getTextContent().trim());
+            result = createTextMatcher(id, matcherNode.getTextContent().trim());
+            break;
 
         case any:
         case all:
-
-            if (attr.get("resource") != null) {
-                children = readTextResource(attr.get("resource"));
+            if (attr.containsKey(AttributeName.resource)) {
+                children = readTextResource(attr.get(AttributeName.resource));
             } else {
                 children = new ArrayList<>();
                 nodeListConsumer(matcherNode.getChildNodes(), x -> {
@@ -230,15 +264,20 @@ private IHeaderMatcher parseMatcher(Node matcherNode) {
                     }
                 });
             }
-            return type == MatcherType.any ? new OrMatcher(children) : new AndMatcher(children);
+            result = type == MatcherType.any ? new OrMatcher(id, children) : new AndMatcher(id, children);
+            break;
 
         case copyright:
-            return new CopyrightMatcher(attr.get("start"), attr.get("end"), attr.get("owner"));
+            result = new CopyrightMatcher(id, attr.get(AttributeName.start), attr.get(AttributeName.end), attr.get(AttributeName.owner));
+            break;
 
         case spdx:
-            return SPDXMatcherFactory.INSTANCE.create(attr.get("name"));
-        case license_ref:
-            return new ILicenseProxy(attr.get("refid"));
+            result = SPDXMatcherFactory.INSTANCE.create(attr.get(AttributeName.name));
+            break;
+
+        case matcher_ref:
+            result = IHeaderMatcherProxy.create(attr.get(AttributeName.refid), matchers);
+            break;
 
         case not:
             children = new ArrayList<>();
@@ -250,28 +289,32 @@ private IHeaderMatcher parseMatcher(Node matcherNode) {
             if (children.size() != 1) {
                 throw new ConfigurationException("'Not' type matcher requires one and only one enclosed matcher");
             }
-            return new NotMatcher(children.get(0));
+            result = new NotMatcher(children.get(0));
+            break;
         }
-        throw new ConfigurationException(String.format("%s is not a matcher type", matcherNode.getNodeName()));
+        if (attr.containsKey(AttributeName.id)) {
+            matchers.put(attr.get(AttributeName.id), result);
+        }
+        return result;
     }
 
     private ILicense parseLicense(Node licenseNode) {
-        Map<String, String> attributes = attributes(licenseNode);
+        Map<AttributeName, String> attributes = attributes(licenseNode);
 
-        ILicenseFamily family = new SimpleLicenseFamily(attributes.get("id"), attributes.get("name"));
+        ILicenseFamily family = new SimpleLicenseFamily(attributes.get(AttributeName.id), attributes.get(AttributeName.name));
         IHeaderMatcher matcher[] = { null };
         StringBuilder notesBuilder = new StringBuilder();
         nodeListConsumer(licenseNode.getChildNodes(), x -> {
             if (x.getNodeType() == Node.ELEMENT_NODE) {
-                if (x.getNodeName().equals("note")) {
+                if (x.getNodeName().equals(NOTE)) {
                     notesBuilder.append(x.getTextContent()).append("\n");
                 } else {
                     matcher[0] = parseMatcher(x);
                 }
             }
         });
-        ILicense derivedFrom = attributes.get("derived-from") == null ? null
-                : new ILicenseProxy(attributes.get("derived-from"));
+        ILicense derivedFrom = !attributes.containsKey(AttributeName.derived_from) ? null
+                : ILicenseProxy.create(attributes.get(AttributeName.derived_from), licenses);
         String notes = StringUtils.defaultIfBlank(notesBuilder.toString().trim(), null);
         return new SimpleLicense(family, matcher[0], derivedFrom, notes);
     }
@@ -279,71 +322,47 @@ private ILicense parseLicense(Node licenseNode) {
     @Override
     public SortedSet<ILicense> readLicenses() {
         if (licenses.size() == 0) {
-            nodeListConsumer(document.getElementsByTagName("license"), x -> licenses.add(parseLicense(x)));
+            nodeListConsumer(document.getElementsByTagName(LICENSE), x -> licenses.add(parseLicense(x)));
+            licenses.stream().map(ILicense::getLicenseFamily).forEach(licenseFamilies::add);
+            nodeListConsumer(document.getElementsByTagName(FAMILY), x -> approvedFamilies.add(parseFamily(x)));
+            Stack<ILicense> stack = new Stack<>();
+            for (ILicense license : licenses) {
+                ILicense derivedFrom = license.derivedFrom();
+                if (derivedFrom != null) {
+                    stack.push(license);
+                    while (derivedFrom != null) {
+                        stack.push(derivedFrom);
+                        derivedFrom = derivedFrom.derivedFrom();
+                    }
+                }
+                while (!stack.isEmpty()) {
+                    derivedFrom = stack.pop();
+                    ILicenseFamily found = ILicenseFamily.search(
+                            derivedFrom.getLicenseFamily(), approvedFamilies);
+                   if (found != null) {
+                        while (!stack.isEmpty()) {
+                            approvedFamilies.add(stack.pop().getLicenseFamily());
+                        }
+                    }
+                }
+                
+            }
             document = null;
         }
         return Collections.unmodifiableSortedSet(licenses);
     }
 
-    class ILicenseProxy implements ILicense {
-        final String proxyId;
-        ILicense wrapped;
-
-        ILicenseProxy(String proxyId) {
-            this.proxyId = proxyId;
-        }
-
-        private void checkProxy() {
-            if (wrapped == null) {
-                ILicenseFamily testLic = new SimpleLicenseFamily(proxyId, "searching proxy");
-                Optional<ILicense> lic = licenses.stream().filter(l -> l.getLicenseFamily().compareTo(testLic) == 0)
-                        .findFirst();
-                if (!lic.isPresent()) {
-                    throw new IllegalStateException(String.format("%s is not a valid family category", proxyId));
-                }
-                wrapped = lic.get();
-            }
-        }
-
-        @Override
-        public ILicenseFamily getLicenseFamily() {
-            checkProxy();
-            return wrapped.getLicenseFamily();
-        }
-
-        @Override
-        public String getNotes() {
-            checkProxy();
-            return wrapped.getNotes();
-        }
-
-        @Override
-        public ILicense derivedFrom() {
-            checkProxy();
-            return wrapped.derivedFrom();
-        }
-
-        @Override
-        public String getId() {
-            checkProxy();
-            return wrapped.getId();
-        }
-
-        @Override
-        public void reset() {
-            checkProxy();
-            wrapped.reset();
+    private ILicenseFamily parseFamily(Node familyNode) {
+        Map<AttributeName, String> attributes = attributes(familyNode);
+        if (attributes.containsKey(AttributeName.license_ref)) {
+            return ILicenseFamilyProxy.create(ILicenseProxy.create(attributes.get(AttributeName.license_ref), licenses));
         }
+        throw new ConfigurationException("family tag requires " + AttributeName.license_ref + " attribute");
+    }
 
-        @Override
-        public boolean matches(String line) {
-            checkProxy();
-            return wrapped.matches(line);
-        }
 
-        @Override
-        public int compareTo(ILicense arg0) {
-            return ILicense.getComparator().compare(this, arg0);
-        }
+    @Override
+    public Collection<ILicenseFamily> approvedLicenseFamilies() {
+        return approvedFamilies.isEmpty() ? readFamilies() : approvedFamilies;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index ff107e1b5..2b4c9c9be 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -1,6 +1,7 @@
 package org.apache.rat.license;
 
 import java.util.Comparator;
+import java.util.SortedSet;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
@@ -9,6 +10,60 @@ public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
     String getNotes();
     ILicense derivedFrom();
     
+    /**
+     * Search a set
+     * @param licenseId
+     * @param licenses
+     * @return
+     */
+    static ILicense search(String licenseId, SortedSet<ILicense> licenses) {
+        ILicenseFamily searchFamily = new SimpleLicenseFamily(licenseId, "searching proxy");
+        ILicense target = new ILicense() {
+    
+            @Override
+            public String getId() {
+                return licenseId;
+            }
+    
+            @Override
+            public void reset() {
+                // do nothing
+            }
+    
+            @Override
+            public boolean matches(String line) {
+                return false;
+            }
+    
+            @Override
+            public int compareTo(ILicense arg0) {
+                return searchFamily.compareTo(arg0.getLicenseFamily());
+            }
+    
+            @Override
+            public ILicenseFamily getLicenseFamily() {
+                return searchFamily;
+            }
+    
+            @Override
+            public String getNotes() {
+                return null;
+            }
+    
+            @Override
+            public ILicense derivedFrom() {
+                return null;
+            }
+            
+        };
+        return search(target,licenses);
+    }
+    
+    static ILicense search(ILicense target, SortedSet<ILicense> licenses) {
+        SortedSet<ILicense> part = licenses.tailSet(target);
+        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
+    }
+    
     static Comparator<ILicense> getComparator() {
         return (x,y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily());
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index ae454d8b0..73e4c84ab 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -36,24 +36,24 @@ default int compareTo(ILicenseFamily other) {
         return getFamilyCategory().compareTo(other.getFamilyCategory());
     }
     
-    public static ILicenseFamily searchSet(SortedSet<ILicenseFamily> set, String category) {
-        ILicenseFamily target = new ILicenseFamily() {
-
-            @Override
-            public String getFamilyName() {
-                return "";
-            }
-
-            @Override
-            public String getFamilyCategory() {
-               return makeCategory(category);
-            }};
-            
-        SortedSet<ILicenseFamily> partialSet = set.tailSet(target );
-        if (partialSet.isEmpty()) {
-            return null;
-        }
-        ILicenseFamily candidate = partialSet.first();
-        return candidate.compareTo(target) == 0 ? candidate : null;
+//    does not work -- revisit if needed
+//    static ILicenseFamily search(String licenseCategory, SortedSet<ILicenseFamily> licenses) {
+//        ILicenseFamily target = new ILicenseFamily() {
+//            @Override
+//            public String getFamilyName() {
+//                return licenseCategory;
+//            }
+//
+//            @Override
+//            public String getFamilyCategory() {
+//                return "Searching family";
+//            }
+//        };
+//        return search(target, licenses);
+//    }
+    
+    static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenses) {
+        SortedSet<ILicenseFamily> part = licenses.tailSet(target);
+        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 4dc45ce56..7a9dafe3d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -18,65 +18,58 @@
  */
 package org.apache.rat.policy;
 
-import org.apache.rat.Defaults;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.config.ConfigurationUtil;
-import org.apache.rat.document.IDocumentAnalyser;
-import org.apache.rat.document.RatDocumentAnalysisException;
-import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.document.IDocumentAnalyser;
+import org.apache.rat.document.RatDocumentAnalysisException;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
+
 public class DefaultPolicy implements IDocumentAnalyser {
     private SortedSet<ILicenseFamily> approvedLicenseNames;
 
     /**
-     * Creates a policy that matches the default licenses.
-     * Mainly used for testing purposes.
+     * Creates a policy that matches the default licenses. Mainly used for testing
+     * purposes.
      */
     DefaultPolicy() {
-        this(new ArrayList<ILicenseFamily>(0), true);
+        this(new ArrayList<ILicenseFamily>(0));
     }
 
-    public DefaultPolicy(final ILicenseFamily[] approvedLicenses, boolean mergeWithDefault) {
-        this(Arrays.asList(approvedLicenses), mergeWithDefault);
+    public DefaultPolicy(final ILicenseFamily[] approvedLicenses) {
+        this(Arrays.asList(approvedLicenses));
     }
 
-    public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseNames, boolean mergeWithDefault) {
+    public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseNames) {
         this.approvedLicenseNames = new TreeSet<>();
-
-        if (mergeWithDefault) {
-            this.approvedLicenseNames.addAll(Defaults.getLicenseFamilies());
-        }
-        if (approvedLicenseNames != null) {
-            this.approvedLicenseNames.addAll(approvedLicenseNames);
-        }
+        this.approvedLicenseNames.addAll(approvedLicenseNames);
+    }
+    
+    public void add(ILicenseFamily approvedLicense) {
+        this.approvedLicenseNames.add(approvedLicense);
     }
 
     @Override
-    public void analyse(final Document subject) throws RatDocumentAnalysisException {
-        if (subject != null) {
-            final ILicenseFamily licenseFamily = new SimpleLicenseFamily( 
-                    subject.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                    subject.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
-           
-            reportLicenseApprovalClaim(subject, approvedLicenseNames.contains(licenseFamily));
+    public void analyse(final Document document) {
+        if (document != null) {
+            final ILicenseFamily licenseFamily = new SimpleLicenseFamily(
+                    document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
+                    document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
+
+            reportLicenseApprovalClaim(document, approvedLicenseNames.contains(licenseFamily));
         }
     }
 
     public void reportLicenseApprovalClaim(final Document subject, final boolean isAcceptable) {
         subject.getMetaData().set(//
-         isAcceptable ? MetaData.RAT_APPROVED_LICENSE_DATIM_TRUE: MetaData.RAT_APPROVED_LICENSE_DATIM_FALSE);
+                isAcceptable ? MetaData.RAT_APPROVED_LICENSE_DATIM_TRUE : MetaData.RAT_APPROVED_LICENSE_DATIM_FALSE);
     }
 
     public SortedSet<ILicenseFamily> getApprovedLicenseNames() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java b/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
index d7fd7af89..05598ea06 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
@@ -20,7 +20,15 @@
 
 import org.apache.rat.api.RatException;
 
+/**
+ * An interface that identifies things that can be reported upon.
+ */
 public interface IReportable {
 
+    /**
+     * Runs a report against the thing to be reported on.
+     * @param report The report to run.
+     * @throws RatException on error.
+     */
     void run(RatReport report) throws RatException;
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
index 66c8888e3..fa2365ba2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
@@ -52,7 +52,7 @@ public static final RatReport createStandardReport(IXmlWriter writer,
 
         final IDocumentAnalyser analyser =
             DefaultAnalyserFactory.createDefaultAnalyser(configuration.getLicense());
-        final DefaultPolicy policy = new DefaultPolicy(configuration.getApprovedLicenseNames(), configuration.isApproveDefaultLicenses());
+        final DefaultPolicy policy = configuration.getDefaultPolicy();
 
         final IDocumentAnalyser[] analysers = {analyser, policy};
         DocumentAnalyserMultiplexer analysisMultiplexer = new DocumentAnalyserMultiplexer(analysers);
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index cc953a3a9..3c693d76a 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -9,13 +9,12 @@
 		<spdx name=''/> 
 		<and> <license>...</and>
 		<or> <license>...</or> 
-		<license_ref refid='licenceid' />
+		<matcher_ref refid='licenceid' />
 	</license>
 -->
-
 		<license id="AL" name="Apache License Version 2.0">
-			<all>
-				<any>
+		<all>
+			<any id="ALStandard">
 					<text>Licensed under the Apache License, Version 2.0 (the
 						"License")</text>
 					<text>Licensed to the Apache Software Foundation (ASF) under
@@ -39,22 +38,7 @@
 
 		<license id="ASL" name="Applied Apahce License Version 2.0">
 			<all>
-				<any>
-					<text>Licensed under the Apache License, Version 2.0 (the
-						"License")</text>
-					<text>Licensed to the Apache Software Foundation (ASF) under
-						one
-						or more contributor license agreements; and to You under
-						the
-						Apache License, Version 2.0.</text>
-					<text>http://www.apache.org/licenses/LICENSE-2.0</text>
-					<text>https://www.apache.org/licenses/LICENSE-2.0</text>
-					<text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
-					<text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
-					<text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
-					<text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
-					<spdx name='Apache-2.0' />
-				</any>
+				<matcher_ref refid="ALStandard"/>
 				<copyright />
 			</all>
 		</license>
@@ -71,7 +55,7 @@
 		</license>
 
 		<license id="ILLUMOS" name="ILLUMOS CDDL1 Derived license"
-			derived-from='CDDL1'>
+			derived_from='CDDL1'>
 			<note>Modified CDDL1 license</note>
 			<any>
 				<text>The contents of this file are subject to the terms of
@@ -81,7 +65,7 @@
 			</any>
 		</license>
 
-		<license id="DOJO" name="DOJO License" derived-from="BSD">
+		<license id="DOJO" name="DOJO License" derived_from="BSD-3">
 			<text>http://dojotoolkit.org/community/licensing.shtml</text>
 		</license>
 
@@ -177,12 +161,13 @@
 		</license>
 
 		<license id="TMF" name="The Telemanagement Forum License"
-			derived-from="BSD">
-			<any>
+			derived_from="BSD-3">
+			<all>
 				<text>TMF854 Version 1.0</text>
 				<copyright
 					owner="TeleManagement Forum" />
-			</any>
+					<matcher_ref refid="BSD-3-txt"/>
+			</all>
 		</license>
 
 		<license id="W3C" name="W3C Software Copyright">
@@ -206,5 +191,41 @@
 			<text>
 				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</text>
 		</license>
+		
+		<license id='BSD-3' name="BSD 3 clause">
+			<any>
+				<all>
+					<copyright />
+					<text id="BSD-3-txt">
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</text>
+
+				</all>
+				<spdx name='BSD-3-Clause' />
+			</any>
+		</license>
 	</licenses>
+	<approved>
+		<family license_ref="BSD-3"/>
+		<family license_ref='AL'/>
+		<family license_ref='ASL'/>
+		<family license_ref='CDDL1'/>
+		<family license_ref='DOJO'/>
+		<family license_ref='GPL1'/>
+		<family license_ref='GPL2'/>
+		<family license_ref='GPL3'/>
+		<family license_ref='GEN'/>
+		<family license_ref='MIT'/>
+		<family license_ref='OASIS'/>
+		<family license_ref='W3C'/>
+		<family license_ref='W3CD'/>
+	</approved>
 </rat-config>
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index 09e9f716f..7c255acbc 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -29,7 +29,7 @@
 import org.junit.Test;
 
 public class DefaultsTest {
-    private static final String[] FAMILIES = { "GEN  ", "ASL  ", "AL   ", "DOJO ", "OASIS", "W3CD ", "W3C  ", "GPL1 ",
+    private static final String[] FAMILIES = { "BSD-3", "GEN  ", "ASL  ", "AL   ", "DOJO ", "OASIS", "W3CD ", "W3C  ", "GPL1 ",
             "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "ILLUM", "TMF  " };
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index e3a718b55..51ca086ca 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -115,21 +115,24 @@ private static String getElementsReports(String pElementsPath) {
     public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         Defaults.builder().build();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        LicenseCollectionMatcher licenseMatcher = new LicenseCollectionMatcher(Defaults.getLicenses());
+        
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.setApproveDefaultLicenses(true);
-        configuration.addLicense(licenseMatcher);
+        configuration.addLicenses(Defaults.getLicenses());
+        configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
         configuration.setOut(out);
         Reporter.report(configuration);
 
         String result = out.toString();
+        System.out.println( result );
         assertTrue("'Generated at' is present in " + result, result.startsWith(HEADER));
 
         final int generatedAtLineEnd = result.indexOf(NL, HEADER.length());
 
         final String elementsReports = getElementsReports(elementsPath);
+        
+        System.err.println( elementsReports );
         assertEquals("Report created was: " + result, elementsReports,
                 result.substring(generatedAtLineEnd + NL.length()));
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index e96625358..be1680f5e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -29,7 +29,7 @@
 public class ConfigurationReaderTest {
 
     private static String[] FAMILIES = { "GEN  ", "AL   ", "ASL  ", "TMF  ", "DOJO ", "OASIS", "W3CD ", "W3C  ",
-            "GPL1 ", "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "ILLUM" };
+            "GPL1 ", "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "ILLUM", "BSD-3" };
 
     @Test
     public void readDefault() {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index b5176295b..1c5d08291 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -18,29 +18,23 @@
  */
 package org.apache.rat.policy;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+
 import org.apache.rat.Defaults;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.api.MetaData.Datum;
 import org.apache.rat.document.MockLocation;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
 public class DefaultPolicyTest {
-    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 12;
-
-    private static final ILicenseFamily JUST_A_TEST_LIC_FAMILY = mock(ILicenseFamily.class);
-    static {
-        when(JUST_A_TEST_LIC_FAMILY.getFamilyName()).thenReturn("justATest" );
-        
-    }
+    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 15;
 
     private Document subject;
     private DefaultPolicy policy;
@@ -48,108 +42,119 @@ public class DefaultPolicyTest {
     @Before
     public void setUp() throws Exception {
         Defaults.builder().build();
-        policy = new DefaultPolicy();
+        policy = new DefaultPolicy(Defaults.getLicenseFamilies());
         subject = new MockLocation("subject");
     }
 
-    @SuppressWarnings("boxing") // OK in test code
     private void assertApproval(boolean pApproved) {
-        assertEquals(pApproved, MetaData.RAT_APPROVED_LICENSE_VALUE_TRUE.equals(subject.getMetaData().value(MetaData.RAT_URL_APPROVED_LICENSE)));
+        assertEquals(pApproved, MetaData.RAT_APPROVED_LICENSE_VALUE_TRUE
+                .equals(subject.getMetaData().value(MetaData.RAT_URL_APPROVED_LICENSE)));
+    }
+
+    private void setMetadata(ILicenseFamily family) {
+        subject.getMetaData().add(new Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, family.getFamilyName()));
+        subject.getMetaData().add(new Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, family.getFamilyCategory()));
     }
 
     @Test
-    public void testALFamily() throws Exception {
+    public void testCount() {
         assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0);
+    }
+
+    @Test
+    public void testALFamily() throws Exception {
+        setMetadata(new SimpleLicenseFamily("AL", "Apache License Version 2.0"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testOASISFamily() throws Exception {
-        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE);
+        setMetadata(new SimpleLicenseFamily("OASIS", "OASIS Open License"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testW3CFamily() throws Exception {
-        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_SOFTWARE_COPYRIGHT);
+        setMetadata(new SimpleLicenseFamily("W3C", "W3C Software Copyright"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testW3CDocFamily() throws Exception {
-        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT);
+        setMetadata(new SimpleLicenseFamily("W3CD", "W3C Document Copyright"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testModifiedBSDFamily() throws Exception {
-        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE);
+        setMetadata(new SimpleLicenseFamily("TMF", "The Telemanagement Forum License"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testMITFamily() throws Exception {
-        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MIT);
+        setMetadata(new SimpleLicenseFamily("MIT", "The MIT License"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testCDDL1Family() throws Exception {
-        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1);
+        setMetadata(new SimpleLicenseFamily("CDDL1", "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testUnknownFamily() throws Exception {
-        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN);
+        setMetadata(new SimpleLicenseFamily("?????", "Unknown document"));
         policy.analyse(subject);
         assertApproval(false);
     }
 
     @Test
     public void testNullAsMarkerOfDefaults() {
-        // with defaults
-        for (DefaultPolicy policy : new DefaultPolicy[]{//
-                new DefaultPolicy(), //
-                new DefaultPolicy(new ArrayList<ILicenseFamily>(0), true),//
-                new DefaultPolicy(new ILicenseFamily[]{}, true),
-        }) {
-            assertEquals("Did you add new license defaults?", NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
-        }
-
         // without defaults and no additions == 0
-        for (DefaultPolicy policy : new DefaultPolicy[]{//
-                new DefaultPolicy(new ArrayList<ILicenseFamily>(0), false),//
-                new DefaultPolicy(new ILicenseFamily[]{}, false),
-        }) {
+        for (DefaultPolicy policy : new DefaultPolicy[] { //
+                new DefaultPolicy(new ArrayList<ILicenseFamily>(0)), //
+                new DefaultPolicy(new ILicenseFamily[] {}), }) {
             assertEquals(0, policy.getApprovedLicenseNames().size());
         }
     }
 
     @Test
     public void testAddNewApprovedLicenseAndDefaults() {
-        assertEquals("justATest", new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().first().getFamilyName());
-        assertEquals("Did not properly merge approved licenses with default", 1, new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().size());
+        ILicenseFamily testingFamily = new SimpleLicenseFamily("test", "Testing License Family");
+        setMetadata(testingFamily);
+        policy.analyse(subject);
+        assertApproval(false);
+
+        policy.add(testingFamily);
+        assertNotNull("Did not properly add ILicenseFamily",
+                ILicenseFamily.search(testingFamily, policy.getApprovedLicenseNames()));
+        policy.analyse(subject);
+        assertApproval(true);
     }
 
     @Test
     public void testAddNewApprovedLicenseNoDefaults() {
-        assertEquals("justATest", new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, false).getApprovedLicenseNames().first().getFamilyName());
-        assertEquals("Did not properly merge approved licenses with default", NUMBER_OF_DEFAULT_ACCEPTED_LICENSES + 1, new DefaultPolicy(new ILicenseFamily[]{JUST_A_TEST_LIC_FAMILY}, true).getApprovedLicenseNames().size());
+        policy = new DefaultPolicy();
+        assertEquals(0, policy.getApprovedLicenseNames().size());
+        ILicenseFamily testingFamily = new SimpleLicenseFamily("test", "Testing License Family");
+        setMetadata(testingFamily);
+        policy.analyse(subject);
+        assertApproval(false);
+
+        policy.add(testingFamily);
+        assertEquals(1, policy.getApprovedLicenseNames().size());
+        assertNotNull("Did not properly add ILicenseFamily",
+                ILicenseFamily.search(testingFamily, policy.getApprovedLicenseNames()));
+        policy.analyse(subject);
+        assertApproval(true);
     }
 }

From 31446b6732c1c19082dda5dad37751965a8c7b8c Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Fri, 15 Sep 2023 09:31:28 +0200
Subject: [PATCH 086/299] all tests working

---
 .../configuration/IHeaderMatcherProxy.java    |  49 ++++
 .../configuration/ILicenseFamilyProxy.java    |  27 ++
 .../rat/configuration/ILicenseProxy.java      |  75 ++++++
 .../configuration/XMLConfigurationReader.java |   1 -
 .../test/java/org/apache/rat/ReportTest.java  | 111 +--------
 .../java/org/apache/rat/ReporterTest.java     | 230 ++++++++++++++++++
 6 files changed, 382 insertions(+), 111 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
new file mode 100644
index 000000000..f865428fe
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
@@ -0,0 +1,49 @@
+package org.apache.rat.configuration;
+
+import java.util.Map;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+class IHeaderMatcherProxy implements IHeaderMatcher {
+    private final String proxyId;
+    private IHeaderMatcher wrapped;
+    private Map<String,IHeaderMatcher> matchers;
+    
+    public static IHeaderMatcher create(String proxyId, Map<String,IHeaderMatcher> matchers) {
+        IHeaderMatcher result = matchers.get(proxyId);
+        return result != null ? result : new IHeaderMatcherProxy(proxyId, matchers);
+    }
+
+    private IHeaderMatcherProxy(String proxyId, Map<String,IHeaderMatcher> matchers) {
+        this.proxyId = proxyId;
+        this.matchers = matchers;
+    }
+
+    private void checkProxy() {
+        if (wrapped == null) {
+            wrapped = matchers.get(proxyId);
+            if (wrapped == null) {
+                throw new IllegalStateException(String.format("%s is not a valid matcher id", proxyId)); 
+            }
+            matchers = null;
+        }
+    }
+
+    @Override
+    public String getId() {
+        checkProxy();
+        return wrapped.getId();
+    }
+
+    @Override
+    public void reset() {
+        checkProxy();
+        wrapped.reset();
+    }
+
+    @Override
+    public boolean matches(String line) {
+        checkProxy();
+        return wrapped.matches(line);
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
new file mode 100644
index 000000000..165723c99
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
@@ -0,0 +1,27 @@
+package org.apache.rat.configuration;
+
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+class ILicenseFamilyProxy implements ILicenseFamily {
+    private final ILicense wrapped;
+
+    static public ILicenseFamily create(ILicense license) {
+        return (license instanceof ILicenseProxy) ? new ILicenseFamilyProxy(license) : license.getLicenseFamily();
+    }
+    
+    private ILicenseFamilyProxy(ILicense license) {
+        this.wrapped = license;
+    }
+
+    @Override
+    public String getFamilyName() {
+        return wrapped.getLicenseFamily().getFamilyName();
+    }
+
+    @Override
+    public String getFamilyCategory() {
+        return wrapped.getLicenseFamily().getFamilyCategory();
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
new file mode 100644
index 000000000..4dfa48321
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
@@ -0,0 +1,75 @@
+package org.apache.rat.configuration;
+
+import java.util.SortedSet;
+
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+class ILicenseProxy implements ILicense {
+    private final String proxyId;
+    private ILicense wrapped;
+    private final SortedSet<ILicense> licenses;
+
+    static public ILicense create(String proxyId, SortedSet<ILicense> licenses) {
+        ILicense result = ILicense.search(proxyId, licenses);
+        if (result == null) {
+            result = new ILicenseProxy(proxyId, licenses);
+        }
+        return result;
+    }
+
+    ILicenseProxy(String proxyId, SortedSet<ILicense> licenses) {
+        this.proxyId = proxyId;
+        this.licenses = licenses;
+    }
+
+    private void checkProxy() {
+        if (wrapped == null) {
+            wrapped = ILicense.search(proxyId, licenses);
+            if (wrapped == null) {
+                throw new IllegalStateException(String.format("%s is not a valid family category", proxyId));
+            }
+        }
+    }
+
+    @Override
+    public ILicenseFamily getLicenseFamily() {
+        checkProxy();
+        return wrapped.getLicenseFamily();
+    }
+
+    @Override
+    public String getNotes() {
+        checkProxy();
+        return wrapped.getNotes();
+    }
+
+    @Override
+    public ILicense derivedFrom() {
+        checkProxy();
+        return wrapped.derivedFrom();
+    }
+
+    @Override
+    public String getId() {
+        checkProxy();
+        return wrapped.getId();
+    }
+
+    @Override
+    public void reset() {
+        checkProxy();
+        wrapped.reset();
+    }
+
+    @Override
+    public boolean matches(String line) {
+        checkProxy();
+        return wrapped.matches(line);
+    }
+
+    @Override
+    public int compareTo(ILicense arg0) {
+        return ILicense.getComparator().compare(this, arg0);
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 97e680d36..b59e149e9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -173,7 +173,6 @@ public void read(URL... urls) {
                 throw new ConfigurationException("Unable to read url: " + url, e);
             }
         }
-
     }
 
     private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 51ca086ca..099f3722a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -18,129 +18,20 @@
  */
 package org.apache.rat;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.rat.Defaults.LicenseCollectionMatcher;
-import org.apache.rat.test.utils.Resources;
-import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Test;
 
 public class ReportTest {
-    private static final String NL = System.getProperty("line.separator");
-    private static final String PARAGRAPH = "*****************************************************";
-    private static final String FILE_PARAGRAPH = "=====================================================";
-
-    private static final String HEADER = NL + PARAGRAPH + NL + //
-            "Summary" + NL + //
-            "-------" + NL + //
-            "Generated at: ";
-
-    private static String getElementsReports(String pElementsPath) {
-        return NL + "Notes: 2" + NL + //
-                "Binaries: 2" + NL + //
-                "Archives: 1" + NL + //
-                "Standards: 7" + NL + //
-                "" + NL + //
-                "Apache Licensed: 4" + NL + //
-                "Generated Documents: 0" + NL + //
-                "" + NL + //
-                "JavaDocs are generated, thus a license header is optional." + NL + //
-                "Generated files do not require license headers." + NL + //
-                "" + NL + //
-                "2 Unknown Licenses" + NL + //
-                "" + NL + //
-                PARAGRAPH + NL + //
-                "" + NL + //
-                "Files with unapproved licenses:" + NL + //
-                "" + NL + //
-                "  " + pElementsPath + "/Source.java" + NL + //
-                "  " + pElementsPath + "/sub/Empty.txt" + NL + //
-                "" + NL + //
-                PARAGRAPH + NL + //
-                "" + NL + //
-                "Archives:" + NL + //
-                "" + NL + //
-                " + " + pElementsPath + "/dummy.jar" + NL + //
-                " " + NL + //
-                PARAGRAPH + NL + //
-                "  Files with Apache License headers will be marked AL" + NL + //
-                "  Binary files (which do not require any license headers) will be marked B" + NL + //
-                "  Compressed archives will be marked A" + NL + //
-                "  Notices, licenses etc. will be marked N" + NL + //
-                "  MIT   " + pElementsPath + "/ILoggerFactory.java" + NL + //
-                "  B     " + pElementsPath + "/Image.png" + NL + //
-                "  N     " + pElementsPath + "/LICENSE" + NL + //
-                "  N     " + pElementsPath + "/NOTICE" + NL + //
-                " !????? " + pElementsPath + "/Source.java" + NL + //
-                "  AL    " + pElementsPath + "/Text.txt" + NL + //
-                "  AL    " + pElementsPath + "/TextHttps.txt" + NL + //
-                "  AL    " + pElementsPath + "/Xml.xml" + NL + //
-                "  AL    " + pElementsPath + "/buildr.rb" + NL + //
-                "  A     " + pElementsPath + "/dummy.jar" + NL + //
-                "  B     " + pElementsPath + "/plain.json" + NL + //
-                " !????? " + pElementsPath + "/sub/Empty.txt" + NL + //
-                " " + NL + //
-                PARAGRAPH + NL + //
-                NL + //
-                " Printing headers for text files without a valid license header..." + NL + //
-                " " + NL + //
-                FILE_PARAGRAPH + NL + //
-                "== File: " + pElementsPath + "/Source.java" + NL + //
-                FILE_PARAGRAPH + NL + //
-                "package elements;" + NL + //
-                "" + NL + //
-                "/*" + NL + //
-                " * This file does intentionally *NOT* contain an AL license header," + NL + //
-                " * because it is used in the test suite." + NL + //
-                " */" + NL + //
-                "public class Source {" + NL + //
-                "" + NL + //
-                "}" + NL + //
-                "" + NL + //
-                FILE_PARAGRAPH + NL + //
-                "== File: " + pElementsPath + "/sub/Empty.txt" + NL + //
-                FILE_PARAGRAPH + NL + //
-                NL;
-    }
-
-    @Test
-    public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
-        Defaults.builder().build();
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        
-        final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.addLicenses(Defaults.getLicenses());
-        configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
-        configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
-        configuration.setOut(out);
-        Reporter.report(configuration);
-
-        String result = out.toString();
-        System.out.println( result );
-        assertTrue("'Generated at' is present in " + result, result.startsWith(HEADER));
-
-        final int generatedAtLineEnd = result.indexOf(NL, HEADER.length());
-
-        final String elementsReports = getElementsReports(elementsPath);
-        
-        System.err.println( elementsReports );
-        assertEquals("Report created was: " + result, elementsReports,
-                result.substring(generatedAtLineEnd + NL.length()));
-    }
-
     @Test
     public void parseExclusionsForCLIUsage() throws IOException {
         final FilenameFilter filter = Report
                 .parseExclusions(Arrays.asList("", " # foo/bar", "foo", "##", " ./foo/bar"));
         assertNotNull(filter);
     }
+
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
new file mode 100644
index 000000000..f9de0aff0
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -0,0 +1,230 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.util.regex.Pattern;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.report.xml.XmlUtils;
+import org.apache.rat.test.utils.Resources;
+import org.apache.rat.walker.DirectoryWalker;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class ReporterTest {
+
+    private Node checkNode(Document doc, XPath xpath, String resource, String family, String approval, String type)
+            throws Exception {
+
+        Node root = getNode(doc, xpath, String.format("/rat-report/resource[@name='%s']", resource));
+        if (family != null) {
+            getNode(root, xpath, String.format("header-type[@name='%s']", ILicenseFamily.makeCategory(family)));
+            getNode(root, xpath, "license-family[@name]");
+            if (family.equals("?????")) {
+                getNode(root, xpath, "header-sample");
+            }
+        }
+        getNode(root, xpath, String.format("license-approval[@name='%s']", approval));
+        getNode(root, xpath, String.format("type[@name='%s']", type));
+        return root;
+    }
+
+    private Node getNode(Object source, XPath xPath, String xpath) throws XPathExpressionException {
+        NodeList nodeList = (NodeList) xPath.compile(xpath).evaluate(source, XPathConstants.NODESET);
+        assertEquals("Could not find " + xpath, 1, nodeList.getLength());
+        return nodeList.item(0);
+    }
+
+    @Test
+    public void xmlReportTest() throws Exception {
+        Defaults.builder().build();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
+        final ReportConfiguration configuration = new ReportConfiguration();
+        configuration.setStyleReport(false);
+        configuration.addLicenses(Defaults.getLicenses());
+        configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
+        configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
+        configuration.setOut(out);
+        Reporter.report(configuration);
+        Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
+        XPath xPath = XPathFactory.newInstance().newXPath();
+
+        getNode(doc, xPath, "/rat-report[@timestamp]");
+
+        checkNode(doc, xPath, "src/test/resources/elements/ILoggerFactory.java", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/Image.png", null, "false", "binary");
+        checkNode(doc, xPath, "src/test/resources/elements/LICENSE", null, "false", "notice");
+        checkNode(doc, xPath, "src/test/resources/elements/NOTICE", null, "false", "notice");
+        checkNode(doc, xPath, "src/test/resources/elements/Source.java", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/Text.txt", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/TextHttps.txt", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/Xml.xml", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/buildr.rb", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/dummy.jar", null, "false", "archive");
+        checkNode(doc, xPath, "src/test/resources/elements/plain.json", null, "false", "binary");
+        checkNode(doc, xPath, "src/test/resources/elements/sub/Empty.txt", "?????", "false", "standard");
+
+        NodeList nodeList = (NodeList) xPath.compile("/rat-report/resource").evaluate(doc, XPathConstants.NODESET);
+        assertEquals(12, nodeList.getLength());
+    }
+
+    private XPath xPath = XPathFactory.newInstance().newXPath();
+
+    private static final String NL = System.getProperty("line.separator");
+    private static final String PARAGRAPH = "*****************************************************";
+    private static final String FILE_PARAGRAPH = "=====================================================";
+
+    private static final String HEADER = NL + PARAGRAPH + NL + //
+            "Summary" + NL + //
+            "-------" + NL + //
+            "Generated at: ";
+
+    private static String getElementsReports(String pElementsPath) {
+        return NL + "Notes: 2" + NL + //
+                "Binaries: 2" + NL + //
+                "Archives: 1" + NL + //
+                "Standards: 7" + NL + //
+                "" + NL + //
+                "Apache Licensed: 4" + NL + //
+                "Generated Documents: 0" + NL + //
+                "" + NL + //
+                "JavaDocs are generated, thus a license header is optional." + NL + //
+                "Generated files do not require license headers." + NL + //
+                "" + NL + //
+                "2 Unknown Licenses" + NL + //
+                "" + NL + //
+                PARAGRAPH + NL + //
+                "" + NL + //
+                "Files with unapproved licenses:" + NL + //
+                "" + NL + //
+                "  " + pElementsPath + "/Source.java" + NL + //
+                "  " + pElementsPath + "/sub/Empty.txt" + NL + //
+                "" + NL + //
+                PARAGRAPH + NL + //
+                "" + NL + //
+                "Archives:" + NL + //
+                "" + NL + //
+                " + " + pElementsPath + "/dummy.jar" + NL + //
+                " " + NL + //
+                PARAGRAPH + NL + //
+                "  Files with Apache License headers will be marked AL" + NL + //
+                "  Binary files (which do not require any license headers) will be marked B" + NL + //
+                "  Compressed archives will be marked A" + NL + //
+                "  Notices, licenses etc. will be marked N" + NL + //
+                "  MIT   " + pElementsPath + "/ILoggerFactory.java" + NL + //
+                "  B     " + pElementsPath + "/Image.png" + NL + //
+                "  N     " + pElementsPath + "/LICENSE" + NL + //
+                "  N     " + pElementsPath + "/NOTICE" + NL + //
+                " !????? " + pElementsPath + "/Source.java" + NL + //
+                "  AL    " + pElementsPath + "/Text.txt" + NL + //
+                "  AL    " + pElementsPath + "/TextHttps.txt" + NL + //
+                "  AL    " + pElementsPath + "/Xml.xml" + NL + //
+                "  AL    " + pElementsPath + "/buildr.rb" + NL + //
+                "  A     " + pElementsPath + "/dummy.jar" + NL + //
+                "  B     " + pElementsPath + "/plain.json" + NL + //
+                " !????? " + pElementsPath + "/sub/Empty.txt" + NL + //
+                " " + NL + //
+                PARAGRAPH + NL + //
+                NL + //
+                " Printing headers for text files without a valid license header..." + NL + //
+                " " + NL + //
+                FILE_PARAGRAPH + NL + //
+                "== File: " + pElementsPath + "/Source.java" + NL + //
+                FILE_PARAGRAPH + NL + //
+                "package elements;" + NL + //
+                "" + NL + //
+                "/*" + NL + //
+                " * This file does intentionally *NOT* contain an AL license header," + NL + //
+                " * because it is used in the test suite." + NL + //
+                " */" + NL + //
+                "public class Source {" + NL + //
+                "" + NL + //
+                "}" + NL + //
+                "" + NL + //
+                FILE_PARAGRAPH + NL + //
+                "== File: " + pElementsPath + "/sub/Empty.txt" + NL + //
+                FILE_PARAGRAPH + NL + //
+                NL;
+    }
+
+    @Test
+    public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
+        Defaults.builder().build();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
+        final ReportConfiguration configuration = new ReportConfiguration();
+        configuration.addLicenses(Defaults.getLicenses());
+        configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
+        configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
+        configuration.setOut(out);
+        Reporter.report(configuration);
+
+        String document = out.toString();
+        // System.out.println(document);
+        assertTrue("'Generated at' is present in " + document, document.startsWith(HEADER));
+
+        // final int generatedAtLineEnd = document.indexOf(NL, HEADER.length());
+        find("^Notes: 2$", document);
+        find("^Binaries: 2$", document);
+        find("^Archives: 1$", document);
+        find("^Standards: 7$", document);
+        find("^Apache Licensed: 6$", document);
+        find("^Generated Documents: 0$", document);
+        find("^1 Unknown Licenses$", document);
+        find("^Files with unapproved licenses:\\s+" + "src/test/resources/elements/Image.png\\s+"
+                + "src/test/resources/elements/LICENSE\\s+" + "src/test/resources/elements/NOTICE\\s+"
+                + "src/test/resources/elements/dummy.jar\\s+" + "src/test/resources/elements/plain.json\\s+"
+                + "src/test/resources/elements/sub/Empty.txt\\s", document);
+        find("^Archives:\\s+" + "\\+ src/test/resources/elements/dummy.jar\\s*", document);
+        find("AL\\s+src/test/resources/elements/ILoggerFactory.java", document);
+        find("!B\\s+src/test/resources/elements/Image.png", document);
+        find("!N\\s+src/test/resources/elements/LICENSE", document);
+        find("!N\\s+src/test/resources/elements/NOTICE", document);
+        find("AL\\s+src/test/resources/elements/Source.java", document);
+        find("AL\\s+src/test/resources/elements/Text.txt", document);
+        find("AL\\s+src/test/resources/elements/TextHttps.txt", document);
+        find("AL\\s+src/test/resources/elements/Xml.xml", document);
+        find("AL\\s+src/test/resources/elements/buildr.rb", document);
+        find("!A\\s+src/test/resources/elements/dummy.jar", document);
+        find("!B\\s+src/test/resources/elements/plain.json", document);
+        find("!\\Q?????\\E src/test/resources/elements/sub/Empty.txt", document);
+        find("== File: src/test/resources/elements/sub/Empty.txt", document);
+    }
+
+    private void find(String pattern, String document) {
+        assertTrue(String.format("Could not find '%s'", pattern),
+                Pattern.compile(pattern, Pattern.MULTILINE).matcher(document).find());
+    }
+}

From 465853090d0d458f3a45bdb455bbe4354e5fe479 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 17 Sep 2023 11:50:26 +0200
Subject: [PATCH 087/299] fixed some ant tasks

---
 apache-rat-core/architecture_notes.md         |  16 +
 apache-rat-core/pom.xml                       | 225 ++++++------
 .../apache/rat/ConfigurationException.java    |  18 +
 .../main/java/org/apache/rat/Defaults.java    | 133 +++++---
 .../src/main/java/org/apache/rat/Report.java  |  52 +--
 .../org/apache/rat/ReportConfiguration.java   |  72 +++-
 .../main/java/org/apache/rat/Reporter.java    |   5 +-
 .../matchers/AbstractHeaderMatcher.java       |  18 +
 .../matchers/AbstractMatcherContainer.java    |  18 +
 .../rat/analysis/matchers/AndMatcher.java     |  18 +
 .../rat/analysis/matchers/NotMatcher.java     |  18 +
 .../rat/analysis/matchers/OrMatcher.java      |  18 +
 .../analysis/matchers/SimpleRegexMatcher.java |   2 +-
 .../configuration/IHeaderMatcherProxy.java    |  18 +
 .../configuration/ILicenseFamilyProxy.java    |  22 +-
 .../rat/configuration/ILicenseProxy.java      |  20 +-
 .../rat/configuration/LicenseReader.java      |   4 +-
 .../org/apache/rat/configuration/Readers.java |  13 +-
 .../configuration/XMLConfigurationReader.java |  45 +--
 .../java/org/apache/rat/license/ILicense.java |  18 +
 .../org/apache/rat/license/SimpleLicense.java |  18 +
 .../java/org/apache/rat/DefaultsTest.java     |   4 +-
 .../java/org/apache/rat/ReporterTest.java     |  82 +----
 .../analysis/license/AbstractLicenseTest.java |   8 +-
 .../rat/analysis/matchers/NotMatcherTest.java |  18 +
 .../apache/rat/policy/DefaultPolicyTest.java  |   4 +-
 .../rat/anttasks/FullTextLicenseMatcher.java  |  76 -----
 .../java/org/apache/rat/anttasks/Report.java  | 319 ++++++++----------
 .../anttasks/ResourceCollectionContainer.java |  19 +-
 .../rat/anttasks/SubstringLicenseMatcher.java |  78 -----
 .../org/apache/rat/anttasks/antlib.xml        |  54 ---
 .../org/apache/rat/anttasks/ReportTest.java   |  58 ++--
 .../test/java/org/example/LicenseFamily.java  |  26 --
 .../src/test/java/org/example/Matcher.java    |  40 ---
 .../test/resources/antunit/customMatcher.xml  |  21 ++
 .../test/resources/antunit/report-junit.xml   |  13 +-
 36 files changed, 786 insertions(+), 805 deletions(-)
 delete mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java
 delete mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java
 delete mode 100644 apache-rat-tasks/src/test/java/org/example/LicenseFamily.java
 delete mode 100644 apache-rat-tasks/src/test/java/org/example/Matcher.java
 create mode 100644 apache-rat-tasks/src/test/resources/antunit/customMatcher.xml

diff --git a/apache-rat-core/architecture_notes.md b/apache-rat-core/architecture_notes.md
index 4bb3ad3da..dfbb2b0b5 100644
--- a/apache-rat-core/architecture_notes.md
+++ b/apache-rat-core/architecture_notes.md
@@ -1,3 +1,19 @@
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
 # RAT Architecture notes.
 
 ## Source definition
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index bf212bdc7..dfa16be2f 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -23,124 +23,125 @@ permissions and
   limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-project</artifactId>
-        <version>0.16-SNAPSHOT</version>
-    </parent>
-    <artifactId>apache-rat-core</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Creadur Rat::Core</name>
-    <description>The core functionality, shared by the Ant tasks
-        and the Maven plugin.</description>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.rat</groupId>
+		<artifactId>apache-rat-project</artifactId>
+		<version>0.16-SNAPSHOT</version>
+	</parent>
+	<artifactId>apache-rat-core</artifactId>
+	<packaging>jar</packaging>
+	<name>Apache Creadur Rat::Core</name>
+	<description>The core functionality, shared by the Ant tasks
+		and the Maven plugin.</description>
 
-    <build>
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/filtered-resources</directory>
-            </resource>
-            <resource>
-                <directory>..</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>RELEASE_NOTES.txt</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.rat</groupId>
-                    <artifactId>apache-rat-plugin</artifactId>
-                    <configuration>
-                        <excludes>
-                            <!-- These files have bad license headers because
+	<build>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/filtered-resources</directory>
+			</resource>
+			<resource>
+				<directory>..</directory>
+				<targetPath>META-INF</targetPath>
+				<includes>
+					<include>RELEASE_NOTES.txt</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.rat</groupId>
+					<artifactId>apache-rat-plugin</artifactId>
+					<configuration>
+						<excludes>
+							<!-- These files have bad license headers because
                             they are used to test bad license headers -->
-                            <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
-                            <exclude>src/test/resources/oasis/bad/*.*</exclude>
-                            <!-- These files does not have license headers
+							<exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
+							<exclude>src/test/resources/oasis/bad/*.*</exclude>
+							<!-- These files does not have license headers
                             because they are used to test license headers -->
-                            <exclude>src/test/resources/elements/Source.java</exclude>
-                            <exclude>
-                                src/test/resources/elements/ILoggerFactory.java</exclude>
-                            <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
-                            <exclude>src/test/resources/violations/bad.txt</exclude>
-                            <exclude>src/test/resources/violations/FilterTest.cs</exclude>
-                            <!-- used to test for binary files; does not work on
+							<exclude>src/test/resources/elements/Source.java</exclude>
+							<exclude>
+								src/test/resources/elements/ILoggerFactory.java</exclude>
+							<exclude>src/test/resources/elements/sub/Empty.txt</exclude>
+							<exclude>src/test/resources/violations/bad.txt</exclude>
+							<exclude>src/test/resources/violations/FilterTest.cs</exclude>
+							<!-- used to test for binary files; does not work on
                             UTF-8 (e.g. MacOSX) -->
-                            <exclude>src/test/resources/binaries/Image-png.not</exclude>
-                            <!-- These files have a valid license header that
+							<exclude>src/test/resources/binaries/Image-png.not</exclude>
+							<!-- These files have a valid license header that
                             was not recognised by older rat versions -->
-                            <exclude>src/test/resources/elements/TextHttps.txt</exclude>
-                            <!-- Remove after using RAT 0.14 for dog-fooding
+							<exclude>src/test/resources/elements/TextHttps.txt</exclude>
+							<!-- Remove after using RAT 0.14 for dog-fooding
                             ..... older versions do not ignore JSON -->
-                            <exclude>src/test/resources/elements/plain.json</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+							<exclude>src/test/resources/elements/plain.json</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.rat</groupId>
-            <artifactId>apache-rat-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <exclusions>
-                <!-- Not actually used (yet) so no point including it -->
-                <exclusion>
-                    <groupId>org.tukaani</groupId>
-                    <artifactId>xz</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-configuration2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-core</artifactId>
-          <scope>test</scope>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.rat</groupId>
+			<artifactId>apache-rat-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-collections4</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<exclusions>
+				<!-- Not actually used (yet) so no point including it -->
+				<exclusion>
+					<groupId>org.tukaani</groupId>
+					<artifactId>xz</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-configuration2</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
index 3c6755dbb..01e27d1ee 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat;
 
 public class ConfigurationException extends RuntimeException {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index b7f913d99..bc720e2b9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -22,20 +22,14 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.Readers;
 import org.apache.rat.license.ILicense;
@@ -46,31 +40,39 @@
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
  */
 public class Defaults {
-    public enum Filter { all, approved, none };
-    
+    public enum Filter {
+        all, approved, none
+    };
+
     private static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.xml");
+    public static final String PLAIN_STYLESHEET = "org/apache/rat/plain-rat.xsl";
+    public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
+
+    private final Filter approvalFilter;
+    private final SortedSet<ILicense> licenses;
+    private final SortedSet<ILicenseFamily> licenseFamilies;
+    private final SortedSet<ILicenseFamily> approvedLicenseFamilies;
 
     /**
-     * no instances
+     * Builder constructs instances.
      */
-    private Defaults() {
+    private Defaults(Filter approvalFilter) {
+        this.approvalFilter = approvalFilter;
+        licenses = new TreeSet<>(ILicense.getComparator());
+        licenseFamilies = new TreeSet<>();
+        approvedLicenseFamilies = new TreeSet<>();
     }
 
-    private static Filter approvalFilter = Filter.approved;
-    private static SortedSet<ILicense> licenses = new TreeSet<>(ILicense.getComparator());
-    private static SortedSet<ILicenseFamily> licenseFamilies = new TreeSet<>();
-    private static SortedSet<ILicenseFamily> approvedLicenseFamilies = new TreeSet<>();
-
     public static Builder builder() {
         return new Builder();
     }
 
-    public static void clear() {
+    public void clear() {
         licenses.clear();
         licenseFamilies.clear();
     }
-    
-    private static void readConfigFiles(Collection<URL> urls) {
+
+    private void readConfigFiles(Collection<URL> urls) {
         for (URL url : urls) {
             LicenseReader reader = Readers.get(url);
             reader.add(url);
@@ -80,9 +82,6 @@ private static void readConfigFiles(Collection<URL> urls) {
         }
     }
 
-    public static final String PLAIN_STYLESHEET = "org/apache/rat/plain-rat.xsl";
-    public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
-
     public static InputStream getPlainStyleSheet() {
         return Defaults.class.getClassLoader().getResourceAsStream(Defaults.PLAIN_STYLESHEET);
     }
@@ -91,43 +90,40 @@ public static InputStream getUnapprovedLicensesStyleSheet() {
         return Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
     }
 
-    public static InputStream getDefaultStyleSheet() {
-        return getPlainStyleSheet();
-    }
-
-    public static ILicense createDefaultMatcher() {
-        return new LicenseCollectionMatcher(getLicenses());
+    public ILicense createDefaultMatcher() {
+        return getLicenses().isEmpty() ? null : new LicenseCollectionMatcher(getLicenses());
     }
 
     /**
-     * Returns the set of defined licenses unless filter is set to no-defaults.
-     * if no-defaults was set then an empty set is returned.
+     * Returns the set of defined licenses unless filter is set to no-defaults. if
+     * no-defaults was set then an empty set is returned.
+     * 
      * @return The set of defined licenses.
      */
-    public static SortedSet<ILicense> getLicenses() {
+    public SortedSet<ILicense> getLicenses() {
         switch (approvalFilter) {
-        case all :
+        case all:
         case approved:
             return Collections.unmodifiableSortedSet(licenses);
         case none:
-            default:
-        return Collections.emptySortedSet();
+        default:
+            return Collections.emptySortedSet();
         }
     }
 
-    public static Set<String> getLicenseNames() {
+    public Set<String> getLicenseNames() {
         return getLicenseFamilies().stream().map(ILicenseFamily::getFamilyName).collect(Collectors.toSet());
     }
 
-    public static SortedSet<ILicenseFamily> getLicenseFamilies() {
+    public SortedSet<ILicenseFamily> getLicenseFamilies() {
         switch (approvalFilter) {
         case all:
             return Collections.unmodifiableSortedSet(licenseFamilies);
         case approved:
             return Collections.unmodifiableSortedSet(approvedLicenseFamilies);
         case none:
-            default:
-        return Collections.emptySortedSet();
+        default:
+            return Collections.emptySortedSet();
         }
     }
 
@@ -140,47 +136,104 @@ public int compare(URL url1, URL url2) {
             }
         });
 
+        private Filter approvalFilter = Filter.approved;
+
         private Builder() {
             fileNames.add(DEFAULT_CONFIG_URL);
         }
 
+        /**
+         * Adds a URL defining the Licenses and which are appoved to the list of files
+         * to read.
+         * 
+         * @param url the URL to add
+         * @return this Builder for chaining
+         */
         public Builder add(URL url) {
             fileNames.add(url);
             return this;
         }
 
+        /**
+         * Adds a File defining the Licenses and which are appoved to the list of files
+         * to read.
+         * 
+         * @param fileName the name of the file to add
+         * @return this Builder for chaining
+         */
         public Builder add(String fileName) throws MalformedURLException {
             return add(new File(fileName));
         }
 
+        /**
+         * Adds a file defining the Licenses and which are appoved to the list of files
+         * to read.
+         * 
+         * @param file the File to add
+         * @return this Builder for chaining
+         */
         public Builder add(File file) throws MalformedURLException {
             return add(file.toURI().toURL());
         }
 
+        /**
+         * Removes a file from the list of files to process.
+         * 
+         * @param url the URL of the file to remove.
+         * @return this Builder for chaining
+         */
         public Builder remove(URL url) {
             fileNames.remove(url);
             return this;
         }
 
+        /**
+         * Removes a file from the list of files to process.
+         * 
+         * @param fileName the fileName of the file to remove.
+         * @return this Builder for chaining
+         */
         public Builder remove(String fileName) throws MalformedURLException {
             return remove(new File(fileName));
         }
 
+        /**
+         * Removes a file from the list of files to process.
+         * 
+         * @param file the File of the file to remove.
+         * @return this Builder for chaining
+         */
         public Builder remove(File file) throws MalformedURLException {
             return remove(file.toURI().toURL());
         }
 
+        /**
+         * Removes the default definitions.
+         * 
+         * @return this Builder for chaining
+         */
         public Builder noDefault() {
             return remove(DEFAULT_CONFIG_URL);
         }
-        
+
+        /**
+         * Set which files will be listed as approved.
+         * 
+         * @param filter the fileter type.
+         * @return this Builder for chaining
+         */
         public Builder setApprovalFilter(Filter filter) {
             approvalFilter = filter;
             return this;
         }
 
-        public void build() {
-            Defaults.readConfigFiles(fileNames);
+        /**
+         * Builds the defaults object.
+         */
+        public Defaults build() {
+            Defaults result = new Defaults(approvalFilter);
+            result.readConfigFiles(fileNames);
+            return result;
         }
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index b8924f06a..ef2d56708 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -29,6 +29,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.SortedSet;
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.cli.CommandLine;
@@ -46,6 +47,8 @@
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.walker.ArchiveWalker;
 import org.apache.rat.walker.DirectoryWalker;
@@ -98,6 +101,11 @@ public class Report {
      */
     private static final String LIST_LICENSE_FAMILIES = "list-approved-families";
     
+    /**
+     * Set unstyled XML output
+     */
+    private static final String XML="x";
+    
     /*
      * Format used for listing license families
      */
@@ -153,30 +161,21 @@ public static final void main(String[] args) throws Exception {
                     }
                 }
 
-                Defaults.Builder defaults = Defaults.builder();
+                Defaults.Builder defaultBuilder = Defaults.builder();
                 if (cl.hasOption(NO_DEFAULTS)) {
-                    defaults.setApprovalFilter(Defaults.Filter.none);
+                    defaultBuilder.setApprovalFilter(Defaults.Filter.none);
                 } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
-                    defaults.setApprovalFilter(Defaults.Filter.all);
+                    defaultBuilder.setApprovalFilter(Defaults.Filter.all);
                 } else {
-                    defaults.setApprovalFilter(Defaults.Filter.approved);
+                    defaultBuilder.setApprovalFilter(Defaults.Filter.approved);
                 }
                 if (cl.hasOption(LICENSES)) {
                     for (String fn : cl.getOptionValues(LICENSES)) {
-                        defaults.add(fn);
+                        defaultBuilder.add(fn);
                     }
                 }
-                defaults.build();
-                configuration.addLicense(Defaults.createDefaultMatcher());
-                configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
-                if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-                    listLicenseFamilies(System.out);
-                }
-                if (cl.hasOption(LIST_LICENSES)) {
-                    listLicenses(System.out);
-                }
 
-                if (cl.hasOption('x')) {
+                if (cl.hasOption(XML)) {
                     configuration.setStyleReport(false);
                 } else {
                     configuration.setStyleReport(true);
@@ -194,29 +193,38 @@ public static final void main(String[] args) throws Exception {
                         }
                     }
                 }
+                Defaults defaults = defaultBuilder.build();
+                configuration.setFrom(defaults);;
                 configuration.setReportable(getDirectory(args[0], configuration));
                 configuration.validate(s -> System.err.println(s));
+                
+                if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
+                    listLicenseFamilies(defaults.getLicenseFamilies(), System.out);
+                }
+                if (cl.hasOption(LIST_LICENSES)) {
+                    listLicenses(defaults.getLicenses(), System.out);
+                }
+                
                 Reporter.report(configuration);
             }
         }
     }
 
-    private static void listLicenseFamilies(PrintStream out) {
+    private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, PrintStream out) {
         out.println("Families:");
-        Defaults.getLicenseFamilies()
-                .forEach(x -> out.format(LICENSE_FAMILY_FORMAT, x.getFamilyCategory(), x.getFamilyName()));
+        families.forEach(x -> out.format(LICENSE_FAMILY_FORMAT, x.getFamilyCategory(), x.getFamilyName()));
         out.println();
     }
 
-    private static void listLicenses(PrintStream out) {
+    private static void listLicenses(SortedSet<ILicense> licenses, PrintStream out) {
         out.println("Licenses:");
-        Defaults.getLicenses().stream().filter(lic -> lic instanceof BaseLicense).map(BaseLicense.class::cast)
+        licenses.stream().filter(lic -> lic instanceof BaseLicense).map(BaseLicense.class::cast)
                 .forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
                         lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
         out.println();
     }
 
-    static FilenameFilter parseExclusions(List<String> excludes) throws IOException {
+    static FilenameFilter parseExclusions(List<String> excludes) {
         final OrFileFilter orFilter = new OrFileFilter();
         int ignoredLines = 0;
         for (String exclude : excludes) {
@@ -296,7 +304,7 @@ private static Options buildOptions() {
 
         OptionGroup outputType = new OptionGroup();
 
-        Option xml = new Option("x", "xml", false, "Output the report in raw XML format.  Not compatible with -s");
+        Option xml = new Option(XML, "xml", false, "Output the report in raw XML format.  Not compatible with -s");
         outputType.addOption(xml);
 
         Option xslt = new Option(STYLESHEET_CLI, "stylesheet", true,
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 1176013dd..6796f5199 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -18,32 +18,41 @@
  */
 package org.apache.rat;
 
+import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.net.MalformedURLException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.function.Consumer;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.rat.Defaults.LicenseCollectionMatcher;
+import org.apache.rat.configuration.ILicenseFamilyProxy;
+import org.apache.rat.configuration.ILicenseProxy;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.policy.DefaultPolicy;
 import org.apache.rat.report.IReportable;
 
 /**
- * A configuration object is used by the front end to invoke the {@link Reporter}.
- * Basically, the sole purpose of the front ends is to create the configuration
- * and invoke the {@link Reporter}.
+ * A configuration object is used by the front end to invoke the
+ * {@link Reporter}. Basically, the sole purpose of the front ends is to create
+ * the configuration and invoke the {@link Reporter}.
  */
 public class ReportConfiguration implements AutoCloseable {
-    private List<ILicense> licenses = new ArrayList<>();
+    private static final Log logger = LogFactory.getLog(ReportConfiguration.class);
+    private SortedSet<ILicense> licenses = new TreeSet<>(ILicense.getComparator());
     private List<ILicenseFamily> approvedLicenseNames = new ArrayList<>();
     private boolean addingLicenses;
     private boolean addingLicensesForced;
@@ -62,7 +71,8 @@ public FilenameFilter getInputFileFilter() {
     }
 
     /**
-     * @param inputFileFilter the filter to filter the on disk files being evaluated.
+     * @param inputFileFilter the filter to filter the on disk files being
+     * evaluated.
      */
     public void setInputFileFilter(FilenameFilter inputFileFilter) {
         this.inputFileFilter = inputFileFilter;
@@ -83,7 +93,7 @@ public void setReportable(IReportable reportable) {
     }
 
     /**
-     * @return the XSLT style sheet to style the report with. 
+     * @return the XSLT style sheet to style the report with.
      */
     public InputStream getStyleSheet() {
         return styleSheet;
@@ -91,11 +101,36 @@ public InputStream getStyleSheet() {
 
     /**
      * 
-     * @param styleSheet the XSLT style sheet to style the report with. 
+     * @param styleSheet the XSLT style sheet to style the report with.
      */
     public void setStyleSheet(InputStream styleSheet) {
+        if (this.styleSheet != null) {
+            try {
+                this.styleSheet.close();
+            } catch (IOException e) {
+                logger.warn("Error closing earlier style sheet", e);
+            }
+        }
         this.styleSheet = styleSheet;
     }
+    
+    public void setFrom(Defaults defaults) {
+        addLicense(defaults.createDefaultMatcher());
+        addApprovedLicenseNames(defaults.getLicenseFamilies());
+        if (isStyleReport() && getStyleSheet() == null) {
+            setStyleSheet(Defaults.getPlainStyleSheet());
+        }
+    }
+
+    /**
+     * 
+     * @param styleSheet the XSLT style sheet to style the report with.
+     * @throws IOException
+     * @throws MalformedURLException
+     */
+    public void setStyleSheet(File styleSheet) throws MalformedURLException, IOException {
+        setStyleSheet(styleSheet.toURI().toURL().openStream());
+    }
 
     /**
      * 
@@ -137,7 +172,6 @@ public PrintWriter getWriter() {
         return new PrintWriter(new OutputStreamWriter(getOutput(), Charset.forName("UTF-8")));
     }
 
-
     /**
      * Returns the license that is the combination of all licenses being tested.
      *
@@ -148,7 +182,7 @@ public ILicense getLicense() {
             return null;
         }
         if (licenses.size() == 1) {
-            return licenses.get(0);
+            return licenses.first();
         }
         return new LicenseCollectionMatcher(licenses);
     }
@@ -159,7 +193,9 @@ public ILicense getLicense() {
      * @param license The license t oadd.
      */
     public void addLicense(ILicense license) {
-        this.licenses.add(license);
+        if (license != null) {
+            this.licenses.add(license);
+        }
     }
 
     /**
@@ -170,6 +206,7 @@ public void addLicense(ILicense license) {
     public void addLicenses(Collection<ILicense> licenses) {
         this.licenses.addAll(licenses);
     }
+
     /**
      *
      * @return the set of approved license names.
@@ -196,6 +233,11 @@ public void addApprovedLicenseName(ILicenseFamily approvedLicenseName) {
         approvedLicenseNames.add(approvedLicenseName);
     }
 
+    public void addApprovedLicenseName(String familyCategory) {
+        ILicense licenseProxy = ILicenseProxy.create(familyCategory, licenses);
+        addApprovedLicenseName(ILicenseFamilyProxy.create(licenseProxy));
+    }
+
     /**
      * Adds to the set of approved license names (convenience).
      *
@@ -267,6 +309,7 @@ public void setAddingLicenses(boolean addingLicenses) {
 
     /**
      * Validates that the configuration is valid.
+     * 
      * @param logger the system to write warnings to.
      */
     public void validate(Consumer<String> logger) {
@@ -274,13 +317,16 @@ public void validate(Consumer<String> logger) {
             throw new ConfigurationException("Reportable may not be null");
         }
         if (licenses.size() == 0) {
-            throw new ConfigurationException("You must specify at least one license" + " matcher");
+            throw new ConfigurationException("You must specify at least one license");
         }
         if (styleSheet != null && !isStyleReport()) {
-            logger.accept("Ignoring stylesheet '%s' because styling is not selected");
+            logger.accept("Ignoring stylesheet because styling is not selected");
+        }
+        if (styleSheet == null && isStyleReport()) {
+            throw new ConfigurationException("Stylesheet must be specified if report styling is selected");
         }
     }
-    
+
     public DefaultPolicy getDefaultPolicy() {
         return new DefaultPolicy(getApprovedLicenseNames());
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index b0a01a5bd..41db6f8e1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -79,10 +79,7 @@ private Reporter() {
      */
     public static ClaimStatistic report(ReportConfiguration configuration) throws Exception {
         if (configuration.getReportable() != null) {
-            if (configuration.isStyleReport()) {
-                if (configuration.getStyleSheet() == null) {
-                    configuration.setStyleSheet(Defaults.getDefaultStyleSheet());
-                }
+            if (configuration.isStyleReport()) {                
                 PipedReader reader = new PipedReader();
                 PipedWriter writer = new PipedWriter(reader);
                 ReportTransformer transformer = new ReportTransformer(configuration.getWriter(),
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
index a579b9c76..36864160c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import java.util.UUID;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index 0d0a610ba..d2bdbcfe2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import java.util.ArrayList;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
index f4063e085..53e81383f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import java.util.Collection;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
index ef2f4ebd4..6dabf42db 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import org.apache.rat.analysis.IHeaderMatcher;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
index 70baaa1ef..942f5f867 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import java.util.Collection;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
index 4b035b631..615370709 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
@@ -45,7 +45,7 @@ public SimpleRegexMatcher(String id, Pattern pattern) {
 
     @Override
     public boolean matches(String line) {
-        return line != null && pattern.matcher(line).matches();
+        return line != null && pattern.matcher(line).find();
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
index f865428fe..0dc0f5829 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.configuration;
 
 import java.util.Map;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
index 165723c99..824cae4bc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
@@ -1,15 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.configuration;
 
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-class ILicenseFamilyProxy implements ILicenseFamily {
+public class ILicenseFamilyProxy implements ILicenseFamily {
     private final ILicense wrapped;
 
     static public ILicenseFamily create(ILicense license) {
         return (license instanceof ILicenseProxy) ? new ILicenseFamilyProxy(license) : license.getLicenseFamily();
     }
-    
+
     private ILicenseFamilyProxy(ILicense license) {
         this.wrapped = license;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
index 4dfa48321..95ffab465 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.configuration;
 
 import java.util.SortedSet;
@@ -5,7 +23,7 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-class ILicenseProxy implements ILicense {
+public class ILicenseProxy implements ILicense {
     private final String proxyId;
     private ILicense wrapped;
     private final SortedSet<ILicense> licenses;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index 5d77be7f9..b3a72a21e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -45,12 +45,12 @@ public interface LicenseReader {
      * 
      * @return A collection of Base licenses.
      */
-    Collection<ILicense> readLicenses();
+    SortedSet<ILicense> readLicenses();
 
     /**
      * Reads the configuration and extracts the list of approved licenses.
      * 
      * @return The list of approved licenses.
      */
-    Collection<ILicenseFamily> approvedLicenseFamilies();
+    SortedSet<ILicenseFamily> approvedLicenseFamilies();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
index de059d57c..f639d3900 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -20,6 +20,7 @@
 
 import java.util.Map;
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
@@ -85,15 +86,21 @@ public class Readers {
      * license.id.spdx=
      */
 
-    private static Map<Format,LicenseReader> readers;
+    private static Map<Format,Class<? extends LicenseReader>> readers;
 
     static {
         readers = new HashMap<>();
-        readers.put( Format.XML, new XMLConfigurationReader());
+        readers.put( Format.XML, XMLConfigurationReader.class);
     }
 
     public static LicenseReader get(URL fileName) {
-        return readers.get(Format.fromName(fileName.getFile()));
+        Format fmt = Format.fromName(fileName.getFile());
+        try {
+            return readers.get(fmt).getDeclaredConstructor().newInstance();
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+                | NoSuchMethodException | SecurityException e) {
+            throw new IllegalStateException( "Can not construct reader for "+fmt, e);
+        }
     }
     
     private Readers() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index b59e149e9..380405410 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -28,16 +28,15 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.SortedSet;
 import java.util.Stack;
 import java.util.TreeSet;
 import java.util.function.Consumer;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -58,6 +57,7 @@
 import org.apache.rat.analysis.matchers.NotMatcher;
 import org.apache.rat.analysis.matchers.OrMatcher;
 import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
+import org.apache.rat.analysis.matchers.SimpleRegexMatcher;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
@@ -90,11 +90,11 @@
 public class XMLConfigurationReader implements LicenseReader {
 
     enum MatcherType {
-        text, copyright, spdx, any, all, matcher_ref, not
+        text, copyright, spdx, any, all, matcher_ref, not, regex
     };
-    
+
     enum AttributeName {
-        id, name, license_ref, refid, start, end, owner, resource, derived_from;
+        id, name, license_ref, refid, start, end, owner, resource, derived_from, exp;
     }
 
     private final static String ROOT = "rat-config";
@@ -103,14 +103,14 @@ enum AttributeName {
     private final static String APPROVED = "approved";
     private final static String FAMILY = "family";
     private final static String NOTE = "note";
-    
+
     private Document document;
     private final Element rootElement;
     private final Element licensesElement;
     private final Element approvedElement;
-    
+
     private final SortedSet<ILicense> licenses;
-    private final Map<String,IHeaderMatcher> matchers;
+    private final Map<String, IHeaderMatcher> matchers;
     private final SortedSet<ILicenseFamily> licenseFamilies;
     private final SortedSet<ILicenseFamily> approvedFamilies;
 
@@ -230,7 +230,7 @@ private List<IHeaderMatcher> readTextResource(String resourceName) {
             while (null != (txt = buffer.readLine())) {
                 txt = txt.trim();
                 if (StringUtils.isNotBlank(txt)) {
-                    matchers.add(createTextMatcher(null,txt));
+                    matchers.add(createTextMatcher(null, txt));
                 }
             }
             return matchers;
@@ -267,7 +267,8 @@ private IHeaderMatcher parseMatcher(Node matcherNode) {
             break;
 
         case copyright:
-            result = new CopyrightMatcher(id, attr.get(AttributeName.start), attr.get(AttributeName.end), attr.get(AttributeName.owner));
+            result = new CopyrightMatcher(id, attr.get(AttributeName.start), attr.get(AttributeName.end),
+                    attr.get(AttributeName.owner));
             break;
 
         case spdx:
@@ -286,10 +287,16 @@ private IHeaderMatcher parseMatcher(Node matcherNode) {
                 }
             });
             if (children.size() != 1) {
-                throw new ConfigurationException("'Not' type matcher requires one and only one enclosed matcher");
+                throw new ConfigurationException("'not' type matcher requires one and only one enclosed matcher");
             }
             result = new NotMatcher(children.get(0));
             break;
+
+        case regex:
+            if (!attr.containsKey(AttributeName.exp)) {
+                throw new ConfigurationException("'regex' type matcher requires an 'exp' attribute");
+            }
+            result = new SimpleRegexMatcher(Pattern.compile(attr.get(AttributeName.exp)));
         }
         if (attr.containsKey(AttributeName.id)) {
             matchers.put(attr.get(AttributeName.id), result);
@@ -300,7 +307,8 @@ private IHeaderMatcher parseMatcher(Node matcherNode) {
     private ILicense parseLicense(Node licenseNode) {
         Map<AttributeName, String> attributes = attributes(licenseNode);
 
-        ILicenseFamily family = new SimpleLicenseFamily(attributes.get(AttributeName.id), attributes.get(AttributeName.name));
+        ILicenseFamily family = new SimpleLicenseFamily(attributes.get(AttributeName.id),
+                attributes.get(AttributeName.name));
         IHeaderMatcher matcher[] = { null };
         StringBuilder notesBuilder = new StringBuilder();
         nodeListConsumer(licenseNode.getChildNodes(), x -> {
@@ -336,15 +344,14 @@ public SortedSet<ILicense> readLicenses() {
                 }
                 while (!stack.isEmpty()) {
                     derivedFrom = stack.pop();
-                    ILicenseFamily found = ILicenseFamily.search(
-                            derivedFrom.getLicenseFamily(), approvedFamilies);
-                   if (found != null) {
+                    ILicenseFamily found = ILicenseFamily.search(derivedFrom.getLicenseFamily(), approvedFamilies);
+                    if (found != null) {
                         while (!stack.isEmpty()) {
                             approvedFamilies.add(stack.pop().getLicenseFamily());
                         }
                     }
                 }
-                
+
             }
             document = null;
         }
@@ -354,14 +361,14 @@ public SortedSet<ILicense> readLicenses() {
     private ILicenseFamily parseFamily(Node familyNode) {
         Map<AttributeName, String> attributes = attributes(familyNode);
         if (attributes.containsKey(AttributeName.license_ref)) {
-            return ILicenseFamilyProxy.create(ILicenseProxy.create(attributes.get(AttributeName.license_ref), licenses));
+            return ILicenseFamilyProxy
+                    .create(ILicenseProxy.create(attributes.get(AttributeName.license_ref), licenses));
         }
         throw new ConfigurationException("family tag requires " + AttributeName.license_ref + " attribute");
     }
 
-
     @Override
-    public Collection<ILicenseFamily> approvedLicenseFamilies() {
+    public SortedSet<ILicenseFamily> approvedLicenseFamilies() {
         return approvedFamilies.isEmpty() ? readFamilies() : approvedFamilies;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 2b4c9c9be..a43da36b8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.license;
 
 import java.util.Comparator;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index e9a86a6d5..cb13f475a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.license;
 
 import org.apache.rat.analysis.IHeaderMatcher;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index 7c255acbc..7153fe89d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -34,9 +34,9 @@ public class DefaultsTest {
 
     @Test
     public void defaultConfigTest() {
-        Defaults.builder().build();
+        Defaults defaults = Defaults.builder().build();
 
-        Set<ILicense> licenses = Defaults.getLicenses();
+        Set<ILicense> licenses = defaults.getLicenses();
 
         Set<String> names = new TreeSet<>();
         licenses.forEach(x -> names.add(x.getLicenseFamily().getFamilyCategory()));
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index f9de0aff0..a82f7b70f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -66,14 +66,13 @@ private Node getNode(Object source, XPath xPath, String xpath) throws XPathExpre
 
     @Test
     public void xmlReportTest() throws Exception {
-        Defaults.builder().build();
+        Defaults defaults = Defaults.builder().build();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setStyleReport(false);
-        configuration.addLicenses(Defaults.getLicenses());
-        configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
+        configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
         configuration.setOut(out);
         Reporter.report(configuration);
@@ -99,94 +98,21 @@ public void xmlReportTest() throws Exception {
         assertEquals(12, nodeList.getLength());
     }
 
-    private XPath xPath = XPathFactory.newInstance().newXPath();
-
     private static final String NL = System.getProperty("line.separator");
     private static final String PARAGRAPH = "*****************************************************";
-    private static final String FILE_PARAGRAPH = "=====================================================";
-
     private static final String HEADER = NL + PARAGRAPH + NL + //
             "Summary" + NL + //
             "-------" + NL + //
             "Generated at: ";
 
-    private static String getElementsReports(String pElementsPath) {
-        return NL + "Notes: 2" + NL + //
-                "Binaries: 2" + NL + //
-                "Archives: 1" + NL + //
-                "Standards: 7" + NL + //
-                "" + NL + //
-                "Apache Licensed: 4" + NL + //
-                "Generated Documents: 0" + NL + //
-                "" + NL + //
-                "JavaDocs are generated, thus a license header is optional." + NL + //
-                "Generated files do not require license headers." + NL + //
-                "" + NL + //
-                "2 Unknown Licenses" + NL + //
-                "" + NL + //
-                PARAGRAPH + NL + //
-                "" + NL + //
-                "Files with unapproved licenses:" + NL + //
-                "" + NL + //
-                "  " + pElementsPath + "/Source.java" + NL + //
-                "  " + pElementsPath + "/sub/Empty.txt" + NL + //
-                "" + NL + //
-                PARAGRAPH + NL + //
-                "" + NL + //
-                "Archives:" + NL + //
-                "" + NL + //
-                " + " + pElementsPath + "/dummy.jar" + NL + //
-                " " + NL + //
-                PARAGRAPH + NL + //
-                "  Files with Apache License headers will be marked AL" + NL + //
-                "  Binary files (which do not require any license headers) will be marked B" + NL + //
-                "  Compressed archives will be marked A" + NL + //
-                "  Notices, licenses etc. will be marked N" + NL + //
-                "  MIT   " + pElementsPath + "/ILoggerFactory.java" + NL + //
-                "  B     " + pElementsPath + "/Image.png" + NL + //
-                "  N     " + pElementsPath + "/LICENSE" + NL + //
-                "  N     " + pElementsPath + "/NOTICE" + NL + //
-                " !????? " + pElementsPath + "/Source.java" + NL + //
-                "  AL    " + pElementsPath + "/Text.txt" + NL + //
-                "  AL    " + pElementsPath + "/TextHttps.txt" + NL + //
-                "  AL    " + pElementsPath + "/Xml.xml" + NL + //
-                "  AL    " + pElementsPath + "/buildr.rb" + NL + //
-                "  A     " + pElementsPath + "/dummy.jar" + NL + //
-                "  B     " + pElementsPath + "/plain.json" + NL + //
-                " !????? " + pElementsPath + "/sub/Empty.txt" + NL + //
-                " " + NL + //
-                PARAGRAPH + NL + //
-                NL + //
-                " Printing headers for text files without a valid license header..." + NL + //
-                " " + NL + //
-                FILE_PARAGRAPH + NL + //
-                "== File: " + pElementsPath + "/Source.java" + NL + //
-                FILE_PARAGRAPH + NL + //
-                "package elements;" + NL + //
-                "" + NL + //
-                "/*" + NL + //
-                " * This file does intentionally *NOT* contain an AL license header," + NL + //
-                " * because it is used in the test suite." + NL + //
-                " */" + NL + //
-                "public class Source {" + NL + //
-                "" + NL + //
-                "}" + NL + //
-                "" + NL + //
-                FILE_PARAGRAPH + NL + //
-                "== File: " + pElementsPath + "/sub/Empty.txt" + NL + //
-                FILE_PARAGRAPH + NL + //
-                NL;
-    }
-
     @Test
     public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
-        Defaults.builder().build();
+        Defaults defaults = Defaults.builder().build();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.addLicenses(Defaults.getLicenses());
-        configuration.addApprovedLicenseNames(Defaults.getLicenseFamilies());
+        configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
         configuration.setOut(out);
         Reporter.report(configuration);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index 873d1aaeb..51fea6a6a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -49,21 +49,23 @@
 abstract public class AbstractLicenseTest {
     private static int NAME = 0;
     private static int TEXT = 1;
+    private static Defaults DEFAULTS;
     protected MetaData data;
 
     private final String category;
     private final String name;
     private final String notes;
     private final String[][] targets;
+    
 
     @BeforeClass
     public static void init() {
-        Defaults.builder().build();
+        DEFAULTS = Defaults.builder().build();
     }
 
     @AfterClass
     public static void shutdown() {
-        Defaults.clear();
+        DEFAULTS.clear();
     }
 
     protected AbstractLicenseTest(String cat, String name, String notes, String[][] targets) {
@@ -81,7 +83,7 @@ public void setup() {
     protected static ILicense extractCategory(String category) {
         ILicenseFamily testingFamily = new SimpleLicenseFamily(category, "Testing category");
         List<ILicense> matchers = new ArrayList<>();
-        Defaults.getLicenses().stream().filter(x -> x.getLicenseFamily().compareTo(testingFamily) == 0)
+        DEFAULTS.getLicenses().stream().filter(x -> x.getLicenseFamily().compareTo(testingFamily) == 0)
                 .forEach(matchers::add);
         if (matchers.isEmpty()) {
             fail("No machers for category: " + category);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
index 9d7ff0293..d27d0fb54 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import static org.junit.Assert.assertFalse;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 1c5d08291..38d1cf329 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -41,8 +41,8 @@ public class DefaultPolicyTest {
 
     @Before
     public void setUp() throws Exception {
-        Defaults.builder().build();
-        policy = new DefaultPolicy(Defaults.getLicenseFamilies());
+        Defaults defaults = Defaults.builder().build();
+        policy = new DefaultPolicy(defaults.getLicenseFamilies());
         subject = new MockLocation("subject");
     }
 
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java
deleted file mode 100644
index c23fc6e95..000000000
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/FullTextLicenseMatcher.java
+++ /dev/null
@@ -1,76 +0,0 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.anttasks;
-
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.license.FullTextMatchingLicense;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-/**
- * Adapts {@link FullTextMatchingLicense FullTextMatchingLicense}
- * to Ant's method naming conventions so it becomes easy to write
- * text matching based license matchers inside an Ant build file.
- * @since Rat Antlib 0.9
- */
-public class FullTextLicenseMatcher extends FullTextMatchingLicense {
-    private boolean validated = false;
-    private String fullText = "";
-    private Project project;
-    
-    public FullTextLicenseMatcher() {
-        super(null, null, null);
-    }
-
-    public void setProject(Project project) {
-        this.project = project;
-    }
-
-    public void addText(String text) {
-        if (text != null && text.trim().length() > 0) {
-            setFullText(fullText += project.replaceProperties(text));
-        }
-    }
-
-    @Override
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        validate();
-        return super.match(subject, line);
-    }
-
-    private void validate() {
-        if (!validated) {
-            validated  = true;
-            if (!hasFullText()) {
-                throw new BuildException("You must specify the text to match.");
-            }
-            if (getLicenseFamilyCategory() == null) {
-                throw new BuildException("The licenseFamilyCategory attribute"
-                                         + " is required.");
-            }
-            if (getLicenseFamilyName() == null) {
-                throw new BuildException("The licenseFamilyName attribute"
-                                         + " is required.");
-            }
-        }
-    }
-
-}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index c4c1000e9..14a198731 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -1,76 +1,67 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one   *
+* or more contributor license agreements.  See the NOTICE file *
+* distributed with this work for additional information        *
+* regarding copyright ownership.  The ASF licenses this file   *
+* to you under the Apache License, Version 2.0 (the            *
+* "License"); you may not use this file except in compliance   *
+* with the License.  You may obtain a copy of the License at   *
+*                                                              *
+*   http://www.apache.org/licenses/LICENSE-2.0                 *
+*                                                              *
+* Unless required by applicable law or agreed to in writing,   *
+* software distributed under the License is distributed on an  *
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+* KIND, either express or implied.  See the License for the    *
+* specific language governing permissions and limitations      *
+* under the License.                                           *
+*/
 package org.apache.rat.anttasks;
 
- import org.apache.commons.io.IOUtils;
- import org.apache.rat.Defaults;
- import org.apache.rat.ReportConfiguration;
- import org.apache.rat.ConfigurationException;
-import org.apache.rat.Reporter;
-import org.apache.rat.analysis.IHeaderMatcher;
- import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
- import org.apache.rat.api.RatException;
- import org.apache.rat.license.ILicenseFamily;
- import org.apache.tools.ant.BuildException;
- import org.apache.tools.ant.Project;
- import org.apache.tools.ant.Task;
- import org.apache.tools.ant.taskdefs.LogOutputStream;
- import org.apache.tools.ant.types.EnumeratedAttribute;
- import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.resources.Union;
-import org.apache.tools.ant.util.FileUtils;
-
-import javax.xml.transform.TransformerException;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
+import java.io.FilenameFilter;
+import java.net.MalformedURLException;
 import java.util.Arrays;
-import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.rat.ConfigurationException;
+import org.apache.rat.Defaults;
+import org.apache.rat.ReportConfiguration;
+import org.apache.rat.Reporter;
+import org.apache.rat.configuration.LicenseReader;
+import org.apache.rat.configuration.Readers;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.LogOutputStream;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.Union;
 
 /**
- * A basic Ant task that generates a report on all files specified by
- * the nested resource collection(s).
+ * A basic Ant task that generates a report on all files specified by the nested
+ * resource collection(s).
  *
- * <p>IHeaderMatcher(s) can be specified as nested elements as well.</p>
+ * <p>
+ * IHeaderMatcher(s) can be specified as nested elements as well.
+ * </p>
  *
- * <p>The attribute <code>format</code> defines the output format and
- * can take the values
+ * <p>
+ * The attribute <code>format</code> defines the output format and can take the
+ * values
  * <ul>
- *   <li>xml - Rat's native XML output.</li>
- *   <li>styled - transforms the XML output using the given
- *   stylesheet.  The stylesheet attribute must be set as well if this
- *   attribute is used.</li>
- *   <li>plain - plain text using Rat's built-in stylesheet.  This is
- *   the default.</li>
+ * <li>xml - Rat's native XML output.</li>
+ * <li>styled - transforms the XML output using the given stylesheet. The
+ * stylesheet attribute must be set as well if this attribute is used.</li>
+ * <li>plain - plain text using Rat's built-in stylesheet. This is the
+ * default.</li>
  * </ul>
  */
 public class Report extends Task {
-    
-    private org.apache.rat.Reporter reporter;
+
     private Defaults.Builder defaultsBuilder;
     private final ReportConfiguration configuration;
 
@@ -78,41 +69,16 @@ public class Report extends Task {
      * will hold any nested resource collection
      */
     private Union nestedResources;
-    /**
-     * The licenses we want to match on.
-     */
-    //private final ArrayList<IHeaderMatcher> licenseMatchers = new ArrayList<>();
-
-    //private final ArrayList<ILicenseFamily> licenseNames = new ArrayList<>();
-
-    /**
-     * Whether to add the default list of license matchers.
-     */
-    //private boolean addDefaultLicenseMatchers = true;
-    /**
-     * Where to send the report.
-     */
-    //private File reportFile;
-    /**
-     * Which stylesheet to use.
-     */
-    //private Resource stylesheet;
-    /**
-     * Whether to add license headers.
-     */
-    //private AddLicenseHeaders addLicenseHeaders = new AddLicenseHeaders(AddLicenseHeaders.FALSE);
-    /**
-     * The copyright message.
-     */
-    //private String copyrightMessage;
 
     public Report() {
         configuration = new ReportConfiguration();
         configuration.setOut(new LogOutputStream(this, Project.MSG_INFO));
         defaultsBuilder = Defaults.builder();
     }
+
     /**
      * Adds resources that will be checked.
+     * 
      * @param rc resource to check.
      */
     public void add(ResourceCollection rc) {
@@ -122,87 +88,76 @@ public void add(ResourceCollection rc) {
         nestedResources.add(rc);
     }
 
-    /**
-     * @param matcher Adds a license matcher.
-     */
-    public void add(IHeaderMatcher matcher) {
-        configuration.addLicense(matcher);
-    }
-
-    public void add(ILicenseFamily license) {
-        configuration.addApprovedLicenseName(license);
+    public void setInputFileFilter(FilenameFilter inputFileFilter) {
+        configuration.setInputFileFilter(inputFileFilter);
     }
-
-    /**
-     * @param addDefaultLicenseMatchers Whether to add the default list of license matchers.
-     */
-    public void setAddDefaultLicenseMatchers(boolean addDefaultLicenseMatchers) {
-        if (!addDefaultLicenseMatchers) {
-            defaultsBuilder.noDefault();
+    
+    public void setReportFile(File reportFile) {
+        try {
+            configuration.setOut( new FileOutputStream(reportFile));
+        } catch (FileNotFoundException e) {
+            throw new BuildException("Can not open report file", e);
         }
     }
 
-    /**
-     * Where to send the report to.
-     * @param f report output file.
-     */
-    public void setReportFile(File f) {
+    public void setStyleSheet(File styleSheet) {
         try {
-            configuration.setOut(new FileOutputStream(f));
+            configuration.setStyleSheet(new FileInputStream(styleSheet));
         } catch (FileNotFoundException e) {
-            throw new BuildException("Can not open output file.", e);
+            throw new BuildException("Can not open style sheet", e);
         }
+        configuration.setStyleReport(true);
     }
 
-    /**
-     * Which format to use.
-     * @param f format. 
-     */
-    public void setFormat(Format f) {
-        if (f == null) {
-            throw new IllegalArgumentException("format must not be null");
+    public void setStyleReport(boolean styleReport) {
+        configuration.setStyleReport(styleReport);
+    }
+
+    public void setLicenses(File fileName) {
+        try {
+            LicenseReader reader = Readers.get(fileName);
+            reader.add(fileName.toURI().toURL());
+            configuration.addLicenses(reader.readLicenses());
+            configuration.addApprovedLicenseNames(reader.approvedLicenseFamilies());
+        } catch (MalformedURLException e) {
+            throw new BuildException("Can not read license file " + fileName, e);
         }
-        configuration.setStyleReport(! f.getValue().equals(Format.XML_KEY));
     }
 
+
     /**
-     * @param pAdd Whether to add license headers. 
+     * @param useDefaultLicenses Whether to add the default list of license matchers.
      */
-    public void setAddLicenseHeaders(AddLicenseHeaders pAdd) {
-        if (pAdd == null) {
-            throw new IllegalArgumentException("addLicenseHeaders must not be null");
-        }
-        if (!Arrays.asList(pAdd.getValues()).contains(pAdd.getValue().toUpperCase())) {
-            throw new IllegalArgumentException("Invalid value for addLicenseHeaders: " + pAdd.getValue());
-        }
-        if (!pAdd.getValue().equalsIgnoreCase(AddLicenseHeaders.FALSE)) {
-            configuration.setAddingLicenses(true);
-            configuration.setAddingLicensesForced(pAdd.getValue().equalsIgnoreCase(AddLicenseHeaders.FORCED));
+    public void setUseDefaultLicenses(boolean useDefaultLicenses) {
+        if (!useDefaultLicenses) {
+            defaultsBuilder.noDefault();
         }
     }
+    
+    public void addApprovedLicense(String familyCategory) {
+        configuration.addApprovedLicenseName(familyCategory);
+    }
 
-    /**
-     * @param copyrightMessage copyright message to set.
-     */
     public void setCopyrightMessage(String copyrightMessage) {
         configuration.setCopyrightMessage(copyrightMessage);
     }
-    
-    /**
-     * Which stylesheet to use (only meaningful with format='styled').
-     * @param u stylesheet.
-     */
-    public void addConfiguredStylesheet(Union u) {
-        if (configuration.getStyleSheet() != null || u.size() != 1) {
-            throw new BuildException("You must not specify more than one stylesheet.");
+
+    public void setAddLicenseHeaders(AddLicenseHeaders setting) {
+        if (setting.containsValue(AddLicenseHeaders.FALSE)) {
+            configuration.setAddingLicenses(false);
+            configuration.setAddingLicensesForced(false);
+        } else {
+            configuration.setAddingLicenses(true);
+            configuration.setAddingLicensesForced(setting.containsValue(AddLicenseHeaders.FORCED));
         }
-        Resource stylesheet = u.iterator().next(); 
+    }
+
+    public void setAddDefaultDefinitions(String fileName) {
         try {
-            configuration.setStyleSheet(stylesheet.getInputStream());
-        } catch (IOException e) {
-            throw new BuildException("Stylesheet not readable", e);
+            defaultsBuilder.add(fileName);
+        } catch (MalformedURLException e) {
+            throw new BuildException("Can not open additional default definitions: " + fileName.toString(), e);
         }
-        
     }
 
     /**
@@ -210,13 +165,15 @@ public void addConfiguredStylesheet(Union u) {
      */
     @Override
     public void execute() {
+        Defaults defaults = defaultsBuilder.build();
+        configuration.setFrom(defaults);
         configuration.setReportable(new ResourceCollectionContainer(nestedResources));
         try {
             validate();
             Reporter.report(configuration);
         } catch (BuildException e) {
             throw e;
-        }catch (Exception ioex) {
+        } catch (Exception ioex) {
             throw new BuildException(ioex);
         } finally {
             configuration.close();
@@ -228,41 +185,16 @@ public void execute() {
      */
     private void validate() {
         try {
-            configuration.validate( s -> log(s,Project.MSG_WARN));
+            configuration.validate(s -> log(s, Project.MSG_WARN));
         } catch (ConfigurationException e) {
             throw new BuildException(e.getMessage(), e.getCause());
         }
         if (nestedResources == null) {
-            throw new BuildException("You must specify at least one file to"
-                                     + " create the report for.");
+            throw new BuildException("You must specify at least one file to" + " create the report for.");
         }
+        configuration.setReportable(new ResourceCollectionContainer(nestedResources));
     }
 
-//    /**
-//     * Flattens all nested matchers plus the default matchers (if
-//     * required) into a single array.
-//     */
-//    private List<IHeaderMatcher> getLicenseMatchers() {
-//        List<IHeaderMatcher> matchers = new ArrayList<>(
-//                (addDefaultLicenseMatchers ? Defaults.DEFAULT_MATCHERS.size() : 0) + licenseMatchers.size());
-//        if (addDefaultLicenseMatchers) {
-//            matchers.addAll(Defaults.DEFAULT_MATCHERS);
-//            matchers.addAll(licenseMatchers);
-//        } else {
-//            matchers = new ArrayList<>(licenseMatchers);
-//        }
-//        return matchers;
-//    }
-//
-//    private ILicenseFamily[] getApprovedLicenseNames() {
-//        // TODO: add support for adding default licenses
-//        ILicenseFamily[] results = null;
-//        if (licenseNames.size() > 0) {
-//            results = licenseNames.toArray(new ILicenseFamily[0]);
-//        }
-//        return results;
-//    }
-
     /**
      * Type for the format attribute.
      */
@@ -273,7 +205,9 @@ public static class Format extends EnumeratedAttribute {
 
         static final Format PLAIN = new Format(PLAIN_KEY);
 
-        public Format() { super(); }
+        public Format() {
+            super();
+        }
 
         private Format(String s) {
             this();
@@ -282,9 +216,7 @@ private Format(String s) {
 
         @Override
         public String[] getValues() {
-            return new String[] {
-                XML_KEY, STYLED_KEY, PLAIN_KEY
-            };
+            return new String[] { XML_KEY, STYLED_KEY, PLAIN_KEY };
         }
     }
 
@@ -296,16 +228,39 @@ public static class AddLicenseHeaders extends EnumeratedAttribute {
         static final String FALSE = "false";
         static final String FORCED = "forced";
 
-        public AddLicenseHeaders() {}
+        public AddLicenseHeaders() {
+        }
+
         public AddLicenseHeaders(String s) {
             setValue(s);
         }
-        
+
+        @Override
+        public String[] getValues() {
+            return new String[] { TRUE, FALSE, FORCED };
+        }
+    }
+
+    /**
+     * Type for the addLicenseHeaders attribute.
+     */
+    public static class ApprovalFilter extends EnumeratedAttribute {
+
+        public ApprovalFilter() {
+        }
+
+        public ApprovalFilter(String s) {
+            setValue(s);
+        }
+
         @Override
         public String[] getValues() {
-            return new String[] {
-                TRUE, FALSE, FORCED
-            };
+            return Arrays.stream(Defaults.Filter.values()).map(Defaults.Filter::name).collect(Collectors.toList())
+                    .toArray(new String[Defaults.Filter.values().length]);
+        }
+
+        public Defaults.Filter internalFilter() {
+            return Defaults.Filter.valueOf(getValue());
         }
     }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
index 6fe9175bc..667fb3bcc 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.anttasks;
 
 import java.io.File;
@@ -35,8 +35,8 @@
 import org.apache.tools.ant.types.resources.FileResource;
 
 /**
- * Implementation of IReportable that traverses over a resource
- * collection internally.
+ * Implementation of IReportable that traverses over a resource collection
+ * internally.
  */
 class ResourceCollectionContainer implements IReportable {
     private final ResourceCollection rc;
@@ -45,6 +45,7 @@ class ResourceCollectionContainer implements IReportable {
         this.rc = rc;
     }
 
+    @Override
     public void run(RatReport report) throws RatException {
         ResourceDocument document = new ResourceDocument();
         for (Resource r : rc) {
@@ -55,6 +56,7 @@ public void run(RatReport report) throws RatException {
             }
         }
     }
+
     private class ResourceDocument implements Document {
 
         private Resource resource;
@@ -63,12 +65,14 @@ private class ResourceDocument implements Document {
         private void setResource(Resource resource) {
             this.resource = resource;
         }
-        
+
+        @Override
         public Reader reader() throws IOException {
             final InputStream in = resource.getInputStream();
             return new InputStreamReader(in);
         }
 
+        @Override
         public String getName() {
             // TODO: reconsider names
             String result = null;
@@ -82,6 +86,7 @@ public String getName() {
             return result;
         }
 
+        @Override
         public boolean isComposite() {
             if (resource instanceof FileResource) {
                 final FileResource fileResource = (FileResource) resource;
@@ -90,11 +95,13 @@ public boolean isComposite() {
             }
             return false;
         }
-        
+
+        @Override
         public MetaData getMetaData() {
             return metaData;
         }
-        
+
+        @Override
         public InputStream inputStream() throws IOException {
             return resource.getInputStream();
         }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java
deleted file mode 100644
index 6f9cb3538..000000000
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/SubstringLicenseMatcher.java
+++ /dev/null
@@ -1,78 +0,0 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.anttasks;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.rat.analysis.license.SimplePatternBasedLicense;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.api.MetaData.Datum;
-import org.apache.tools.ant.BuildException;
-
-/**
- * Adapts {@link SimplePatternBasedLicense SimplePatternBasedLicense}
- * to Ant's method naming conventions so it becomes easy to write
- * substring based license matchers inside an Ant build file.
- * @since Rat Antlib 0.8
- */
-public class SubstringLicenseMatcher extends SimplePatternBasedLicense {
-    private final List<String> patterns = new ArrayList<>();
-    private boolean validated = false;
-    
-    public SubstringLicenseMatcher() {
-        super(null, null, null);
-    }
-
-    public void addConfiguredPattern(Pattern p) {
-        patterns.add(p.getSubstring());
-    }
-
-    @Override
-    public String[] getPatterns() {
-        validate();
-        return patterns.toArray(new String[0]);
-    }
-
-    private void validate() {
-        if (!validated) {
-            validated  = true;
-            if (patterns.size() == 0) {
-                throw new BuildException("You must specify at least one nested"
-                                         + " pattern.");
-            }
-            if (getLicenseFamilyCategory() == null) {
-                throw new BuildException("The licenseFamilyCategory attribute"
-                                         + " is required.");
-            }
-            if (getLicenseFamilyName() == null) {
-                throw new BuildException("The licenseFamilyName attribute"
-                                         + " is required.");
-            }
-        }
-    }
-
-    /**
-     * A simple wrapper around a substring.
-     */
-    public static class Pattern {
-        private String substring;
-        public void setSubstring(String s) { substring = s; }
-        public String getSubstring() { return substring; }
-    }
-}
diff --git a/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml b/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml
index 80d65b000..0a1cd82de 100644
--- a/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml
+++ b/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml
@@ -22,58 +22,4 @@
 
 <antlib>
   <taskdef name="report" classname="org.apache.rat.anttasks.Report"/>
-
-  <typedef name="substringMatcher"
-           classname="org.apache.rat.anttasks.SubstringLicenseMatcher"/>
-  <typedef name="fullTextMatcher"
-           classname="org.apache.rat.anttasks.FullTextLicenseMatcher"/>
-
-  <!-- typedef the built-in license matchers -->
-  <typedef name="asl20"
-    classname="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
-  <typedef name="generated"
-    classname="org.apache.rat.analysis.generation.GeneratedLicenseNotRequired"/>
-  <typedef name="javadoc"
-    classname="org.apache.rat.analysis.generation.JavaDocLicenseNotRequired"/>
-  <typedef name="oasis"
-    classname="org.apache.rat.analysis.license.OASISLicense"/>
-  <typedef name="w3c"
-    classname="org.apache.rat.analysis.license.W3CLicense"/>
-  <typedef name="w3c-doc"
-    classname="org.apache.rat.analysis.license.W3CDocLicense"/>
-  <typedef name="dojo"
-    classname="org.apache.rat.analysis.license.DojoLicenseHeader"/>
-  <typedef name="gpl1"
-    classname="org.apache.rat.analysis.license.GPL1License"/>
-  <typedef name="gpl2"
-    classname="org.apache.rat.analysis.license.GPL2License"/>
-  <typedef name="gpl3"
-    classname="org.apache.rat.analysis.license.GPL3License"/>
-  <typedef name="mit"
-    classname="org.apache.rat.analysis.license.MITLicense"/>
-
-  <!-- typedef the built-in license families -->
-  <typedef name="w3c-doc-license"
-    classname="org.apache.rat.license.W3CDocumentLicenseFamily"/>
-  <typedef name="w3c-soft-license"
-    classname="org.apache.rat.license.W3CSoftwareLicenseFamily"/>
-  <typedef name="oasis-license"
-    classname="org.apache.rat.license.OASISLicenseFamily"/>
-  <typedef name="apache20-license"
-    classname="org.apache.rat.license.Apache20LicenseFamily"/> 
-  <typedef name="academic-free-21"
-    classname="org.apache.rat.license.AcademicFree21LicenseFamily"/> 
-  <typedef name="modified-bsd"
-    classname="org.apache.rat.license.ModifiedBSDLicenseFamily"/> 
-  <typedef name="approvedLicense"
-           classname="org.apache.rat.license.SimpleLicenseFamily"/> 
-  <typedef name="gpl1-family"
-    classname="org.apache.rat.license.GPL1LicenseFamily"/> 
-  <typedef name="gpl2-family"
-    classname="org.apache.rat.license.GPL2LicenseFamily"/> 
-  <typedef name="gpl3-family"
-    classname="org.apache.rat.license.GPL3LicenseFamily"/> 
-  <typedef name="mit-family"
-    classname="org.apache.rat.license.MITLicenseFamily"/> 
-    
 </antlib>
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index ebed7f6c9..6c82ab6d6 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -16,26 +16,27 @@
  */
 package org.apache.rat.anttasks;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.tools.ant.BuildException;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.rat.document.impl.guesser.BinaryGuesser;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.tools.ant.BuildException;
 import org.junit.Assume;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.junit.Assert.*;
-
 public class ReportTest extends AbstractRatAntTaskTest {
     private static final File antFile = new File("src/test/resources/antunit/report-junit.xml").getAbsoluteFile();
 
@@ -77,7 +78,7 @@ public void testWithALUnknown() throws Exception {
     public void testCustomMatcher() throws Exception {
         buildRule.executeTarget("testCustomMatcher");
         assertLogDoesNotMatch("AL +\\Q" + getAntFileName() + "\\E");
-        assertLogMatches("EXMPL +\\Q" + getAntFileName() + "\\E");
+        assertLogMatches("EXAMP +\\Q" + getAntFileName() + "\\E");
     }
 
     @Test
@@ -87,8 +88,7 @@ public void testNoResources() throws Exception {
             fail("Expected Exception");
         } catch (BuildException e) {
             final String expect = "You must specify at least one file";
-            assertTrue("Expected " + expect + ", got " + e.getMessage(),
-                    e.getMessage().contains(expect));
+            assertTrue("Expected " + expect + ", got " + e.getMessage(), e.getMessage().contains(expect));
         }
     }
 
@@ -99,8 +99,7 @@ public void testNoLicenseMatchers() throws Exception {
             fail("Expected Exception");
         } catch (BuildException e) {
             final String expect = "at least one license";
-            assertTrue("Expected " + expect + ", got " + e.getMessage(),
-                    e.getMessage().contains(expect));
+            assertTrue("Expected " + expect + ", got " + e.getMessage(), e.getMessage().contains(expect));
         }
     }
 
@@ -145,15 +144,17 @@ public void testAddLicenseHeaders() throws Exception {
      */
     @Test
     public void testISO88591() throws Exception {
-    	// In previous versions of the JDK, it used to be possible to
-    	// change the value of file.encoding at runtime. As of Java 16,
-    	// this is no longer possible. Instead, at this point, we check,
-    	// that file.encoding is actually ISO-8859-1. (Within Maven, this
-    	// is enforced by the configuration of the surefire plugin.) If not,
-    	// we skip this test.
-    	Assume.assumeTrue("Expected file.encoding=ISO-8859-1", "ISO-8859-1".equals(System.getProperty("file.encoding")));
+        // In previous versions of the JDK, it used to be possible to
+        // change the value of file.encoding at runtime. As of Java 16,
+        // this is no longer possible. Instead, at this point, we check,
+        // that file.encoding is actually ISO-8859-1. (Within Maven, this
+        // is enforced by the configuration of the surefire plugin.) If not,
+        // we skip this test.
+        Assume.assumeTrue("Expected file.encoding=ISO-8859-1",
+                "ISO-8859-1".equals(System.getProperty("file.encoding")));
         buildRule.executeTarget("testISO88591");
-        assertTrue("Log should contain the test umlauts", buildRule.getLog().contains("\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF"));
+        assertTrue("Log should contain the test umlauts",
+                buildRule.getLog().contains("\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF"));
     }
 
     /**
@@ -161,13 +162,14 @@ public void testISO88591() throws Exception {
      */
     @Test
     public void testISO88591WithFile() throws Exception {
-    	// In previous versions of the JDK, it used to be possible to
-    	// change the value of file.encoding at runtime. As of Java 16,
-    	// this is no longer possible. Instead, at this point, we check,
-    	// that file.encoding is actually ISO-8859-1. (Within Maven, this
-    	// is enforced by the configuration of the surefire plugin.) If not,
-    	// we skip this test.
-    	Assume.assumeTrue("Expected file.encoding=ISO-8859-1", "ISO-8859-1".equals(System.getProperty("file.encoding")));
+        // In previous versions of the JDK, it used to be possible to
+        // change the value of file.encoding at runtime. As of Java 16,
+        // this is no longer possible. Instead, at this point, we check,
+        // that file.encoding is actually ISO-8859-1. (Within Maven, this
+        // is enforced by the configuration of the surefire plugin.) If not,
+        // we skip this test.
+        Assume.assumeTrue("Expected file.encoding=ISO-8859-1",
+                "ISO-8859-1".equals(System.getProperty("file.encoding")));
         Charset.defaultCharset();
         String outputDir = System.getProperty("output.dir", "target/anttasks");
         String selftestOutput = System.getProperty("report.file", outputDir + "/selftest.report");
@@ -176,9 +178,7 @@ public void testISO88591WithFile() throws Exception {
         boolean documentParsed = false;
         try (FileInputStream fis = new FileInputStream(selftestOutput)) {
             Document doc = db.parse(fis);
-            boolean byteSequencePresent = doc.getElementsByTagName("header-sample")
-                    .item(0)
-                    .getTextContent()
+            boolean byteSequencePresent = doc.getElementsByTagName("header-sample").item(0).getTextContent()
                     .contains("\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF");
             assertTrue("Report should contain test umlauts", byteSequencePresent);
             documentParsed = true;
diff --git a/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java b/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java
deleted file mode 100644
index ef8527dc2..000000000
--- a/apache-rat-tasks/src/test/java/org/example/LicenseFamily.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.example;
-
-import org.apache.rat.license.ILicenseFamily;
-
-
-public class LicenseFamily implements ILicenseFamily {
-    public String getFamilyName() {
-        return "Example License";
-    }
-}
diff --git a/apache-rat-tasks/src/test/java/org/example/Matcher.java b/apache-rat-tasks/src/test/java/org/example/Matcher.java
deleted file mode 100644
index e54636325..000000000
--- a/apache-rat-tasks/src/test/java/org/example/Matcher.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.example;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.SimpleLicenseFamily;
-
-
-public class Matcher extends BaseLicense  {
-    public Matcher() {
-        super( new SimpleLicenseFamily("EXMPL", "Example License"), "");
-    }
-    
-    @Override
-    public void reset() {}
-    
-    @Override
-    public boolean match(MetaData metadata, String line) throws RatHeaderAnalysisException {
-        reportOnLicense(metadata);
-        return true;
-    }
-}
diff --git a/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml b/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml
new file mode 100644
index 000000000..35106e7ed
--- /dev/null
+++ b/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rat-config>
+	<licenses>
+		<!--
+	<license id=id name=name>
+		<note></note>
+	    <text>  </text>
+		<copyright start='' end='' owner=''/>
+		<spdx name=''/> 
+		<and> <license>...</and>
+		<or> <license>...</or> 
+		<matcher_ref refid='matcherid' />
+		<regex exp='' />
+	</license>
+-->
+		<license id="EXAMPLE" name="Example License">
+			<regex exp='.' />
+		</license>
+
+	</licenses>
+</rat-config>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index 54b0c9cad..3a71ed488 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -31,7 +31,7 @@
       resource="org/apache/rat/anttasks/antlib.xml"
       classpath="${test.classpath}"/>
 
-  <property name="output.dir" location="target/anttasks"/>
+  <property name="output.dir" location="${basedir}/../../../../target/anttasks"/>
   <pathconvert dirsep="/" property="file.name">
     <path>
       <pathelement location="${ant.file}"/>
@@ -62,16 +62,9 @@
   </target>
 
   <target name="testCustomMatcher">
-    <mkdir dir="${output.dir}/dest"/>
-    <mkdir dir="${output.dir}/src/org/example"/>
-    <typedef name="exmpl" classname="org.example.Matcher"
-        classpath="${test.classpath}"/>
-    <typedef name="exmpl-license" classname="org.example.LicenseFamily"
-        classpath="${test.classpath}"/>
-    <rat:report>
+    <property name="license.file" location="customMatcher.xml"/>
+    <rat:report licenses="${license.file}" useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <exmpl/>
-      <exmpl-license/>
     </rat:report>
   </target>
 

From 7d797f4c481deefd33d2c487cd881a880a5a3f51 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 17 Sep 2023 18:09:11 +0200
Subject: [PATCH 088/299] All ant tests pass

---
 .../main/java/org/apache/rat/Defaults.java    |  71 +----
 .../src/main/java/org/apache/rat/Report.java  |  24 +-
 .../org/apache/rat/ReportConfiguration.java   | 149 +++++++---
 .../org/apache/rat/ReportTransformer.java     |  24 +-
 .../rat/analysis/DefaultAnalyserFactory.java  |   1 -
 .../rat/analysis/license/BaseLicense.java     |   6 +-
 .../rat/analysis/matchers/AndMatcher.java     |   1 +
 .../configuration/ILicenseFamilyProxy.java    |  44 +--
 .../rat/configuration/ILicenseProxy.java      | 140 +++++-----
 .../rat/configuration/LicenseReader.java      |  16 +-
 .../configuration/XMLConfigurationReader.java |  58 ++--
 .../java/org/apache/rat/license/ILicense.java |   4 +-
 .../org/apache/rat/license/SimpleLicense.java |   8 +-
 .../org/apache/rat/policy/DefaultPolicy.java  |  15 +-
 .../main/resources/org/apache/rat/default.xml |  76 ++++--
 .../rat/analysis/matchers/AndMatcherTest.java |  27 ++
 .../ConfigurationReaderTest.java              |  36 ++-
 .../apache/rat/policy/DefaultPolicyTest.java  |  28 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |  79 ++++--
 .../apache/rat/report/xml/XmlReportTest.java  | 257 ++++++++----------
 .../org/apache/rat/test/utils/Resources.java  |  23 +-
 .../java/org/apache/rat/anttasks/Report.java  |  46 +---
 .../test/resources/antunit/report-junit.xml   |   7 +-
 23 files changed, 584 insertions(+), 556 deletions(-)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index bc720e2b9..8b4932886 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -28,7 +28,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.Readers;
@@ -48,19 +47,15 @@ public enum Filter {
     public static final String PLAIN_STYLESHEET = "org/apache/rat/plain-rat.xsl";
     public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
 
-    private final Filter approvalFilter;
     private final SortedSet<ILicense> licenses;
-    private final SortedSet<ILicenseFamily> licenseFamilies;
-    private final SortedSet<ILicenseFamily> approvedLicenseFamilies;
+    private final SortedSet<String> approvedLicenseIds;
 
     /**
      * Builder constructs instances.
      */
-    private Defaults(Filter approvalFilter) {
-        this.approvalFilter = approvalFilter;
+    private Defaults() {
         licenses = new TreeSet<>(ILicense.getComparator());
-        licenseFamilies = new TreeSet<>();
-        approvedLicenseFamilies = new TreeSet<>();
+        approvedLicenseIds = new TreeSet<>();
     }
 
     public static Builder builder() {
@@ -69,16 +64,15 @@ public static Builder builder() {
 
     public void clear() {
         licenses.clear();
-        licenseFamilies.clear();
+        approvedLicenseIds.clear();
     }
 
     private void readConfigFiles(Collection<URL> urls) {
         for (URL url : urls) {
             LicenseReader reader = Readers.get(url);
             reader.add(url);
-            licenseFamilies.addAll(reader.readFamilies());
             licenses.addAll(reader.readLicenses());
-            approvedLicenseFamilies.addAll(reader.approvedLicenseFamilies());
+            reader.approvedLicenseId().stream().map(ILicenseFamily::makeCategory).forEach(approvedLicenseIds::add);
         }
     }
 
@@ -90,41 +84,17 @@ public static InputStream getUnapprovedLicensesStyleSheet() {
         return Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
     }
 
-    public ILicense createDefaultMatcher() {
-        return getLicenses().isEmpty() ? null : new LicenseCollectionMatcher(getLicenses());
-    }
-
-    /**
-     * Returns the set of defined licenses unless filter is set to no-defaults. if
-     * no-defaults was set then an empty set is returned.
-     * 
-     * @return The set of defined licenses.
-     */
     public SortedSet<ILicense> getLicenses() {
-        switch (approvalFilter) {
-        case all:
-        case approved:
-            return Collections.unmodifiableSortedSet(licenses);
-        case none:
-        default:
-            return Collections.emptySortedSet();
-        }
-    }
-
-    public Set<String> getLicenseNames() {
-        return getLicenseFamilies().stream().map(ILicenseFamily::getFamilyName).collect(Collectors.toSet());
+        return Collections.unmodifiableSortedSet(licenses);
     }
 
-    public SortedSet<ILicenseFamily> getLicenseFamilies() {
-        switch (approvalFilter) {
-        case all:
-            return Collections.unmodifiableSortedSet(licenseFamilies);
-        case approved:
-            return Collections.unmodifiableSortedSet(approvedLicenseFamilies);
-        case none:
-        default:
-            return Collections.emptySortedSet();
+    public SortedSet<String> getLicenseIds() {
+        if (approvedLicenseIds.isEmpty()) {
+            SortedSet<String> result = new TreeSet<>();
+            licenses.stream().map(x -> x.getLicenseFamily().getFamilyCategory()).forEach(result::add);
+            return result;
         }
+        return Collections.unmodifiableSortedSet(approvedLicenseIds);
     }
 
     public static class Builder {
@@ -136,8 +106,6 @@ public int compare(URL url1, URL url2) {
             }
         });
 
-        private Filter approvalFilter = Filter.approved;
-
         private Builder() {
             fileNames.add(DEFAULT_CONFIG_URL);
         }
@@ -216,22 +184,11 @@ public Builder noDefault() {
             return remove(DEFAULT_CONFIG_URL);
         }
 
-        /**
-         * Set which files will be listed as approved.
-         * 
-         * @param filter the fileter type.
-         * @return this Builder for chaining
-         */
-        public Builder setApprovalFilter(Filter filter) {
-            approvalFilter = filter;
-            return this;
-        }
-
         /**
          * Builds the defaults object.
          */
         public Defaults build() {
-            Defaults result = new Defaults(approvalFilter);
+            Defaults result = new Defaults();
             result.readConfigFiles(fileNames);
             return result;
         }
@@ -279,7 +236,7 @@ public String getNotes() {
         }
 
         @Override
-        public ILicense derivedFrom() {
+        public String derivedFrom() {
             return null;
         }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index ef2d56708..7575077ec 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -161,20 +161,13 @@ public static final void main(String[] args) throws Exception {
                     }
                 }
 
-                Defaults.Builder defaultBuilder = Defaults.builder();
                 if (cl.hasOption(NO_DEFAULTS)) {
-                    defaultBuilder.setApprovalFilter(Defaults.Filter.none);
+                    configuration.setLicenseFilter(Defaults.Filter.none);
                 } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
-                    defaultBuilder.setApprovalFilter(Defaults.Filter.all);
+                    configuration.setLicenseFilter(Defaults.Filter.all);
                 } else {
-                    defaultBuilder.setApprovalFilter(Defaults.Filter.approved);
+                    configuration.setLicenseFilter(Defaults.Filter.approved);
                 }
-                if (cl.hasOption(LICENSES)) {
-                    for (String fn : cl.getOptionValues(LICENSES)) {
-                        defaultBuilder.add(fn);
-                    }
-                }
-
                 if (cl.hasOption(XML)) {
                     configuration.setStyleReport(false);
                 } else {
@@ -193,16 +186,23 @@ public static final void main(String[] args) throws Exception {
                         }
                     }
                 }
+
+                Defaults.Builder defaultBuilder = Defaults.builder();
+                if (cl.hasOption(LICENSES)) {
+                    for (String fn : cl.getOptionValues(LICENSES)) {
+                        defaultBuilder.add(fn);
+                    }
+                }
                 Defaults defaults = defaultBuilder.build();
                 configuration.setFrom(defaults);;
                 configuration.setReportable(getDirectory(args[0], configuration));
                 configuration.validate(s -> System.err.println(s));
                 
                 if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-                    listLicenseFamilies(defaults.getLicenseFamilies(), System.out);
+                    listLicenseFamilies(configuration.getApprovedLicenses(), System.out);
                 }
                 if (cl.hasOption(LIST_LICENSES)) {
-                    listLicenses(defaults.getLicenses(), System.out);
+                    listLicenses(configuration.getLicenses(), System.out);
                 }
                 
                 Reporter.report(configuration);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 6796f5199..b885ca65d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -27,19 +27,16 @@
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
+import java.util.Collections;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.rat.Defaults.Filter;
 import org.apache.rat.Defaults.LicenseCollectionMatcher;
-import org.apache.rat.configuration.ILicenseFamilyProxy;
-import org.apache.rat.configuration.ILicenseProxy;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.policy.DefaultPolicy;
@@ -53,7 +50,8 @@
 public class ReportConfiguration implements AutoCloseable {
     private static final Log logger = LogFactory.getLog(ReportConfiguration.class);
     private SortedSet<ILicense> licenses = new TreeSet<>(ILicense.getComparator());
-    private List<ILicenseFamily> approvedLicenseNames = new ArrayList<>();
+    private SortedSet<String> approvedLicenseId = new TreeSet<>();
+    private SortedSet<String> removedLicenseId = new TreeSet<>();
     private boolean addingLicenses;
     private boolean addingLicensesForced;
     private String copyrightMessage;
@@ -62,6 +60,7 @@ public class ReportConfiguration implements AutoCloseable {
     private InputStream styleSheet = null;
     private IReportable reportable = null;
     private FilenameFilter inputFileFilter = null;
+    private Filter approvalFilter = Filter.approved;
 
     /**
      * @return The filename filter for the potential input files.
@@ -113,10 +112,10 @@ public void setStyleSheet(InputStream styleSheet) {
         }
         this.styleSheet = styleSheet;
     }
-    
+
     public void setFrom(Defaults defaults) {
-        addLicense(defaults.createDefaultMatcher());
-        addApprovedLicenseNames(defaults.getLicenseFamilies());
+        addLicenses(defaults.getLicenses());
+        addApprovedLicenseNames(defaults.getLicenseIds());
         if (isStyleReport() && getStyleSheet() == null) {
             setStyleSheet(Defaults.getPlainStyleSheet());
         }
@@ -178,13 +177,14 @@ public PrintWriter getWriter() {
      * @return the license matcher, or null if no licenses are specified.
      */
     public ILicense getLicense() {
-        if (licenses.isEmpty()) {
-            return null;
+        SortedSet<ILicense> licSet = getLicenses();
+        if (licSet.isEmpty()) {
+            throw new ConfigurationException("At least one license must be specified");
         }
-        if (licenses.size() == 1) {
-            return licenses.first();
+        if (licSet.size() == 1) {
+            return licSet.first();
         }
-        return new LicenseCollectionMatcher(licenses);
+        return new LicenseCollectionMatcher(licSet);
     }
 
     /**
@@ -207,22 +207,22 @@ public void addLicenses(Collection<ILicense> licenses) {
         this.licenses.addAll(licenses);
     }
 
-    /**
-     *
-     * @return the set of approved license names.
-     */
-    public ILicenseFamily[] getApprovedLicenseNames() {
-        return approvedLicenseNames.toArray(new ILicenseFamily[approvedLicenseNames.size()]);
-    }
-
-    /**
-     * Adds to the set of approved license names.
-     *
-     * @param approvedLicenseNames set of approved license names.
-     */
-    public void addApprovedLicenseNames(ILicenseFamily[] approvedLicenseNames) {
-        addApprovedLicenseNames(Arrays.asList(approvedLicenseNames));
-    }
+//    /**
+//     *
+//     * @return the set of approved license names.
+//     */
+//    public ILicenseFamily[] getApprovedLicenseNames() {
+//        return a.toArray(new ILicenseFamily[approvedLicenseNames.size()]);
+//    }
+//
+//    /**
+//     * Adds to the set of approved license names.
+//     *
+//     * @param approvedLicenseNames set of approved license names.
+//     */
+//    public void addApprovedLicenseNames(ILicenseFamily[] approvedLicenseNames) {
+//        addApprovedLicenseNames(Arrays.asList(approvedLicenseNames));
+//    }
 
     /**
      * Adds a license to the list of approved license names.
@@ -230,12 +230,11 @@ public void addApprovedLicenseNames(ILicenseFamily[] approvedLicenseNames) {
      * @param approvedLicenseNames set of approved license names.
      */
     public void addApprovedLicenseName(ILicenseFamily approvedLicenseName) {
-        approvedLicenseNames.add(approvedLicenseName);
+        approvedLicenseId.add(approvedLicenseName.getFamilyCategory());
     }
 
     public void addApprovedLicenseName(String familyCategory) {
-        ILicense licenseProxy = ILicenseProxy.create(familyCategory, licenses);
-        addApprovedLicenseName(ILicenseFamilyProxy.create(licenseProxy));
+        approvedLicenseId.add(familyCategory);
     }
 
     /**
@@ -243,8 +242,12 @@ public void addApprovedLicenseName(String familyCategory) {
      *
      * @param approvedLicenseNames set of approved license names.
      */
-    public void addApprovedLicenseNames(Collection<ILicenseFamily> approvedLicenseNames) {
-        this.approvedLicenseNames.addAll(approvedLicenseNames);
+    public void addApprovedLicenseNames(Collection<String> approvedLicenseNames) {
+        approvedLicenseNames.stream().forEach(this::addApprovedLicenseName);
+    }
+
+    public void removeApprovedLicenseName(String familyCategory) {
+        removedLicenseId.add(ILicenseFamily.makeCategory(familyCategory));
     }
 
     /**
@@ -307,6 +310,80 @@ public void setAddingLicenses(boolean addingLicenses) {
         this.addingLicenses = addingLicenses;
     }
 
+    /**
+     * Returns the set of defined licenses unless filter is set to no-defaults. if
+     * no-defaults was set then an empty set is returned.
+     * 
+     * @return The set of defined licenses.
+     */
+    public SortedSet<ILicense> getLicenses() {
+
+//              This code addes derived licenses to the approved families if they are derived from appoved licenses.        
+//            Stack<ILicense> stack = new Stack<>();
+//            for (ILicense license : licenses) {
+//                ILicense derivedFrom = license.derivedFrom();
+//                if (derivedFrom != null) {
+//                    stack.push(license);
+//                    while (derivedFrom != null) {
+//                        stack.push(derivedFrom);
+//                        derivedFrom = derivedFrom.derivedFrom();
+//                    }
+//                }
+//                while (!stack.isEmpty()) {
+//                    derivedFrom = stack.pop();
+//                    boolean found = approvedLicenseId.contains(derivedFrom.getLicenseFamily().getFamilyCategory());
+//                    if (found) {
+//                        while (!stack.isEmpty()) {
+//                            approvedLicenseId.add(stack.pop().getLicenseFamily().getFamilyCategory());
+//                        }
+//                    }
+//                }
+//                
+//            }
+
+        switch (approvalFilter) {
+        case all:
+            return Collections.unmodifiableSortedSet(licenses);
+        case approved:
+            SortedSet<String> approvedLicenses = getFilteredLicenses();
+            SortedSet<ILicense> result = new TreeSet<>(ILicense.getComparator());
+            licenses.stream().filter(x -> approvedLicenses.contains(x.getLicenseFamily().getFamilyCategory()))
+                    .forEach(result::add);
+            return result;
+        case none:
+        default:
+            return Collections.emptySortedSet();
+        }
+    }
+
+    public SortedSet<ILicenseFamily> getApprovedLicenses() {
+        SortedSet<String> approvedLicenses = getFilteredLicenses();
+        SortedSet<ILicenseFamily> result = new TreeSet<>();
+        licenses.stream().filter(x -> approvedLicenses.contains(x.getLicenseFamily().getFamilyCategory()))
+                .forEach(x -> result.add(x.getLicenseFamily()));
+        return result;
+    }
+
+    private SortedSet<String> getFilteredLicenses() {
+        SortedSet<String> result = new TreeSet<>(approvedLicenseId);
+        result.removeAll(removedLicenseId);
+        return result;
+    }
+
+    /**
+     * Set which files will be listed as approved.
+     * 
+     * @param filter the fileter type.
+     * @return this Builder for chaining
+     */
+    public void setLicenseFilter(Filter filter) {
+        approvalFilter = filter;
+    }
+
+    public ILicense createDefaultMatcher() {
+        return getLicenses().isEmpty() ? null : new LicenseCollectionMatcher(getLicenses());
+    }
+
     /**
      * Validates that the configuration is valid.
      * 
@@ -328,7 +405,7 @@ public void validate(Consumer<String> logger) {
     }
 
     public DefaultPolicy getDefaultPolicy() {
-        return new DefaultPolicy(getApprovedLicenseNames());
+        return new DefaultPolicy(getApprovedLicenses());
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java b/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java
index 399226a37..534d7e721 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat;
 
 import java.io.InputStream;
@@ -29,29 +29,27 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-
 class ReportTransformer implements Runnable {
 
     private final Writer out;
     private final Transformer transformer;
     private final Reader in;
-    
-    public ReportTransformer(final Writer out, final Reader style, 
-            final Reader in) throws TransformerConfigurationException {
+
+    public ReportTransformer(final Writer out, final Reader style, final Reader in)
+            throws TransformerConfigurationException {
         this.out = out;
-        transformer = TransformerFactory.newInstance().newTransformer(
-                new StreamSource(style));
+        transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(style));
         this.in = in;
     }
-    
-    public ReportTransformer(final Writer out, final InputStream style, 
-            final Reader in) throws TransformerConfigurationException {
+
+    public ReportTransformer(final Writer out, final InputStream style, final Reader in)
+            throws TransformerConfigurationException {
         this.out = out;
-        transformer = TransformerFactory.newInstance().newTransformer(
-                new StreamSource(style));
+        transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(style));
         this.in = in;
     }
-    
+
+    @Override
     public void run() {
         try {
             transform();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index dcb255879..da2a9018f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -42,7 +42,6 @@ private final static class DefaultAnalyser implements IDocumentAnalyser {
         private final ILicense license;
 
         public DefaultAnalyser(final ILicense license) {
-            super();
             this.license = license;
         }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index ab7883ceb..bf8e619e9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -28,7 +28,7 @@
 public abstract class BaseLicense extends AbstractMatcherContainer implements ILicense {
     private ILicenseFamily family;
     private String notes;
-    private ILicense derivedFrom;
+    private String derivedFrom;
 
     public BaseLicense(ILicenseFamily family, String notes, IHeaderMatcher matcher) {
         this(null, family, notes, matcher);
@@ -39,7 +39,7 @@ public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeader
     }
 
     public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher,
-            ILicense derivedFrom) {
+            String derivedFrom) {
         super(String.format("%s:%s:%s/%s", idPrefix == null ? "" : idPrefix, family.getFamilyCategory(),
                 matcher.getClass().getSimpleName(), matcher.getId()), Arrays.asList(matcher));
         this.family = family;
@@ -68,7 +68,7 @@ public boolean matches(String line) {
     }
 
     @Override
-    public ILicense derivedFrom() {
+    public String derivedFrom() {
         return derivedFrom;
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
index 53e81383f..95fa862af 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -54,6 +54,7 @@ public boolean matches(String line) {
                 flags[i] = iter.next().matches(line);
                 result &= flags[i];
             }
+            i++;
         }
         return result;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
index 824cae4bc..2d937f3da 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
@@ -21,25 +21,25 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-public class ILicenseFamilyProxy implements ILicenseFamily {
-    private final ILicense wrapped;
-
-    static public ILicenseFamily create(ILicense license) {
-        return (license instanceof ILicenseProxy) ? new ILicenseFamilyProxy(license) : license.getLicenseFamily();
-    }
-
-    private ILicenseFamilyProxy(ILicense license) {
-        this.wrapped = license;
-    }
-
-    @Override
-    public String getFamilyName() {
-        return wrapped.getLicenseFamily().getFamilyName();
-    }
-
-    @Override
-    public String getFamilyCategory() {
-        return wrapped.getLicenseFamily().getFamilyCategory();
-    }
-
-}
+//public class ILicenseFamilyProxy implements ILicenseFamily {
+//    private final ILicense wrapped;
+//
+//    static public ILicenseFamily create(ILicense license) {
+//        return (license instanceof ILicenseProxy) ? new ILicenseFamilyProxy((ILicenseProxy)license) : license.getLicenseFamily();
+//    }
+//
+//    private ILicenseFamilyProxy(ILicenseProxy license) {
+//        this.wrapped = license;
+//    }
+//
+//    @Override
+//    public String getFamilyName() {
+//        return wrapped.getLicenseFamily().getFamilyName();
+//    }
+//
+//    @Override
+//    public String getFamilyCategory() {
+//        return wrapped.getLicenseFamily().getFamilyCategory();
+//    }
+//
+//}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
index 95ffab465..0d42ca21e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
@@ -23,71 +23,75 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-public class ILicenseProxy implements ILicense {
-    private final String proxyId;
-    private ILicense wrapped;
-    private final SortedSet<ILicense> licenses;
-
-    static public ILicense create(String proxyId, SortedSet<ILicense> licenses) {
-        ILicense result = ILicense.search(proxyId, licenses);
-        if (result == null) {
-            result = new ILicenseProxy(proxyId, licenses);
-        }
-        return result;
-    }
-
-    ILicenseProxy(String proxyId, SortedSet<ILicense> licenses) {
-        this.proxyId = proxyId;
-        this.licenses = licenses;
-    }
-
-    private void checkProxy() {
-        if (wrapped == null) {
-            wrapped = ILicense.search(proxyId, licenses);
-            if (wrapped == null) {
-                throw new IllegalStateException(String.format("%s is not a valid family category", proxyId));
-            }
-        }
-    }
-
-    @Override
-    public ILicenseFamily getLicenseFamily() {
-        checkProxy();
-        return wrapped.getLicenseFamily();
-    }
-
-    @Override
-    public String getNotes() {
-        checkProxy();
-        return wrapped.getNotes();
-    }
-
-    @Override
-    public ILicense derivedFrom() {
-        checkProxy();
-        return wrapped.derivedFrom();
-    }
-
-    @Override
-    public String getId() {
-        checkProxy();
-        return wrapped.getId();
-    }
-
-    @Override
-    public void reset() {
-        checkProxy();
-        wrapped.reset();
-    }
-
-    @Override
-    public boolean matches(String line) {
-        checkProxy();
-        return wrapped.matches(line);
-    }
-
-    @Override
-    public int compareTo(ILicense arg0) {
-        return ILicense.getComparator().compare(this, arg0);
-    }
-}
+//public class ILicenseProxy implements ILicense {
+//    private final String proxyId;
+//    private ILicense wrapped;
+//    private SortedSet<ILicense> licenses;
+//
+//    static public ILicense create(String proxyId, SortedSet<ILicense> licenses) {
+//        ILicense result = ILicense.search(proxyId, licenses);
+//        if (result == null) {
+//            result = new ILicenseProxy(proxyId, licenses);
+//        }
+//        return result;
+//    }
+//
+//    ILicenseProxy(String proxyId, SortedSet<ILicense> licenses) {
+//        this.proxyId = proxyId;
+//        this.licenses = licenses;
+//    }
+//
+//    void setLicenses(SortedSet<ILicense> licenses) {
+//        this.licenses = licenses;
+//    }
+//    
+//    private void checkProxy() {
+//        if (wrapped == null) {
+//            wrapped = ILicense.search(proxyId, licenses);
+//            if (wrapped == null) {
+//                throw new IllegalStateException(String.format("%s is not a valid family category", proxyId));
+//            }
+//        }
+//    }
+//
+//    @Override
+//    public ILicenseFamily getLicenseFamily() {
+//        checkProxy();
+//        return wrapped.getLicenseFamily();
+//    }
+//
+//    @Override
+//    public String getNotes() {
+//        checkProxy();
+//        return wrapped.getNotes();
+//    }
+//
+//    @Override
+//    public ILicense derivedFrom() {
+//        checkProxy();
+//        return wrapped.derivedFrom();
+//    }
+//
+//    @Override
+//    public String getId() {
+//        checkProxy();
+//        return wrapped.getId();
+//    }
+//
+//    @Override
+//    public void reset() {
+//        checkProxy();
+//        wrapped.reset();
+//    }
+//
+//    @Override
+//    public boolean matches(String line) {
+//        checkProxy();
+//        return wrapped.matches(line);
+//    }
+//
+//    @Override
+//    public int compareTo(ILicense arg0) {
+//        return ILicense.getComparator().compare(this, arg0);
+//    }
+//}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index b3a72a21e..c6cdb2104 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -19,27 +19,18 @@
 package org.apache.rat.configuration;
 
 import java.net.URL;
-import java.util.Collection;
 import java.util.SortedSet;
 
 import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
 
 public interface LicenseReader {
     /**
      * Adds a URL to the set of files to be read.
+     * 
      * @param url the URL to read.
      */
     void add(URL url);
 
-    /**
-     * Reads the configuration and extracts the Family metadata indexed by category
-     * id.
-     * 
-     * @return SortedSet of ILicenseFamily objects
-     */
-    SortedSet<ILicenseFamily> readFamilies();
-
     /**
      * Reads the configuration and extracts the BaseLicenses.
      * 
@@ -50,7 +41,8 @@ public interface LicenseReader {
     /**
      * Reads the configuration and extracts the list of approved licenses.
      * 
-     * @return The list of approved licenses.
+     * @return The list of approved licenses specified in the configuration or an
+     * empty list if non specified..
      */
-    SortedSet<ILicenseFamily> approvedLicenseFamilies();
+    SortedSet<String> approvedLicenseId();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 380405410..b47c96f16 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -111,8 +111,7 @@ enum AttributeName {
 
     private final SortedSet<ILicense> licenses;
     private final Map<String, IHeaderMatcher> matchers;
-    private final SortedSet<ILicenseFamily> licenseFamilies;
-    private final SortedSet<ILicenseFamily> approvedFamilies;
+    private final SortedSet<String> licenseFamilies;
 
     public XMLConfigurationReader() {
         try {
@@ -127,7 +126,6 @@ public XMLConfigurationReader() {
         approvedElement = document.createElement(APPROVED);
         rootElement.appendChild(approvedElement);
         licenses = new TreeSet<>((x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily()));
-        approvedFamilies = new TreeSet<>();
         licenseFamilies = new TreeSet<>();
         matchers = new HashMap<>();
     }
@@ -191,15 +189,7 @@ public void add(Document newDoc) {
 
     }
 
-    @Override
-    public SortedSet<ILicenseFamily> readFamilies() {
-        if (licenses.size() == 0) {
-            readLicenses();
-        }
-        return Collections.unmodifiableSortedSet(licenseFamilies);
-    }
-
-    Map<AttributeName, String> attributes(Node node) {
+    private Map<AttributeName, String> attributes(Node node) {
         NamedNodeMap nnm = node.getAttributes();
         Map<AttributeName, String> result = new HashMap<>();
         for (int i = 0; i < nnm.getLength(); i++) {
@@ -320,8 +310,7 @@ private ILicense parseLicense(Node licenseNode) {
                 }
             }
         });
-        ILicense derivedFrom = !attributes.containsKey(AttributeName.derived_from) ? null
-                : ILicenseProxy.create(attributes.get(AttributeName.derived_from), licenses);
+        String derivedFrom = StringUtils.defaultIfBlank(attributes.get(AttributeName.derived_from),null);
         String notes = StringUtils.defaultIfBlank(notesBuilder.toString().trim(), null);
         return new SimpleLicense(family, matcher[0], derivedFrom, notes);
     }
@@ -330,45 +319,30 @@ private ILicense parseLicense(Node licenseNode) {
     public SortedSet<ILicense> readLicenses() {
         if (licenses.size() == 0) {
             nodeListConsumer(document.getElementsByTagName(LICENSE), x -> licenses.add(parseLicense(x)));
-            licenses.stream().map(ILicense::getLicenseFamily).forEach(licenseFamilies::add);
-            nodeListConsumer(document.getElementsByTagName(FAMILY), x -> approvedFamilies.add(parseFamily(x)));
-            Stack<ILicense> stack = new Stack<>();
-            for (ILicense license : licenses) {
-                ILicense derivedFrom = license.derivedFrom();
-                if (derivedFrom != null) {
-                    stack.push(license);
-                    while (derivedFrom != null) {
-                        stack.push(derivedFrom);
-                        derivedFrom = derivedFrom.derivedFrom();
-                    }
-                }
-                while (!stack.isEmpty()) {
-                    derivedFrom = stack.pop();
-                    ILicenseFamily found = ILicenseFamily.search(derivedFrom.getLicenseFamily(), approvedFamilies);
-                    if (found != null) {
-                        while (!stack.isEmpty()) {
-                            approvedFamilies.add(stack.pop().getLicenseFamily());
-                        }
-                    }
-                }
-
-            }
+            nodeListConsumer(document.getElementsByTagName(FAMILY), x -> licenseFamilies.add(parseFamily(x)));
             document = null;
         }
         return Collections.unmodifiableSortedSet(licenses);
     }
 
-    private ILicenseFamily parseFamily(Node familyNode) {
+    private String parseFamily(Node familyNode) {
         Map<AttributeName, String> attributes = attributes(familyNode);
         if (attributes.containsKey(AttributeName.license_ref)) {
-            return ILicenseFamilyProxy
-                    .create(ILicenseProxy.create(attributes.get(AttributeName.license_ref), licenses));
+            return attributes.get(AttributeName.license_ref);
         }
         throw new ConfigurationException("family tag requires " + AttributeName.license_ref + " attribute");
     }
 
     @Override
-    public SortedSet<ILicenseFamily> approvedLicenseFamilies() {
-        return approvedFamilies.isEmpty() ? readFamilies() : approvedFamilies;
+    public SortedSet<String> approvedLicenseId() {
+        if (licenses.isEmpty()) {
+            this.readLicenses();
+        }
+        if (licenseFamilies.isEmpty()) {
+            SortedSet<String> result = new TreeSet<>();
+            licenses.stream().map( x -> x.getLicenseFamily().getFamilyCategory()).forEach(result::add);
+            return result;
+        }
+        return Collections.unmodifiableSortedSet(licenseFamilies);
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index a43da36b8..3af7477ef 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -26,7 +26,7 @@
 public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
     ILicenseFamily getLicenseFamily();
     String getNotes();
-    ILicense derivedFrom();
+    String derivedFrom();
     
     /**
      * Search a set
@@ -69,7 +69,7 @@ public String getNotes() {
             }
     
             @Override
-            public ILicense derivedFrom() {
+            public String derivedFrom() {
                 return null;
             }
             
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index cb13f475a..5d20cbbd6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -24,10 +24,10 @@ public class SimpleLicense implements ILicense {
 
     private ILicenseFamily family;
     private IHeaderMatcher matcher;
-    private ILicense derivedFrom;
+    private String derivedFrom;
     private String notes;
 
-    public SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, ILicense derivedFrom, String notes) {
+    public SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, String derivedFrom, String notes) {
         this.family = family;
         this.matcher = matcher;
         this.derivedFrom = derivedFrom;
@@ -55,7 +55,7 @@ public void setMatcher(IHeaderMatcher matcher) {
         this.matcher = matcher;
     }
 
-    public void setDerivedFrom(ILicense derivedFrom) {
+    public void setDerivedFrom(String derivedFrom) {
         this.derivedFrom = derivedFrom;
     }
 
@@ -90,7 +90,7 @@ public String getNotes() {
     }
 
     @Override
-    public ILicense derivedFrom() {
+    public String derivedFrom() {
         return derivedFrom;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 7a9dafe3d..9141c5881 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -28,7 +28,6 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.IDocumentAnalyser;
-import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.SimpleLicenseFamily;
 
@@ -39,19 +38,19 @@ public class DefaultPolicy implements IDocumentAnalyser {
      * Creates a policy that matches the default licenses. Mainly used for testing
      * purposes.
      */
-    DefaultPolicy() {
-        this(new ArrayList<ILicenseFamily>(0));
-    }
+//    DefaultPolicy() {
+//        this(new ArrayList<ILicenseFamily>(0));
+//    }
 
-    public DefaultPolicy(final ILicenseFamily[] approvedLicenses) {
-        this(Arrays.asList(approvedLicenses));
-    }
+//    public DefaultPolicy(final ILicenseFamily[] approvedLicenses) {
+//        this(Arrays.asList(approvedLicenses));
+//    }
 
     public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseNames) {
         this.approvedLicenseNames = new TreeSet<>();
         this.approvedLicenseNames.addAll(approvedLicenseNames);
     }
-    
+
     public void add(ILicenseFamily approvedLicense) {
         this.approvedLicenseNames.add(approvedLicense);
     }
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index 3c693d76a..331e806f8 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -13,8 +13,8 @@
 	</license>
 -->
 		<license id="AL" name="Apache License Version 2.0">
-		<all>
-			<any id="ALStandard">
+			<all>
+				<any id="ALStandard">
 					<text>Licensed under the Apache License, Version 2.0 (the
 						"License")</text>
 					<text>Licensed to the Apache Software Foundation (ASF) under
@@ -38,7 +38,7 @@
 
 		<license id="ASL" name="Applied Apahce License Version 2.0">
 			<all>
-				<matcher_ref refid="ALStandard"/>
+				<matcher_ref refid="ALStandard" />
 				<copyright />
 			</all>
 		</license>
@@ -166,7 +166,7 @@
 				<text>TMF854 Version 1.0</text>
 				<copyright
 					owner="TeleManagement Forum" />
-					<matcher_ref refid="BSD-3-txt"/>
+				<matcher_ref refid="BSD-3-txt" />
 			</all>
 		</license>
 
@@ -174,7 +174,8 @@
 			<note>Note that W3C requires a NOTICE.</note>
 			<note>All modifications require notes.</note>
 			<note>
-				See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.</note>
+				See
+				http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.</note>
 			<any>
 				<text>
 					http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</text>
@@ -187,26 +188,51 @@
 			<note>
 				Note that W3CD does not allow modifications.</note>
 			<note>
-				See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.</note>
+				See
+				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.</note>
 			<text>
 				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</text>
 		</license>
-		
+
 		<license id='BSD-3' name="BSD 3 clause">
 			<any>
 				<all>
 					<copyright />
 					<text id="BSD-3-txt">
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+						Redistribution and use in source and binary forms, with
+						or without modification, are permitted provided that the
+						following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+						1. Redistributions of source code must retain the above
+						copyright notice, this list of conditions and the
+						following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+						2. Redistributions in binary form must reproduce the
+						above copyright notice, this list of conditions and the
+						following disclaimer in the documentation and/or other
+						materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+						3. Neither the name of the copyright holder nor the
+						names of its contributors may be used to endorse or
+						promote products derived from this software without
+						specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</text>
+						THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+						CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED
+						WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+						WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+						PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+						COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+						DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+						CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+						PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+						USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+						CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+						CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+						NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+						USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+						OF SUCH DAMAGE.</text>
 
 				</all>
 				<spdx name='BSD-3-Clause' />
@@ -214,18 +240,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
 		</license>
 	</licenses>
 	<approved>
-		<family license_ref="BSD-3"/>
-		<family license_ref='AL'/>
-		<family license_ref='ASL'/>
-		<family license_ref='CDDL1'/>
-		<family license_ref='DOJO'/>
-		<family license_ref='GPL1'/>
-		<family license_ref='GPL2'/>
-		<family license_ref='GPL3'/>
-		<family license_ref='GEN'/>
-		<family license_ref='MIT'/>
-		<family license_ref='OASIS'/>
-		<family license_ref='W3C'/>
-		<family license_ref='W3CD'/>
+		<family license_ref="BSD-3" />
+		<family license_ref='AL' />
+		<family license_ref='ASL' />
+		<family license_ref='CDDL1' />
+		<family license_ref='DOJO' />
+		<family license_ref='GPL1' />
+		<family license_ref='GPL2' />
+		<family license_ref='GPL3' />
+		<family license_ref='GEN' />
+		<family license_ref='MIT' />
+		<family license_ref='OASIS' />
+		<family license_ref='W3C' />
+		<family license_ref='W3CD' />
 	</approved>
 </rat-config>
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
new file mode 100644
index 000000000..fdd5ecb6a
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
@@ -0,0 +1,27 @@
+package org.apache.rat.analysis.matchers;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.junit.Test;
+
+public class AndMatcherTest {
+
+    @Test
+    public void standardTest() {
+        IHeaderMatcher one = mock(IHeaderMatcher.class);
+        IHeaderMatcher two = mock(IHeaderMatcher.class);
+        when(one.matches(any())).thenReturn( true ).thenReturn(false);
+        when(two.matches(any())).thenReturn( false ).thenReturn(true);
+        
+        AndMatcher target = new AndMatcher( "Testing", Arrays.asList( one, two ));
+        assertFalse( target.matches("hello"));
+        assertTrue( target.matches("world"));
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index be1680f5e..da9d13349 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -16,32 +16,40 @@
  */
 package org.apache.rat.configuration;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertArrayEquals;
 
 import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Collection;
 import java.util.stream.Collectors;
 
-import org.apache.rat.license.ILicenseFamily;
 import org.junit.Test;
 
 public class ConfigurationReaderTest {
 
-    private static String[] FAMILIES = { "GEN  ", "AL   ", "ASL  ", "TMF  ", "DOJO ", "OASIS", "W3CD ", "W3C  ",
-            "GPL1 ", "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "ILLUM", "BSD-3" };
+    private static String[] EXPECTED_IDS = { "AL", "ASL", "BSD-3", "CDDL1", "DOJO", "GEN", "GPL1", "GPL2", "GPL3",
+            "MIT", "OASIS", "W3C", "W3CD" };
+    private static String[] EXPECTED_LICENSES = { "AL   ", "ASL  ", "BSD-3", "CDDL1", "DOJO ", "GEN  ", "GPL1 ",
+            "GPL2 ", "GPL3 ", "ILLUM", "MIT  ", "OASIS", "TMF  ", "W3C  ", "W3CD " };
 
     @Test
-    public void readDefault() {
+    public void approvedLicenseIdTest() {
         XMLConfigurationReader reader = new XMLConfigurationReader();
-        URL url = XMLConfigurationReader.class.getResource("/org/apache/rat/default.xml");
+        URL url = ConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
         reader.read(url);
-        List<String> familyCategories = Arrays.asList(FAMILIES);
-        List<String> readCategories = reader.readFamilies().stream().map(ILicenseFamily::getFamilyCategory)
-                .collect(Collectors.toList());
-        assertTrue(readCategories.containsAll(familyCategories));
-        readCategories.removeAll(familyCategories);
-        assertTrue(readCategories.isEmpty());
+
+        Collection<String> readCategories = reader.approvedLicenseId();
+        assertArrayEquals(EXPECTED_IDS, readCategories.toArray(new String[readCategories.size()]));
+    }
+
+    @Test
+    public void LicensesTest() {
+        XMLConfigurationReader reader = new XMLConfigurationReader();
+        URL url = ConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
+        reader.read(url);
+
+        Collection<String> readCategories = reader.readLicenses().stream()
+                .map(x -> x.getLicenseFamily().getFamilyCategory()).collect(Collectors.toList());
+        assertArrayEquals(EXPECTED_LICENSES, readCategories.toArray(new String[readCategories.size()]));
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 38d1cf329..9fa4822a3 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -21,13 +21,15 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.stream.Collectors;
 
 import org.apache.rat.Defaults;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.api.MetaData.Datum;
 import org.apache.rat.document.MockLocation;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.SimpleLicenseFamily;
 import org.junit.Before;
@@ -42,7 +44,9 @@ public class DefaultPolicyTest {
     @Before
     public void setUp() throws Exception {
         Defaults defaults = Defaults.builder().build();
-        policy = new DefaultPolicy(defaults.getLicenseFamilies());
+
+        policy = new DefaultPolicy(
+                defaults.getLicenses().stream().map(ILicense::getLicenseFamily).collect(Collectors.toList()));
         subject = new MockLocation("subject");
     }
 
@@ -117,15 +121,15 @@ public void testUnknownFamily() throws Exception {
         assertApproval(false);
     }
 
-    @Test
-    public void testNullAsMarkerOfDefaults() {
-        // without defaults and no additions == 0
-        for (DefaultPolicy policy : new DefaultPolicy[] { //
-                new DefaultPolicy(new ArrayList<ILicenseFamily>(0)), //
-                new DefaultPolicy(new ILicenseFamily[] {}), }) {
-            assertEquals(0, policy.getApprovedLicenseNames().size());
-        }
-    }
+//    @Test
+//    public void testNullAsMarkerOfDefaults() {
+//        // without defaults and no additions == 0
+//        for (DefaultPolicy policy : new DefaultPolicy[] { //
+//                new DefaultPolicy(new ArrayList<ILicenseFamily>(0)), //
+//                new DefaultPolicy(new ILicenseFamily[] {}), }) {
+//            assertEquals(0, policy.getApprovedLicenseNames().size());
+//        }
+//    }
 
     @Test
     public void testAddNewApprovedLicenseAndDefaults() {
@@ -143,7 +147,7 @@ public void testAddNewApprovedLicenseAndDefaults() {
 
     @Test
     public void testAddNewApprovedLicenseNoDefaults() {
-        policy = new DefaultPolicy();
+        policy = new DefaultPolicy(Collections.emptySet());
         assertEquals(0, policy.getApprovedLicenseNames().size());
         ILicenseFamily testingFamily = new SimpleLicenseFamily("test", "Testing License Family");
         setMetadata(testingFamily);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 5104eaa58..2a3aaf449 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -15,11 +15,23 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.report.xml;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.StringWriter;
+import java.util.regex.Pattern;
+
+import org.apache.rat.ConfigurationException;
+import org.apache.rat.Defaults.Filter;
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.SimpleLicenseFamily;
@@ -31,27 +43,14 @@
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-import java.io.File;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class XmlReportFactoryTest {
 
     private static final Pattern IGNORE_EMPTY = Pattern.compile(".svn|Empty.txt");
-    
+
     private StringWriter out;
     private IXmlWriter writer;
-    
+
     @Before
     public void setUp() throws Exception {
         out = new StringWriter();
@@ -62,19 +61,20 @@ public void setUp() throws Exception {
     private void report(DirectoryWalker directory, RatReport report) throws Exception {
         directory.run(report);
     }
-    
+
     @Test
     public void standardReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        
+
         final ILicense mockLicense = mock(ILicense.class);
-        when(mockLicense.matches(any())).thenReturn( true );
-        when(mockLicense.getLicenseFamily()).thenReturn( new SimpleLicenseFamily( "TEST", "Testing family"));
-        
+        when(mockLicense.matches(any())).thenReturn(true);
+        when(mockLicense.getLicenseFamily()).thenReturn(new SimpleLicenseFamily("TEST", "Testing family"));
+
         DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY);
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.addLicense(mockLicense);
+        configuration.setLicenseFilter(Filter.all);
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
         report(directory, report);
@@ -82,13 +82,34 @@ public void standardReport() throws Exception {
         writer.closeDocument();
         final String output = out.toString();
         assertTrue("Preamble and document element are OK",
-                   output.startsWith("<?xml version='1.0'?>" +
-                "<rat-report timestamp="));
-        
+                output.startsWith("<?xml version='1.0'?>" + "<rat-report timestamp="));
+
         assertTrue("Is well formed", XmlUtils.isWellFormedXml(output));
-        assertEquals("Binary files", Integer.valueOf(2), statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_BINARY));
-        assertEquals("Notice files", Integer.valueOf(2), statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_NOTICE));
-        assertEquals("Standard files", Integer.valueOf(6), statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_STANDARD));
-        assertEquals("Archives", Integer.valueOf(1), statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_ARCHIVE));
+        assertEquals("Binary files", Integer.valueOf(2),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_BINARY));
+        assertEquals("Notice files", Integer.valueOf(2),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_NOTICE));
+        assertEquals("Standard files", Integer.valueOf(6),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_STANDARD));
+        assertEquals("Archives", Integer.valueOf(1),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_ARCHIVE));
+    }
+
+    @Test
+    public void testNoLicense() throws Exception {
+        final ILicense mockLicense = mock(ILicense.class);
+        when(mockLicense.matches(any())).thenReturn(true);
+        when(mockLicense.getLicenseFamily()).thenReturn(new SimpleLicenseFamily("TEST", "Testing family"));
+
+        final ClaimStatistic statistic = new ClaimStatistic();
+        final ReportConfiguration configuration = new ReportConfiguration();
+        configuration.addLicense(mockLicense);
+        try {
+            XmlReportFactory.createStandardReport(writer, statistic, configuration);
+            fail("Should have thrown exception");
+        } catch (ConfigurationException e) {
+            // expected;
+        }
+
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index 9e4546a6c..196b32c4a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -15,16 +15,23 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.report.xml;
 
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
 import org.apache.rat.analysis.DefaultAnalyserFactory;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.AbstractReport;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
@@ -36,26 +43,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.regex.Pattern;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class XmlReportTest {
 
     private static final Pattern IGNORE = Pattern.compile(".svn");
     private StringWriter out;
     private IXmlWriter writer;
     private RatReport report;
-    
+
     @Before
     public void setUp() throws Exception {
         out = new StringWriter();
@@ -63,18 +57,18 @@ public void setUp() throws Exception {
         writer.startDocument();
         final SimpleXmlClaimReporter reporter = new SimpleXmlClaimReporter(writer);
         final ILicense matcher = mock(ILicense.class);
-        when(matcher.matches(any())).thenReturn( false );
+        when(matcher.matches(any())).thenReturn(false);
 
         IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(matcher);
         final List<AbstractReport> reporters = new ArrayList<>();
         reporters.add(reporter);
-        report = new ClaimReporterMultiplexer(analyser, reporters); 
+        report = new ClaimReporterMultiplexer(analyser, reporters);
     }
 
     private void report(DirectoryWalker directory) throws Exception {
         directory.run(report);
     }
-    
+
     @Test
     public void baseReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
@@ -85,134 +79,97 @@ public void baseReport() throws Exception {
         writer.closeDocument();
         final String output = out.toString();
         assertTrue("Preamble and document element are OK",
-                   output.startsWith("<?xml version='1.0'?>" +
-                "<rat-report timestamp="));
-        assertTrue(output+"Part after timestamp attribute is OK",
-                   output.endsWith(">" +
-                    "<resource name='" + elementsPath + "/Image.png'><type name='binary'/></resource>" +
-                    "<resource name='" + elementsPath + "/LICENSE'><type name='notice'/></resource>" +
-                    "<resource name='" + elementsPath + "/NOTICE'><type name='notice'/></resource>" +
-                    "<resource name='" + elementsPath + "/Source.java'><header-sample>package elements;\n" +
-"\n" +
-"/*\n" +
-" * This file does intentionally *NOT* contain an AL license header,\n" +
-" * because it is used in the test suite.\n" +
-" */\n" +
-"public class Source {\n" +
-"\n" +
-"}\n" + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>" +
-                    "<resource name='" + elementsPath + "/Text.txt'><header-sample>/*\n" +
-" * Licensed to the Apache Software Foundation (ASF) under one\n" +
-" * or more contributor license agreements.  See the NOTICE file\n" +
-" * distributed with this work for additional information\n" +
-" * regarding copyright ownership.  The ASF licenses this file\n" +
-" * to you under the Apache License, Version 2.0 (the \"License\");\n" +
-" * you may not use this file except in compliance with the License.\n" +
-" * You may obtain a copy of the License at\n" +
-" *\n" +
-" *    http://www.apache.org/licenses/LICENSE-2.0\n" +
-" *\n" +
-" * Unless required by applicable law or agreed to in writing,\n" +
-" * software distributed under the License is distributed on an\n" +
-" * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
-" * KIND, either express or implied.  See the License for the\n" +
-" * specific language governing permissions and limitations\n" +
-" * under the License.    \n" +
-" */\n" +
-"\n" +
-"            \n" +
-"</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>" +
-"<resource name='" + elementsPath + "/TextHttps.txt'><header-sample>/*\n" +
-" * Licensed to the Apache Software Foundation (ASF) under one\n" +
-" * or more contributor license agreements.  See the NOTICE file\n" +
-" * distributed with this work for additional information\n" +
-" * regarding copyright ownership.  The ASF licenses this file\n" +
-" * to you under the Apache License, Version 2.0 (the \"License\");\n" +
-" * you may not use this file except in compliance with the License.\n" +
-" * You may obtain a copy of the License at\n" +
-" *\n" +
-" *    https://www.apache.org/licenses/LICENSE-2.0.txt\n" +
-" *\n" +
-" * Unless required by applicable law or agreed to in writing,\n" +
-" * software distributed under the License is distributed on an\n" +
-" * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
-" * KIND, either express or implied.  See the License for the\n" +
-" * specific language governing permissions and limitations\n" +
-" * under the License.    \n" +
-" */\n" +
-"\n" +
-"            \n" +
-"</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>" +
-                    "<resource name='" + elementsPath + "/Xml.xml'><header-sample>&lt;?xml version='1.0'?&gt;\n" +
-"&lt;!--\n" +
-" Licensed to the Apache Software Foundation (ASF) under one   *\n" +
-" or more contributor license agreements.  See the NOTICE file *\n" +
-" distributed with this work for additional information        *\n" +
-" regarding copyright ownership.  The ASF licenses this file   *\n" +
-" to you under the Apache License, Version 2.0 (the            *\n" +
-" \"License\"); you may not use this file except in compliance   *\n" +
-" with the License.  You may obtain a copy of the License at   *\n" +
-"                                                              *\n" +
-"   http://www.apache.org/licenses/LICENSE-2.0                 *\n" +
-"                                                              *\n" +
-" Unless required by applicable law or agreed to in writing,   *\n" +
-" software distributed under the License is distributed on an  *\n" +
-" \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *\n" +
-" KIND, either express or implied.  See the License for the    *\n" +
-" specific language governing permissions and limitations      *\n" +
-" under the License.                                           *\n" +
-"--&gt;\n" +
-"&lt;document/&gt;\n" +
-"</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>" +
-                    "<resource name='" + elementsPath + "/buildr.rb'><header-sample># Licensed to the Apache Software Foundation (ASF) under one or more\n" +
-"# contributor license agreements.  See the NOTICE file distributed with this\n" +
-"# work for additional information regarding copyright ownership.  The ASF\n" +
-"# licenses this file to you under the Apache License, Version 2.0 (the\n" +
-"# \"License\"); you may not use this file except in compliance with the License.\n" +
-"# You may obtain a copy of the License at\n" +
-"#\n" +
-"#    http://www.apache.org/licenses/LICENSE-2.0\n" +
-"#\n" +
-"# Unless required by applicable law or agreed to in writing, software\n" +
-"# distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n" +
-"# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the\n" +
-"# License for the specific language governing permissions and limitations under\n" +
-"# the License.\n" +
-"\n" +
-"unless defined?(Buildr::VERSION)\n" +
-"  require 'buildr/version'\n" +
-"end\n" +
-"\n" +
-"require 'buildr/core'\n" +
-"require 'buildr/packaging'\n" +
-"require 'buildr/java'\n" +
-"require 'buildr/ide'\n" +
-"require 'buildr/shell'\n" +
-"require 'buildr/run'\n" +
-"\n" +
-"# Methods defined in Buildr are both instance methods (e.g. when included in Project)\n" +
-"# and class methods when invoked like Buildr.artifacts().\n" +
-"module Buildr ; extend self ; end\n" +
-"\n" +
-"# The Buildfile object (self) has access to all the Buildr methods and constants.\n" +
-"class &lt;&lt; self ; include Buildr ; end\n" +
-"\n" +
-"# All modules defined under Buildr::* can be referenced without Buildr:: prefix\n" +
-"# unless a conflict exists (e.g.  Buildr::RSpec vs ::RSpec)\n" +
-"class Object #:nodoc:\n" +
-"  Buildr.constants.each do |name|\n" +
-"    const = Buildr.const_get(name)\n" +
-"    if const.is_a?(Module)\n" +
-"      const_set name, const unless const_defined?(name)\n" +
-"    end\n" +
-"  end\n" +
-"end\n" +
-"\n" +
-                "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>" +
-                           "<resource name='" + elementsPath + "/dummy.jar'><type name='archive'/></resource>" +
-                           "<resource name='" + elementsPath + "/plain.json'><type name='binary'/></resource>" +
-                    "<resource name='" + elementsPath + "/sub/Empty.txt'><header-sample>\n</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>" +
-                    "</rat-report>"));
+                output.startsWith("<?xml version='1.0'?>" + "<rat-report timestamp="));
+        assertTrue(output + "Part after timestamp attribute is OK", output.endsWith(">" + "<resource name='"
+                + elementsPath + "/Image.png'><type name='binary'/></resource>" + "<resource name='" + elementsPath
+                + "/LICENSE'><type name='notice'/></resource>" + "<resource name='" + elementsPath
+                + "/NOTICE'><type name='notice'/></resource>" + "<resource name='" + elementsPath
+                + "/Source.java'><header-sample>package elements;\n" + "\n" + "/*\n"
+                + " * This file does intentionally *NOT* contain an AL license header,\n"
+                + " * because it is used in the test suite.\n" + " */\n" + "public class Source {\n" + "\n" + "}\n"
+                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
+                + "<resource name='" + elementsPath + "/Text.txt'><header-sample>/*\n"
+                + " * Licensed to the Apache Software Foundation (ASF) under one\n"
+                + " * or more contributor license agreements.  See the NOTICE file\n"
+                + " * distributed with this work for additional information\n"
+                + " * regarding copyright ownership.  The ASF licenses this file\n"
+                + " * to you under the Apache License, Version 2.0 (the \"License\");\n"
+                + " * you may not use this file except in compliance with the License.\n"
+                + " * You may obtain a copy of the License at\n" + " *\n"
+                + " *    http://www.apache.org/licenses/LICENSE-2.0\n" + " *\n"
+                + " * Unless required by applicable law or agreed to in writing,\n"
+                + " * software distributed under the License is distributed on an\n"
+                + " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+                + " * KIND, either express or implied.  See the License for the\n"
+                + " * specific language governing permissions and limitations\n" + " * under the License.    \n"
+                + " */\n" + "\n" + "            \n"
+                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
+                + "<resource name='" + elementsPath + "/TextHttps.txt'><header-sample>/*\n"
+                + " * Licensed to the Apache Software Foundation (ASF) under one\n"
+                + " * or more contributor license agreements.  See the NOTICE file\n"
+                + " * distributed with this work for additional information\n"
+                + " * regarding copyright ownership.  The ASF licenses this file\n"
+                + " * to you under the Apache License, Version 2.0 (the \"License\");\n"
+                + " * you may not use this file except in compliance with the License.\n"
+                + " * You may obtain a copy of the License at\n" + " *\n"
+                + " *    https://www.apache.org/licenses/LICENSE-2.0.txt\n" + " *\n"
+                + " * Unless required by applicable law or agreed to in writing,\n"
+                + " * software distributed under the License is distributed on an\n"
+                + " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+                + " * KIND, either express or implied.  See the License for the\n"
+                + " * specific language governing permissions and limitations\n" + " * under the License.    \n"
+                + " */\n" + "\n" + "            \n"
+                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
+                + "<resource name='" + elementsPath + "/Xml.xml'><header-sample>&lt;?xml version='1.0'?&gt;\n"
+                + "&lt;!--\n" + " Licensed to the Apache Software Foundation (ASF) under one   *\n"
+                + " or more contributor license agreements.  See the NOTICE file *\n"
+                + " distributed with this work for additional information        *\n"
+                + " regarding copyright ownership.  The ASF licenses this file   *\n"
+                + " to you under the Apache License, Version 2.0 (the            *\n"
+                + " \"License\"); you may not use this file except in compliance   *\n"
+                + " with the License.  You may obtain a copy of the License at   *\n"
+                + "                                                              *\n"
+                + "   http://www.apache.org/licenses/LICENSE-2.0                 *\n"
+                + "                                                              *\n"
+                + " Unless required by applicable law or agreed to in writing,   *\n"
+                + " software distributed under the License is distributed on an  *\n"
+                + " \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *\n"
+                + " KIND, either express or implied.  See the License for the    *\n"
+                + " specific language governing permissions and limitations      *\n"
+                + " under the License.                                           *\n" + "--&gt;\n"
+                + "&lt;document/&gt;\n"
+                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
+                + "<resource name='" + elementsPath
+                + "/buildr.rb'><header-sample># Licensed to the Apache Software Foundation (ASF) under one or more\n"
+                + "# contributor license agreements.  See the NOTICE file distributed with this\n"
+                + "# work for additional information regarding copyright ownership.  The ASF\n"
+                + "# licenses this file to you under the Apache License, Version 2.0 (the\n"
+                + "# \"License\"); you may not use this file except in compliance with the License.\n"
+                + "# You may obtain a copy of the License at\n" + "#\n"
+                + "#    http://www.apache.org/licenses/LICENSE-2.0\n" + "#\n"
+                + "# Unless required by applicable law or agreed to in writing, software\n"
+                + "# distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n"
+                + "# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the\n"
+                + "# License for the specific language governing permissions and limitations under\n"
+                + "# the License.\n" + "\n" + "unless defined?(Buildr::VERSION)\n" + "  require 'buildr/version'\n"
+                + "end\n" + "\n" + "require 'buildr/core'\n" + "require 'buildr/packaging'\n"
+                + "require 'buildr/java'\n" + "require 'buildr/ide'\n" + "require 'buildr/shell'\n"
+                + "require 'buildr/run'\n" + "\n"
+                + "# Methods defined in Buildr are both instance methods (e.g. when included in Project)\n"
+                + "# and class methods when invoked like Buildr.artifacts().\n" + "module Buildr ; extend self ; end\n"
+                + "\n" + "# The Buildfile object (self) has access to all the Buildr methods and constants.\n"
+                + "class &lt;&lt; self ; include Buildr ; end\n" + "\n"
+                + "# All modules defined under Buildr::* can be referenced without Buildr:: prefix\n"
+                + "# unless a conflict exists (e.g.  Buildr::RSpec vs ::RSpec)\n" + "class Object #:nodoc:\n"
+                + "  Buildr.constants.each do |name|\n" + "    const = Buildr.const_get(name)\n"
+                + "    if const.is_a?(Module)\n" + "      const_set name, const unless const_defined?(name)\n"
+                + "    end\n" + "  end\n" + "end\n" + "\n"
+                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
+                + "<resource name='" + elementsPath + "/dummy.jar'><type name='archive'/></resource>"
+                + "<resource name='" + elementsPath + "/plain.json'><type name='binary'/></resource>"
+                + "<resource name='" + elementsPath
+                + "/sub/Empty.txt'><header-sample>\n</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
+                + "</rat-report>"));
         assertTrue("Is well formed", XmlUtils.isWellFormedXml(output));
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java b/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java
index f96088487..8ebcca1c3 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java
@@ -18,8 +18,6 @@
  */
 package org.apache.rat.test.utils;
 
-import org.apache.rat.document.impl.DocumentImplUtils;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileFilter;
@@ -31,10 +29,10 @@
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.rat.document.impl.DocumentImplUtils;
 
 /**
- * Utility class, which provides static methods for creating
- * test cases.
+ * Utility class, which provides static methods for creating test cases.
  */
 public class Resources {
     /**
@@ -64,7 +62,8 @@ public static File getMainResourceFile(String pResource) throws IOException {
     }
 
     /**
-     * Try to to load the given file from baseDir, in case of errors try to add module names to fix behaviour from within IntelliJ.
+     * Try to to load the given file from baseDir, in case of errors try to add
+     * module names to fix behaviour from within IntelliJ.
      */
     private static File getResourceFromBase(File baseDir, String pResource) throws IOException {
         File f = new File(baseDir, pResource);
@@ -75,8 +74,8 @@ private static File getResourceFromBase(File baseDir, String pResource) throws I
     }
 
     /**
-     * Locates a set of resource files in the class path.
-     * In case of errors try to add module names to fix behaviour from within IntelliJ.
+     * Locates a set of resource files in the class path. In case of errors try to
+     * add module names to fix behaviour from within IntelliJ.
      */
     public static File[] getResourceFiles(String pResource) throws IOException {
         File f = new File(TEST_RESOURCE_BASE_PATH, pResource);
@@ -85,6 +84,7 @@ public static File[] getResourceFiles(String pResource) throws IOException {
         }
 
         return f.listFiles(new FileFilter() {
+            @Override
             public boolean accept(File pathname) {
                 return pathname.isFile();
             }
@@ -106,22 +106,23 @@ public static Reader getResourceReader(String pResource) throws IOException {
     }
 
     /**
-     * Locates a resource file in the class path and returns a {@link BufferedReader}.
+     * Locates a resource file in the class path and returns a
+     * {@link BufferedReader}.
      */
     public static BufferedReader getBufferedResourceReader(String pResource) throws IOException {
         return new BufferedReader(getResourceReader(pResource));
     }
 
     /**
-     * Locates a resource file in the class path and returns a {@link BufferedReader}.
+     * Locates a resource file in the class path and returns a
+     * {@link BufferedReader}.
      */
     public static BufferedReader getBufferedReader(File file) throws IOException {
         return new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
     }
 
     /**
-     * Locates the name of a directory, which contains the given
-     * resource file.
+     * Locates the name of a directory, which contains the given resource file.
      */
     public static String getResourceDirectory(String pResource) throws IOException {
         final File resource = getResourceFile(pResource);
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 14a198731..fe84a5ec2 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -25,6 +25,8 @@
 import java.io.FilenameFilter;
 import java.net.MalformedURLException;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.rat.ConfigurationException;
@@ -64,7 +66,6 @@ public class Report extends Task {
 
     private Defaults.Builder defaultsBuilder;
     private final ReportConfiguration configuration;
-
     /**
      * will hold any nested resource collection
      */
@@ -118,7 +119,7 @@ public void setLicenses(File fileName) {
             LicenseReader reader = Readers.get(fileName);
             reader.add(fileName.toURI().toURL());
             configuration.addLicenses(reader.readLicenses());
-            configuration.addApprovedLicenseNames(reader.approvedLicenseFamilies());
+            configuration.addApprovedLicenseNames(reader.approvedLicenseId());
         } catch (MalformedURLException e) {
             throw new BuildException("Can not read license file " + fileName, e);
         }
@@ -134,25 +135,33 @@ public void setUseDefaultLicenses(boolean useDefaultLicenses) {
         }
     }
     
-    public void addApprovedLicense(String familyCategory) {
+    public void setApprovalFilter(ApprovalFilter filter) {
+        configuration.setLicenseFilter(filter.internalFilter());
+    }
+    
+    public void setAddApprovedLicense(String familyCategory) {
         configuration.addApprovedLicenseName(familyCategory);
     }
+    
+    public void setRemoveApprovedLicense(String familyCategory) {
+        configuration.removeApprovedLicenseName(familyCategory);
+    }
 
     public void setCopyrightMessage(String copyrightMessage) {
         configuration.setCopyrightMessage(copyrightMessage);
     }
 
     public void setAddLicenseHeaders(AddLicenseHeaders setting) {
-        if (setting.containsValue(AddLicenseHeaders.FALSE)) {
+        if (setting.getValue().equals(AddLicenseHeaders.FALSE)) {
             configuration.setAddingLicenses(false);
             configuration.setAddingLicensesForced(false);
         } else {
             configuration.setAddingLicenses(true);
-            configuration.setAddingLicensesForced(setting.containsValue(AddLicenseHeaders.FORCED));
+            configuration.setAddingLicensesForced(setting.getValue().equals(AddLicenseHeaders.FORCED));
         }
     }
 
-    public void setAddDefaultDefinitions(String fileName) {
+    public void setAddDefaultDefinitions(File fileName) {
         try {
             defaultsBuilder.add(fileName);
         } catch (MalformedURLException e) {
@@ -195,31 +204,6 @@ private void validate() {
         configuration.setReportable(new ResourceCollectionContainer(nestedResources));
     }
 
-    /**
-     * Type for the format attribute.
-     */
-    public static class Format extends EnumeratedAttribute {
-        static final String XML_KEY = "xml";
-        static final String STYLED_KEY = "styled";
-        static final String PLAIN_KEY = "plain";
-
-        static final Format PLAIN = new Format(PLAIN_KEY);
-
-        public Format() {
-            super();
-        }
-
-        private Format(String s) {
-            this();
-            setValue(s);
-        }
-
-        @Override
-        public String[] getValues() {
-            return new String[] { XML_KEY, STYLED_KEY, PLAIN_KEY };
-        }
-    }
-
     /**
      * Type for the addLicenseHeaders attribute.
      */
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index 3a71ed488..f611d22c3 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -55,9 +55,8 @@
   </target>
 
   <target name="testWithALUnknown">
-    <rat:report addDefaultLicenseMatchers="false">
+    <rat:report removeApprovedLicense="AL">
       <file file="${ant.file}"/>
-      <rat:w3c/>
     </rat:report>
   </target>
 
@@ -73,7 +72,7 @@
   </target>
 
   <target name="testNoLicenseMatchers">
-    <rat:report addDefaultLicenseMatchers="false">
+    <rat:report useDefaultLicenses="false">
       <file file="${ant.file}"/>
     </rat:report>
   </target>
@@ -81,7 +80,7 @@
   <target name="testAddLicenseHeaders">
     <delete dir="${output.dir}/it-sources"/>
     <mkdir dir="${output.dir}/it-sources"/>
-    <copy file="src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/>
+    <copy file="${output.dir}/../../src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/>
     <rat:report addLicenseHeaders="true">
        <file file="${output.dir}/it-sources/index.apt"/>
     </rat:report>

From fa6d18c9115c04911b622c3b9bb9d81a03496aad Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 18 Sep 2023 22:33:12 +0200
Subject: [PATCH 089/299] RAT-311: Update commons-compress to 1.24.0 in order
 to circumvent CVE-2023-42503.

---
 pom.xml                 | 2 +-
 src/changes/changes.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9d3cbcee0..a39cb363b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.23.0</version>
+        <version>1.24.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fb482182e..855a462ed 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-311" type="fix" dev="pottlinger">
+         Update commons-compress to 1.24.0 in order to circumvent CVE-2023-42503.
+      </action>
       <action issue="RAT-251" type="fix" dev="jochenw" due-to="Claude Warren">
          Added SPDX processing for default licenses.
       </action>

From 4f26a8a4b4746e118eeb0d8d5d01024918192cf9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 00:27:50 +0000
Subject: [PATCH 090/299] Bump actions/setup-java from 3.12.0 to 3.13.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.12.0 to 3.13.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.12.0...v3.13.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index caee25ef7..0a8d746f2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.12.0
+        uses: actions/setup-java@v3.13.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From 9bfdb66c0e732f1882f5b2e6945ecdae75ef135e Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 23 Sep 2023 19:26:47 +0200
Subject: [PATCH 091/299] first rat plugin complete

---
 .../main/java/org/apache/rat/Defaults.java    |   1 -
 .../src/main/java/org/apache/rat/Report.java  |   5 +-
 .../org/apache/rat/ReportConfiguration.java   |  61 +--
 .../rat/analysis/license/BaseLicense.java     |  14 +-
 .../matchers/AbstractHeaderMatcher.java       |   4 -
 .../rat/analysis/matchers/AndMatcher.java     |   4 +-
 .../rat/analysis/matchers/OrMatcher.java      |   4 +-
 .../org/apache/rat/configuration/Readers.java |  20 +-
 .../configuration/XMLConfigurationReader.java |   2 +-
 .../java/org/apache/rat/ReporterTest.java     |  17 +-
 .../analysis/license/OASISLicenseTest.java    |   2 +-
 .../rat/analysis/matchers/AndMatcherTest.java |  18 +
 .../apache/rat/configuration/ReadersTest.java |   6 +-
 apache-rat-plugin/pom.xml                     |   3 +-
 apache-rat-plugin/src/it/it1/pom.xml          |   6 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    | 487 ++++++++----------
 .../src/main/java/org/apache/rat/mp/All.java  |  44 ++
 .../src/main/java/org/apache/rat/mp/Any.java  |  48 ++
 .../java/org/apache/rat/mp/Copyright.java     |  47 ++
 .../org/apache/rat/mp/EnclosingMatcher.java   |  61 +++
 .../org/apache/rat/mp/FilesReportable.java    |  64 ++-
 .../rat/mp/HeaderMatcherSpecification.java    |  16 +-
 .../main/java/org/apache/rat/mp/License.java  |  99 ++++
 .../rat/mp/LicenseFamilySpecification.java    |  16 +-
 .../main/java/org/apache/rat/mp/Matcher.java  |  56 ++
 .../src/main/java/org/apache/rat/mp/Not.java  |  39 ++
 .../org/apache/rat/mp/RatCheckException.java  |   8 +-
 .../java/org/apache/rat/mp/RatCheckMojo.java  | 170 +++---
 .../java/org/apache/rat/mp/RatReportMojo.java | 116 +++--
 .../main/java/org/apache/rat/mp/Regex.java    |  41 ++
 .../src/main/java/org/apache/rat/mp/Spdx.java |  44 ++
 .../src/main/java/org/apache/rat/mp/Text.java |  44 ++
 .../org/apache/rat/mp/RatCheckMojoTest.java   |   2 +
 .../java/org/apache/rat/anttasks/Report.java  |  12 +-
 .../test/resources/antunit/customMatcher.xml  |  20 +
 35 files changed, 1060 insertions(+), 541 deletions(-)
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 8b4932886..50162fd04 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -70,7 +70,6 @@ public void clear() {
     private void readConfigFiles(Collection<URL> urls) {
         for (URL url : urls) {
             LicenseReader reader = Readers.get(url);
-            reader.add(url);
             licenses.addAll(reader.readLicenses());
             reader.approvedLicenseId().stream().map(ILicenseFamily::makeCategory).forEach(approvedLicenseIds::add);
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 7575077ec..442510448 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -47,6 +47,7 @@
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.license.BaseLicense;
+import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.IReportable;
@@ -141,8 +142,8 @@ public static final void main(String[] args) throws Exception {
             } else {
 
                 if (cl.hasOption('a') || cl.hasOption('A')) {
-                    configuration.setAddingLicenses(true);
-                    configuration.setAddingLicensesForced(cl.hasOption('f'));
+                    configuration.setAddLicenseHeaders(cl.hasOption('f') ? 
+                        AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
                     configuration.setCopyrightMessage(cl.getOptionValue("c"));
                 }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index b885ca65d..06653dbff 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -37,6 +37,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.rat.Defaults.Filter;
 import org.apache.rat.Defaults.LicenseCollectionMatcher;
+import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.policy.DefaultPolicy;
@@ -279,17 +280,6 @@ public boolean isAddingLicensesForced() {
         return addingLicensesForced;
     }
 
-    /**
-     * If Rat is adding license headers: Sets, whether adding license headers is
-     * enforced. This value is ignored, if no license headers are added.
-     *
-     * @param addingLicensesForced enable/disable forcibly adding licenses.
-     * @see #isAddingLicenses()
-     */
-    public void setAddingLicensesForced(boolean addingLicensesForced) {
-        this.addingLicensesForced = addingLicensesForced;
-    }
-
     /**
      * @return Returns, whether Rat should add missing license headers.
      * @see #isAddingLicensesForced()
@@ -306,41 +296,34 @@ public boolean isAddingLicenses() {
      * @see #setAddingLicensesForced(boolean)
      * @see #setCopyrightMessage(String)
      */
-    public void setAddingLicenses(boolean addingLicenses) {
-        this.addingLicenses = addingLicenses;
+    public void setAddLicenseHeaders(AddLicenseHeaders addLicenseHeaders) {
+        addingLicenses = false;
+        addingLicensesForced = false;
+        switch (addLicenseHeaders) {
+        case FALSE:
+            // do nothing
+            break;
+        case FORCED:
+            addingLicensesForced = true;
+            // fall thorugh
+        case TRUE:
+            addingLicenses = true;
+            break;
+        }
     }
 
     /**
-     * Returns the set of defined licenses unless filter is set to no-defaults. if
-     * no-defaults was set then an empty set is returned.
+     * Returns a set Licenses of depending on the approvalFilter setting.
+     * if approvalFilter is set:
+     * <ul>
+     * <li>{@code all} - All licenses will be returned.</li>
+     * <li>{@code approved} - (default) All approved licenses will be returned</li>
+     * <li>{@code none} - No licenses will be returned</li>
+     * </ul>
      * 
      * @return The set of defined licenses.
      */
     public SortedSet<ILicense> getLicenses() {
-
-//              This code addes derived licenses to the approved families if they are derived from appoved licenses.        
-//            Stack<ILicense> stack = new Stack<>();
-//            for (ILicense license : licenses) {
-//                ILicense derivedFrom = license.derivedFrom();
-//                if (derivedFrom != null) {
-//                    stack.push(license);
-//                    while (derivedFrom != null) {
-//                        stack.push(derivedFrom);
-//                        derivedFrom = derivedFrom.derivedFrom();
-//                    }
-//                }
-//                while (!stack.isEmpty()) {
-//                    derivedFrom = stack.pop();
-//                    boolean found = approvedLicenseId.contains(derivedFrom.getLicenseFamily().getFamilyCategory());
-//                    if (found) {
-//                        while (!stack.isEmpty()) {
-//                            approvedLicenseId.add(stack.pop().getLicenseFamily().getFamilyCategory());
-//                        }
-//                    }
-//                }
-//                
-//            }
-
         switch (approvalFilter) {
         case all:
             return Collections.unmodifiableSortedSet(licenses);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index bf8e619e9..494c1e025 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -21,14 +21,16 @@
 import java.util.Arrays;
 
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.AbstractHeaderMatcher;
 import org.apache.rat.analysis.matchers.AbstractMatcherContainer;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-public abstract class BaseLicense extends AbstractMatcherContainer implements ILicense {
+public abstract class BaseLicense extends AbstractHeaderMatcher implements ILicense {
     private ILicenseFamily family;
     private String notes;
     private String derivedFrom;
+    private IHeaderMatcher matcher;
 
     public BaseLicense(ILicenseFamily family, String notes, IHeaderMatcher matcher) {
         this(null, family, notes, matcher);
@@ -41,10 +43,11 @@ public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeader
     public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher,
             String derivedFrom) {
         super(String.format("%s:%s:%s/%s", idPrefix == null ? "" : idPrefix, family.getFamilyCategory(),
-                matcher.getClass().getSimpleName(), matcher.getId()), Arrays.asList(matcher));
+                matcher.getClass().getSimpleName(), matcher.getId()));
         this.family = family;
         this.notes = notes;
         this.derivedFrom = derivedFrom;
+        this.matcher = matcher;
     }
 
     @Override
@@ -64,7 +67,12 @@ public String getNotes() {
 
     @Override
     public boolean matches(String line) {
-        return enclosed.iterator().next().matches(line);
+        return matcher.matches(line);
+    }
+    
+    @Override
+    public void reset() {
+        matcher.reset();
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
index 36864160c..da89bb3b1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
@@ -26,10 +26,6 @@ public abstract class AbstractHeaderMatcher implements IHeaderMatcher {
 
     private String id;
 
-//    protected AbstractHeaderMatcher() {
-//        this(null);
-//    }
-
     protected AbstractHeaderMatcher(String id) {
         this.id = id == null ? UUID.randomUUID().toString() : id;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
index 95fa862af..d2bf3181c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -26,12 +26,12 @@
 public class AndMatcher extends AbstractMatcherContainer {
     private boolean[] flags = null;
 
-    public AndMatcher(String id, Collection<IHeaderMatcher> enclosed) {
+    public AndMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
         flags = new boolean[enclosed.size()];
     }
 
-    public AndMatcher(Collection<IHeaderMatcher> enclosed) {
+    public AndMatcher(Collection<? extends IHeaderMatcher> enclosed) {
         super(enclosed);
         flags = new boolean[enclosed.size()];
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
index 942f5f867..ba7bbb485 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
@@ -24,11 +24,11 @@
 
 public class OrMatcher extends AbstractMatcherContainer {
 
-    public OrMatcher(Collection<IHeaderMatcher> enclosed) {
+    public OrMatcher(Collection<? extends IHeaderMatcher> enclosed) {
         super(enclosed);
     }
 
-    public OrMatcher(String id, Collection<IHeaderMatcher> enclosed) {
+    public OrMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
index f639d3900..b0864c638 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
@@ -93,10 +93,12 @@ public class Readers {
         readers.put( Format.XML, XMLConfigurationReader.class);
     }
 
-    public static LicenseReader get(URL fileName) {
-        Format fmt = Format.fromName(fileName.getFile());
+    public static LicenseReader get(URL url) {
+        Format fmt = getFormat(url);
         try {
-            return readers.get(fmt).getDeclaredConstructor().newInstance();
+            LicenseReader result = readers.get(fmt).getDeclaredConstructor().newInstance();
+            result.add(url);
+            return result;
         } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
                 | NoSuchMethodException | SecurityException e) {
             throw new IllegalStateException( "Can not construct reader for "+fmt, e);
@@ -114,4 +116,16 @@ public static LicenseReader get(File file) throws MalformedURLException {
     public static LicenseReader get(String fileName) throws MalformedURLException {
         return get(new File(fileName));
     }
+    
+    public static Format getFormat(URL file) {
+        return Format.fromName(file.getFile());
+    }
+    
+    public static Format getFormat(File file) throws MalformedURLException {
+        return getFormat(file.toURI().toURL());
+    }
+    
+    public static Format getFormat(String fileName) throws MalformedURLException {
+        return getFormat(new File(fileName));
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index b47c96f16..352b40988 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -199,7 +199,7 @@ private Map<AttributeName, String> attributes(Node node) {
         return result;
     }
 
-    private IHeaderMatcher createTextMatcher(String id, String txt) {
+    public static IHeaderMatcher createTextMatcher(String id, String txt) {
         boolean complex = txt.contains(" ") | txt.contains("\\t") | txt.contains("\\n") | txt.contains("\\r")
                 | txt.contains("\\f") | txt.contains("\\v");
         return complex ? new FullTextMatcher(id, txt) : new SimpleTextMatcher(id, txt);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index a82f7b70f..bcb71920b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -81,11 +81,11 @@ public void xmlReportTest() throws Exception {
 
         getNode(doc, xPath, "/rat-report[@timestamp]");
 
-        checkNode(doc, xPath, "src/test/resources/elements/ILoggerFactory.java", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/ILoggerFactory.java", "MIT", "true", "standard");
         checkNode(doc, xPath, "src/test/resources/elements/Image.png", null, "false", "binary");
         checkNode(doc, xPath, "src/test/resources/elements/LICENSE", null, "false", "notice");
         checkNode(doc, xPath, "src/test/resources/elements/NOTICE", null, "false", "notice");
-        checkNode(doc, xPath, "src/test/resources/elements/Source.java", "AL", "true", "standard");
+        checkNode(doc, xPath, "src/test/resources/elements/Source.java", "?????", "false", "standard");
         checkNode(doc, xPath, "src/test/resources/elements/Text.txt", "AL", "true", "standard");
         checkNode(doc, xPath, "src/test/resources/elements/TextHttps.txt", "AL", "true", "standard");
         checkNode(doc, xPath, "src/test/resources/elements/Xml.xml", "AL", "true", "standard");
@@ -118,7 +118,7 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         Reporter.report(configuration);
 
         String document = out.toString();
-        // System.out.println(document);
+        //System.out.println(document);
         assertTrue("'Generated at' is present in " + document, document.startsWith(HEADER));
 
         // final int generatedAtLineEnd = document.indexOf(NL, HEADER.length());
@@ -126,26 +126,27 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         find("^Binaries: 2$", document);
         find("^Archives: 1$", document);
         find("^Standards: 7$", document);
-        find("^Apache Licensed: 6$", document);
+        find("^Apache Licensed: 4$", document);
         find("^Generated Documents: 0$", document);
-        find("^1 Unknown Licenses$", document);
+        find("^2 Unknown Licenses$", document);
         find("^Files with unapproved licenses:\\s+" + "src/test/resources/elements/Image.png\\s+"
                 + "src/test/resources/elements/LICENSE\\s+" + "src/test/resources/elements/NOTICE\\s+"
+                + "src/test/resources/elements/Source.java\\s+"
                 + "src/test/resources/elements/dummy.jar\\s+" + "src/test/resources/elements/plain.json\\s+"
                 + "src/test/resources/elements/sub/Empty.txt\\s", document);
         find("^Archives:\\s+" + "\\+ src/test/resources/elements/dummy.jar\\s*", document);
-        find("AL\\s+src/test/resources/elements/ILoggerFactory.java", document);
+        find("MIT\\s+src/test/resources/elements/ILoggerFactory.java", document);
         find("!B\\s+src/test/resources/elements/Image.png", document);
         find("!N\\s+src/test/resources/elements/LICENSE", document);
         find("!N\\s+src/test/resources/elements/NOTICE", document);
-        find("AL\\s+src/test/resources/elements/Source.java", document);
+        find("!\\Q?????\\E\\s+src/test/resources/elements/Source.java", document);
         find("AL\\s+src/test/resources/elements/Text.txt", document);
         find("AL\\s+src/test/resources/elements/TextHttps.txt", document);
         find("AL\\s+src/test/resources/elements/Xml.xml", document);
         find("AL\\s+src/test/resources/elements/buildr.rb", document);
         find("!A\\s+src/test/resources/elements/dummy.jar", document);
         find("!B\\s+src/test/resources/elements/plain.json", document);
-        find("!\\Q?????\\E src/test/resources/elements/sub/Empty.txt", document);
+        find("!\\Q?????\\E\\s+src/test/resources/elements/sub/Empty.txt", document);
         find("== File: src/test/resources/elements/sub/Empty.txt", document);
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
index ded57e31a..ea03d8de1 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
@@ -27,7 +27,7 @@ public class OASISLicenseTest extends AbstractLicenseTest {
             "This document and translations of it may be copied and furnished to "
                     + "others and derivative works that comment on or otherwise explain it or assist "
                     + "in its implementation may be prepared copied published and distributed"
-                    + "\\nCopyright OAISIS Open, 1999" }, };
+                    + "\\nCopyright OASIS Open, 1999" }, };
 
     public OASISLicenseTest() {
         super(category, name, notes, targets);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
index fdd5ecb6a..5161762c7 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import static org.junit.Assert.assertFalse;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
index 5bc95bdec..0778f4f8e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
@@ -26,8 +26,8 @@
 public class ReadersTest {
     @Test
     public void getTest() throws MalformedURLException {
-        assertEquals(XMLConfigurationReader.class, Readers.get( "foo/x.xml").getClass());
-        assertEquals(XMLConfigurationReader.class, Readers.get("x.xml").getClass());
-        assertThrows( IllegalArgumentException.class, () -> Readers.get("x.junk"));
+        assertEquals(Format.XML, Readers.getFormat( "foo/x.xml"));
+        assertEquals(Format.XML,  Readers.getFormat("x.xml"));
+        assertThrows( IllegalArgumentException.class, () -> Readers.getFormat("x.junk"));
     }
 }
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index dba49b19e..fd90bd331 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -137,13 +137,14 @@
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
           <postBuildHookScript>verify</postBuildHookScript>
+          <debug>true</debug>
         </configuration>
         <executions>
           <execution>
             <id>integration-test</id>
             <goals>
               <goal>install</goal>
-              <goal>run</goal>
+              <goal>integration-test</goal>
             </goals>
           </execution>
         </executions>
diff --git a/apache-rat-plugin/src/it/it1/pom.xml b/apache-rat-plugin/src/it/it1/pom.xml
index 58eea9b7b..62815e007 100644
--- a/apache-rat-plugin/src/it/it1/pom.xml
+++ b/apache-rat-plugin/src/it/it1/pom.xml
@@ -31,13 +31,11 @@
         <version>@pom.version@</version>
         <configuration>
           <licenses>
-            <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+            <license>
               <licenseFamilyCategory>YAL__</licenseFamilyCategory>
               <licenseFamilyName>Yet Another Software License</licenseFamilyName>
               <notes></notes>
-              <patterns>
-                <pattern>Yet Another License</pattern>
-              </patterns>
+              <text>Yet Another License</text>
             </license>
           </licenses>
           <licenseFamilies>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 769c1e4aa..3fce97209 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -1,5 +1,3 @@
-package org.apache.rat.mp;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.rat.mp;
 
-import static org.apache.rat.mp.util.ConfigurationHelper.newInstance;
 import static org.apache.rat.mp.util.ExclusionHelper.addEclipseDefaults;
 import static org.apache.rat.mp.util.ExclusionHelper.addIdeaDefaults;
 import static org.apache.rat.mp.util.ExclusionHelper.addMavenDefaults;
@@ -32,39 +30,33 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
 import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.lang.reflect.UndeclaredThrowableException;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
-import javax.xml.transform.TransformerConfigurationException;
-
-
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.Defaults;
-import org.apache.rat.Report;
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.util.HeaderMatcherMultiplexer;
-import org.apache.rat.api.RatException;
 import org.apache.rat.config.SourceCodeManagementSystems;
-import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.configuration.LicenseReader;
+import org.apache.rat.configuration.Readers;
+import org.apache.rat.license.ILicense;
 import org.apache.rat.mp.util.ScmIgnoreParser;
 import org.apache.rat.report.IReportable;
-import org.apache.rat.report.claim.ClaimStatistic;
 import org.codehaus.plexus.util.DirectoryScanner;
 
 /**
@@ -79,40 +71,22 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     private File basedir;
 
     /**
-     * Specifies the licenses to accept. Deprecated, use {@link #licenses}
-     * instead.
-     *
-     * @deprecated Use {@link #licenses} instead.
-     */
-    @Deprecated
-    @Parameter
-    private HeaderMatcherSpecification[] licenseMatchers;
-
-    /**
-     * Specifies the licenses to accept. By default, these are added to the
-     * default licenses, unless you set {@link #addDefaultLicenseMatchers} to
-     * false.
+     * Specifies the licenses to accept. By default, these are added to the default
+     * licenses, unless you set {@link #addDefaultLicenseMatchers} to false.
      *
      * @since 0.8
      */
     @Parameter
-    private IHeaderMatcher[] licenses;
+    private String[] defaultLicenseFiles;
 
-    /**
-     * The set of approved license family names.
-     *
-     * @deprecated Use {@link #licenseFamilies} instead.
-     */
-    @Deprecated
-    private LicenseFamilySpecification[] licenseFamilyNames;
+    @Parameter
+    private String[] additionalLicenseFiles;
 
     /**
-     * Specifies the license families to accept.
-     *
-     * @since 0.8
+     * Whether to add the default list of licenses.
      */
-    @Parameter
-    private ILicenseFamily[] licenseFamilies;
+    @Parameter(property = "rat.addDefaultLicenses", defaultValue = "true")
+    private boolean addDefaultLicenses;
 
     /**
      * Whether to add the default list of license matchers.
@@ -120,9 +94,18 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     @Parameter(property = "rat.addDefaultLicenseMatchers", defaultValue = "true")
     private boolean addDefaultLicenseMatchers;
 
+    @Parameter(required = false)
+    private String[] approvedLicenses;
+
+    @Parameter(property = "rat.approvedFile")
+    private String approvedLicenseFile;
+
+    @Parameter
+    private ILicense[] licenses;
+
     /**
-     * Specifies files, which are included in the report. By default, all files
-     * are included.
+     * Specifies files, which are included in the report. By default, all files are
+     * included.
      */
     @Parameter
     private String[] includes;
@@ -131,36 +114,36 @@ public abstract class AbstractRatMojo extends AbstractMojo {
      * Specifies a file, from which to read includes. Basically, an alternative to
      * specifying the includes as a list.
      */
-    @Parameter(property="rat.includesFile")
+    @Parameter(property = "rat.includesFile")
     private String includesFile;
 
     /**
-     * Specifies the include files character set. Defaults to @code{${project.build.sourceEncoding}),
-     * or @code{UTF8}.
+     * Specifies the include files character set. Defaults
+     * to @code{${project.build.sourceEncoding}), or @code{UTF8}.
      */
-    @Parameter(property="rat.includesFileCharset", defaultValue="${project.build.sourceEncoding}")
+    @Parameter(property = "rat.includesFileCharset", defaultValue = "${project.build.sourceEncoding}")
     private String includesFileCharset;
 
     /**
-     * Specifies files, which are excluded in the report. By default, no files
-     * are excluded.
+     * Specifies files, which are excluded in the report. By default, no files are
+     * excluded.
      */
     @Parameter
     private String[] excludes;
 
     /**
      * Specifies a file, from which to read excludes. Basically, an alternative to
-     * specifying the excludes as a list.  The excludesFile is assumed to be using the
-     * UFT8 character set.
+     * specifying the excludes as a list. The excludesFile is assumed to be using
+     * the UFT8 character set.
      */
-    @Parameter(property="rat.excludesFile")
+    @Parameter(property = "rat.excludesFile")
     private String excludesFile;
 
     /**
-     * Specifies the include files character set. Defaults to @code{${project.build.sourceEncoding}),
-     * or @code{UTF8}.
+     * Specifies the include files character set. Defaults
+     * to @code{${project.build.sourceEncoding}), or @code{UTF8}.
      */
-    @Parameter(property="rat.excludesFileCharset", defaultValue="${project.build.sourceEncoding}")
+    @Parameter(property = "rat.excludesFileCharset", defaultValue = "${project.build.sourceEncoding}")
     private String excludesFileCharset;
 
     /**
@@ -169,20 +152,20 @@ public abstract class AbstractRatMojo extends AbstractMojo {
      * <ul>
      * <li>meta data files for source code management / revision control systems,
      * see {@link SourceCodeManagementSystems}</li>
-     * <li>temporary files used by Maven, see <a
-     * href="#useMavenDefaultExcludes">useMavenDefaultExcludes</a></li>
-     * <li>configuration files for Eclipse, see <a
-     * href="#useEclipseDefaultExcludes">useEclipseDefaultExcludes</a></li>
-     * <li>configuration files for IDEA, see <a
-     * href="#useIdeaDefaultExcludes">useIdeaDefaultExcludes</a></li>
+     * <li>temporary files used by Maven, see
+     * <a href="#useMavenDefaultExcludes">useMavenDefaultExcludes</a></li>
+     * <li>configuration files for Eclipse, see
+     * <a href="#useEclipseDefaultExcludes">useEclipseDefaultExcludes</a></li>
+     * <li>configuration files for IDEA, see
+     * <a href="#useIdeaDefaultExcludes">useIdeaDefaultExcludes</a></li>
      * </ul>
      */
     @Parameter(property = "rat.useDefaultExcludes", defaultValue = "true")
     private boolean useDefaultExcludes;
 
     /**
-     * Whether to use the Maven specific default excludes when scanning for
-     * files. Maven specific default excludes are given by the constant
+     * Whether to use the Maven specific default excludes when scanning for files.
+     * Maven specific default excludes are given by the constant
      * MAVEN_DEFAULT_EXCLUDES: The <code>target</code> directory, the
      * <code>cobertura.ser</code> file, and so on.
      */
@@ -190,8 +173,8 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     private boolean useMavenDefaultExcludes;
 
     /**
-     * Whether to parse source code management system (SCM) ignore files and use their contents as excludes.
-     * At the moment this works for the following SCMs:
+     * Whether to parse source code management system (SCM) ignore files and use
+     * their contents as excludes. At the moment this works for the following SCMs:
      *
      * @see org.apache.rat.config.SourceCodeManagementSystems
      */
@@ -199,18 +182,17 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     private boolean parseSCMIgnoresAsExcludes;
 
     /**
-     * Whether to use the Eclipse specific default excludes when scanning for
-     * files. Eclipse specific default excludes are given by the constant
+     * Whether to use the Eclipse specific default excludes when scanning for files.
+     * Eclipse specific default excludes are given by the constant
      * ECLIPSE_DEFAULT_EXCLUDES: The <code>.classpath</code> and
-     * <code>.project</code> files, the <code>.settings</code> directory, and so
-     * on.
+     * <code>.project</code> files, the <code>.settings</code> directory, and so on.
      */
     @Parameter(property = "rat.useEclipseDefaultExcludes", defaultValue = "true")
     private boolean useEclipseDefaultExcludes;
 
     /**
-     * Whether to use the IDEA specific default excludes when scanning for
-     * files. IDEA specific default excludes are given by the constant
+     * Whether to use the IDEA specific default excludes when scanning for files.
+     * IDEA specific default excludes are given by the constant
      * IDEA_DEFAULT_EXCLUDES: The <code>*.iml</code>, <code>*.ipr</code> and
      * <code>*.iws</code> files and the <code>.idea</code> directory.
      */
@@ -218,14 +200,15 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     private boolean useIdeaDefaultExcludes;
 
     /**
-     * Whether to exclude subprojects. This is recommended, if you want a
-     * separate apache-rat-plugin report for each subproject.
+     * Whether to exclude subprojects. This is recommended, if you want a separate
+     * apache-rat-plugin report for each subproject.
      */
     @Parameter(property = "rat.excludeSubprojects", defaultValue = "true")
     private boolean excludeSubProjects;
 
     /**
-     * Will skip the plugin execution, e.g. for technical builds that do not take license compliance into account.
+     * Will skip the plugin execution, e.g. for technical builds that do not take
+     * license compliance into account.
      *
      * @since 0.11
      */
@@ -233,7 +216,8 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     protected boolean skip;
 
     /**
-     * Holds the maven-internal project to allow resolution of artifact properties during mojo runs.
+     * Holds the maven-internal project to allow resolution of artifact properties
+     * during mojo runs.
      */
     @Parameter(defaultValue = "${project}", required = true, readonly = true)
     protected MavenProject project;
@@ -245,54 +229,74 @@ protected MavenProject getProject() {
         return project;
     }
 
-    /**
-     * Returns the set of {@link IHeaderMatcher header matchers} to use.
-     *
-     * @return list of license matchers to use
-     * @throws MojoFailureException   An error in the plugin configuration was detected.
-     * @throws MojoExecutionException An error occurred while calculating the result.
-     */
-    private List<IHeaderMatcher> mergeLicenseMatchers()
-            throws MojoFailureException, MojoExecutionException {
-        List<IHeaderMatcher> matchers = new ArrayList<>();
-
-        if (licenses != null) {
-            matchers.addAll(Arrays.asList(licenses));
-            getLog().debug("Added " + licenses.length + " additional default licenses.");
+    protected Defaults.Builder getDefaultsBuilder() {
+        Defaults.Builder result = Defaults.builder();
+        if (defaultLicenseFiles != null) {
+            for (int i = 0; i < defaultLicenseFiles.length; i++) {
+                try {
+                    result.add(defaultLicenseFiles[i]);
+                } catch (MalformedURLException e) {
+                    throw new ConfigurationException(defaultLicenseFiles[i] + " is not a valid license file", e);
+                }
+            }
         }
+        return result;
+    }
 
-        if (licenseMatchers != null) {
-            for (final HeaderMatcherSpecification spec : licenseMatchers) {
-                matchers.add(newInstance(IHeaderMatcher.class, spec.getClassName()));
+    protected ReportConfiguration getConfiguration() throws MojoExecutionException {
+        @SuppressWarnings("resource")
+        ReportConfiguration result = new ReportConfiguration();
+        if (additionalLicenseFiles != null) {
+            for (int i = 0; i < additionalLicenseFiles.length; i++) {
+                try {
+                    LicenseReader reader = Readers.get(additionalLicenseFiles[i]);
+                    result.addLicenses(reader.readLicenses());
+                    result.addApprovedLicenseNames(reader.approvedLicenseId());
+                } catch (MalformedURLException e) {
+                    throw new ConfigurationException(additionalLicenseFiles[i] + " is not a valid license file", e);
+                }
             }
         }
-
-        if (addDefaultLicenseMatchers) {
-            getLog().debug("Enabled default license matchers.");
-            matchers.addAll(Defaults.getLicenses());
+        if (licenses != null) {
+            Log log = getLog();
+            if (log.isDebugEnabled()) {
+                log.debug(String.format("%s licenses loaded from pom", licenses.length));
+            }
+            Consumer<ILicense> logger = log.isDebugEnabled() ? (l) -> log.debug(String.format("License: %s", l)) :
+                (l) -> {} ;
+            Consumer<ILicense> addApproved = (approvedLicenses == null || approvedLicenses.length == 0)
+                    ? (l) -> result.addApprovedLicenseName(l.getLicenseFamily())
+                    : (l) -> {
+                    };
+
+            Consumer<ILicense> process = logger.andThen(result::addLicense).andThen(addApproved);
+            Arrays.stream(licenses).forEach(process);
         }
-        logLicenseMatchers(matchers);
 
-        return matchers;
+        if (approvedLicenses != null && approvedLicenses.length > 0) {
+            Arrays.stream(approvedLicenses).forEach(result::addApprovedLicenseName);
+        }
+        result.setReportable(getReportable());
+        return result;
     }
 
-    private void logLicenseMatchers(List<IHeaderMatcher> matchers) {
+    protected void logLicenses(Collection<ILicense> licenses) {
         if (getLog().isDebugEnabled()) {
-            getLog().debug("The following license matchers are activated:");
-            for (IHeaderMatcher matcher : matchers) {
-                getLog().debug("* " + matcher.toString());
+            getLog().debug("The following " + licenses.size() + " licenses are activated:");
+            for (ILicense license : licenses) {
+                getLog().debug("* " + license.toString());
             }
         }
-
     }
 
     /**
      * Creates an iterator over the files to check.
      *
      * @return A container of files, which are being checked.
-     * @throws MojoExecutionException in case of errors. I/O errors result in UndeclaredThrowableExceptions.
+     * @throws MojoExecutionException in case of errors. I/O errors result in
+     * UndeclaredThrowableExceptions.
      */
-    protected IReportable getResources() throws MojoExecutionException {
+    private IReportable getReportable() throws MojoExecutionException {
         final DirectoryScanner ds = new DirectoryScanner();
         ds.setBasedir(basedir);
         setExcludes(ds);
@@ -312,9 +316,7 @@ private void logAboutIncludedFiles(final String[] files) {
         if (files.length == 0) {
             getLog().warn("No resources included.");
         } else {
-            getLog().debug(
-                    files.length
-                            + " resources included");
+            getLog().debug(files.length + " resources included");
             if (getLog().isDebugEnabled()) {
                 for (final String resource : files) {
                     getLog().debug(" - included " + resource);
@@ -329,8 +331,7 @@ private void whenDebuggingLogExcludedFiles(final DirectoryScanner ds) {
             if (excludedFiles.length == 0) {
                 getLog().debug("No excluded resources.");
             } else {
-                getLog().debug(
-                        "Excluded " + excludedFiles.length + " resources:");
+                getLog().debug("Excluded " + excludedFiles.length + " resources:");
                 for (final String resource : excludedFiles) {
                     getLog().debug(" - excluded " + resource);
                 }
@@ -339,66 +340,102 @@ private void whenDebuggingLogExcludedFiles(final DirectoryScanner ds) {
     }
 
     private void setIncludes(DirectoryScanner ds) throws MojoExecutionException {
-        if ((includes != null  &&  includes.length > 0)  ||  includesFile != null) {
-        	final List<String> includeList = new ArrayList<>();
-        	if (includes != null) {
-        		includeList.addAll(Arrays.asList(includes));
-        	}
-        	if (includesFile != null) {
-        		final String charset = includesFileCharset == null ? "UTF8" : includesFileCharset;
-        		final File f = new File(includesFile);
-        		if (!f.isFile()) {
-        			getLog().error("IncludesFile not found: " + f.getAbsolutePath());
-        		} else {
-        			getLog().debug("Includes loaded from file " + includesFile + ", using character set " + charset);
-        		}
-        		includeList.addAll(getPatternsFromFile(f, charset));
-        	}
+        if ((includes != null && includes.length > 0) || includesFile != null) {
+            final List<String> includeList = new ArrayList<>();
+            if (includes != null) {
+                includeList.addAll(Arrays.asList(includes));
+            }
+            if (includesFile != null) {
+                final String charset = includesFileCharset == null ? "UTF8" : includesFileCharset;
+                final File f = new File(includesFile);
+                if (!f.isFile()) {
+                    getLog().error("IncludesFile not found: " + f.getAbsolutePath());
+                } else {
+                    getLog().debug("Includes loaded from file " + includesFile + ", using character set " + charset);
+                }
+                includeList.addAll(getPatternsFromFile(f, charset));
+            }
             ds.setIncludes(includeList.toArray(new String[includeList.size()]));
         }
     }
 
     private List<String> getPatternsFromFile(File pFile, String pCharset) throws MojoExecutionException {
-    	InputStream is = null;
-    	BufferedInputStream bis = null;
-    	Reader r = null;
-    	BufferedReader br = null;
-    	Throwable th = null;
-    	final List<String> patterns = new ArrayList<>();
-    	try {
-    		is = new FileInputStream(pFile);
-    		bis = new BufferedInputStream(is);
-    		r = new InputStreamReader(bis, pCharset);
-    		br = new BufferedReader(r);
-    		for (;;) {
-    			final String s = br.readLine();
-    			if (s == null) {
-    				break;
-    			}
-    			patterns.add(s);
-    		}
-    		br.close();
-    		br = null;
-    		r.close();
-    		r = null;
-    		bis.close();
-    		bis = null;
-    		is.close();
-    		is = null;
-    	} catch (Throwable t) {
-    		th = t;
-    	} finally {
-    		if (br != null) { try { br.close(); } catch (Throwable t) { if (th == null) { th = t; } } }
-    		if (r != null) { try { r.close(); } catch (Throwable t) { if (th == null) { th = t; } } }
-    		if (bis != null) { try { bis.close(); } catch (Throwable t) { if (th == null) { th = t; } } }
-    		if (is != null) { try { is.close(); } catch (Throwable t) { if (th == null) { th = t; } } }
-    	}
-    	if (th != null) {
-    		if (th instanceof RuntimeException) { throw (RuntimeException) th; }
-    		if (th instanceof Error) { throw (Error) th; }
-    		throw new MojoExecutionException(th.getMessage(), th);
-    	}
-    	return patterns;
+        InputStream is = null;
+        BufferedInputStream bis = null;
+        Reader r = null;
+        BufferedReader br = null;
+        Throwable th = null;
+        final List<String> patterns = new ArrayList<>();
+        try {
+            is = new FileInputStream(pFile);
+            bis = new BufferedInputStream(is);
+            r = new InputStreamReader(bis, pCharset);
+            br = new BufferedReader(r);
+            for (;;) {
+                final String s = br.readLine();
+                if (s == null) {
+                    break;
+                }
+                patterns.add(s);
+            }
+            br.close();
+            br = null;
+            r.close();
+            r = null;
+            bis.close();
+            bis = null;
+            is.close();
+            is = null;
+        } catch (Throwable t) {
+            th = t;
+        } finally {
+            if (br != null) {
+                try {
+                    br.close();
+                } catch (Throwable t) {
+                    if (th == null) {
+                        th = t;
+                    }
+                }
+            }
+            if (r != null) {
+                try {
+                    r.close();
+                } catch (Throwable t) {
+                    if (th == null) {
+                        th = t;
+                    }
+                }
+            }
+            if (bis != null) {
+                try {
+                    bis.close();
+                } catch (Throwable t) {
+                    if (th == null) {
+                        th = t;
+                    }
+                }
+            }
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (Throwable t) {
+                    if (th == null) {
+                        th = t;
+                    }
+                }
+            }
+        }
+        if (th != null) {
+            if (th instanceof RuntimeException) {
+                throw (RuntimeException) th;
+            }
+            if (th instanceof Error) {
+                throw (Error) th;
+            }
+            throw new MojoExecutionException(th.getMessage(), th);
+        }
+        return patterns;
     }
 
     private void setExcludes(DirectoryScanner ds) throws MojoExecutionException {
@@ -407,7 +444,7 @@ private void setExcludes(DirectoryScanner ds) throws MojoExecutionException {
             getLog().debug("No excludes explicitly specified.");
         } else {
             getLog().debug(excludes.length + " explicit excludes.");
-        	for (final String exclude : excludes) {
+            for (final String exclude : excludes) {
                 getLog().debug("Exclude: " + exclude);
             }
         }
@@ -415,8 +452,7 @@ private void setExcludes(DirectoryScanner ds) throws MojoExecutionException {
             Collections.addAll(excludeList, excludes);
         }
         if (!excludeList.isEmpty()) {
-            final String[] allExcludes = excludeList.toArray(new String[excludeList
-                    .size()]);
+            final String[] allExcludes = excludeList.toArray(new String[excludeList.size()]);
             ds.setExcludes(allExcludes);
         }
     }
@@ -435,15 +471,13 @@ private List<String> mergeDefaultExclusions() throws MojoExecutionException {
             getLog().debug("Finished adding exclusions from SCM ignore files.");
         }
 
-        if (excludeSubProjects && project != null
-                && project.getModules() != null) {
+        if (excludeSubProjects && project != null && project.getModules() != null) {
             for (final Object o : project.getModules()) {
                 final String moduleSubPath = (String) o;
-                if (new File( basedir, moduleSubPath ).isDirectory()) {
+                if (new File(basedir, moduleSubPath).isDirectory()) {
                     results.add(moduleSubPath + "/**/*");
-                }
-                else {
-                    results.add(StringUtils.substringBeforeLast( moduleSubPath, "/" ) + "/**/*");
+                } else {
+                    results.add(StringUtils.substringBeforeLast(moduleSubPath, "/") + "/**/*");
                 }
             }
         }
@@ -452,103 +486,24 @@ private List<String> mergeDefaultExclusions() throws MojoExecutionException {
         if (results.isEmpty()) {
             getLog().debug("No excludes implicitly specified.");
         } else {
-            getLog().debug(
-                    results.size()
-                            + " implicit excludes.");
+            getLog().debug(results.size() + " implicit excludes.");
             for (final String exclude : results) {
                 getLog().debug("Implicit exclude: " + exclude);
             }
         }
         if (excludesFile != null) {
-        	final File f = new File(excludesFile);
-        	if (!f.isFile()) {
-        		getLog().error("Excludes file not found: " + f.getAbsolutePath());
-        	}
-        	if (!f.canRead()) {
-        		getLog().error("Excludes file not readable: " + f.getAbsolutePath());
-        	}
-        	final String charset = excludesFileCharset == null ? "UTF8" : excludesFileCharset;
-        	getLog().debug("Loading excludes from file " + f + ", using character set " + charset);
-        	results.addAll(getPatternsFromFile(f, charset));
-        }
-
-        return new ArrayList<>(results);
-    }
-
-    /**
-     * Creates the report as a string.
-     *
-     * @param styleSheet The style sheet to use when formatting the report
-     * @return Report contents
-     * @throws MojoFailureException   An error in the plugin configuration was detected.
-     * @throws MojoExecutionException An error occurred while creating the report.
-     */
-    protected String createReport(InputStream styleSheet)
-            throws MojoExecutionException, MojoFailureException {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = null;
-        try {
-            pw = new PrintWriter(sw);
-            createReport(new PrintWriter(sw), styleSheet);
-            final String result = sw.toString();
-            pw.close();
-            pw = null;
-            sw.close();
-            sw = null;
-            return result;
-        } catch (IOException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        } finally {
-            IOUtils.closeQuietly(pw);
-            IOUtils.closeQuietly(sw);
-        }
-    }
-
-    /**
-     * Writes the report to the given stream.
-     *
-     * @param out   The target writer, to which the report is being written.
-     * @param style The stylesheet to use, or <code>null</code> for raw XML
-     * @return the current statistic.
-     * @throws MojoFailureException   An error in the plugin configuration was detected.
-     * @throws MojoExecutionException Another error occurred while creating the report.
-     */
-    protected ClaimStatistic createReport(Writer out, InputStream style)
-            throws MojoExecutionException, MojoFailureException {
-        final ReportConfiguration configuration = getConfiguration();
-        try {
-            if (style != null) {
-                return Report.report(out, getResources(), style, configuration);
-            } else {
-                return Report.report(getResources(), out, configuration);
+            final File f = new File(excludesFile);
+            if (!f.isFile()) {
+                getLog().error("Excludes file not found: " + f.getAbsolutePath());
             }
-        } catch (final TransformerConfigurationException | RatException | InterruptedException | IOException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        }
-    }
-
-    protected ReportConfiguration getConfiguration()
-            throws MojoFailureException, MojoExecutionException {
-        final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.addLicense(new HeaderMatcherMultiplexer(
-                mergeLicenseMatchers()));
-        configuration.addApprovedLicenseNames(mergeApprovedLicenseNames());
-        configuration.setApproveDefaultLicenses(addDefaultLicenseMatchers);
-        return configuration;
-    }
-
-    private List<ILicenseFamily> mergeApprovedLicenseNames()
-            throws MojoExecutionException, MojoFailureException {
-        final List<ILicenseFamily> list = new ArrayList<>();
-        if (licenseFamilies != null) {
-            getLog().debug("Added " + licenseFamilies.length + " custom approved licenses.");
-            list.addAll(Arrays.asList(licenseFamilies));
-        }
-        if (licenseFamilyNames != null) {
-            for (final LicenseFamilySpecification spec : licenseFamilyNames) {
-                list.add(newInstance(ILicenseFamily.class, spec.getClassName()));
+            if (!f.canRead()) {
+                getLog().error("Excludes file not readable: " + f.getAbsolutePath());
             }
+            final String charset = excludesFileCharset == null ? "UTF8" : excludesFileCharset;
+            getLog().debug("Loading excludes from file " + f + ", using character set " + charset);
+            results.addAll(getPatternsFromFile(f, charset));
         }
-        return list;
+
+        return new ArrayList<>(results);
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
new file mode 100644
index 000000000..54d1ec4b7
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import java.util.List;
+
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.AndMatcher;
+
+public class All implements EnclosingMatcher.Holder {
+
+    AndMatcher andMatcher;
+
+    public All() {
+    }
+
+    @Parameter(required = true)
+    public void setMatchers(List<Matcher> matchers) {
+        andMatcher = new AndMatcher(matchers);
+    }
+
+    @Override
+    public IHeaderMatcher getMatcher() {
+        return andMatcher;
+    }
+
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
new file mode 100644
index 000000000..cd4fe7b23
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.OrMatcher;
+
+public class Any extends EnclosingMatcher implements EnclosingMatcher.Holder {
+
+    OrMatcher orMatcher;
+    List<IHeaderMatcher> matchers = new ArrayList<>();
+
+    public Any() {
+    }
+
+    @Override
+    public IHeaderMatcher getMatcher() {
+        if (orMatcher == null) {
+            orMatcher = new OrMatcher(matchers);
+        }
+        return orMatcher;
+    }
+
+    @Override
+    protected void setHolder(Holder holder) {
+        matchers.add(holder.getMatcher());
+    }
+
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
new file mode 100644
index 000000000..ee7a23b65
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.rat.analysis.matchers.CopyrightMatcher;
+
+public class Copyright implements EnclosingMatcher.Holder {
+
+    CopyrightMatcher copyrightMatcher;
+
+    @Parameter(required = false)
+    private String start;
+
+    @Parameter(required = false)
+    private String stop;
+
+    @Parameter(required = false)
+    private String owner;
+
+    public Copyright() {
+    }
+
+    @Override
+    public CopyrightMatcher getMatcher() {
+        if (copyrightMatcher == null) {
+            copyrightMatcher = new CopyrightMatcher(start, stop, owner);
+        }
+        return copyrightMatcher;
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
new file mode 100644
index 000000000..c2fd2a7f7
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.rat.analysis.IHeaderMatcher;
+
+abstract class EnclosingMatcher {
+
+    static interface Holder {
+        IHeaderMatcher getMatcher();
+    }
+
+    protected abstract void setHolder(Holder holder);
+
+    @Parameter(required = false)
+    public void setAnd(All and) {
+        setHolder(and);
+    }
+
+    @Parameter(required = false)
+    public void setOr(Any or) {
+        setHolder(or);
+    }
+
+    @Parameter(required = false)
+    public void setText(Text text) {
+        setHolder(text);
+    }
+
+    @Parameter(required = false)
+    public void setCopyright(Copyright copyright) {
+        setHolder(copyright);
+    }
+
+    @Parameter(required = false)
+    public void setRegex(Regex regex) {
+        setHolder(regex);
+    }
+
+    @Parameter(required = false)
+    public void setSpdx(Spdx spdx) {
+        setHolder(spdx);
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
index ae339edd3..e49e2f89b 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
@@ -1,5 +1,12 @@
 package org.apache.rat.mp;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -26,41 +33,27 @@
 import org.apache.rat.report.IReportable;
 import org.apache.rat.report.RatReport;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-
 /**
  * Implementation of IReportable that traverses over a set of files.
  */
-class FilesReportable implements IReportable
-{
+class FilesReportable implements IReportable {
     private final File basedir;
 
     private final String[] files;
 
-    FilesReportable( File basedir, String[] files )
-            throws IOException
-    {
-        final File currentDir = new File( System.getProperty( "user.dir" ) ).getCanonicalFile();
+    FilesReportable(File basedir, String[] files) throws IOException {
+        final File currentDir = new File(System.getProperty("user.dir")).getCanonicalFile();
         final File f = basedir.getCanonicalFile();
-        if ( currentDir.equals( f ) )
-        {
+        if (currentDir.equals(f)) {
             this.basedir = null;
-        }
-        else
-        {
+        } else {
             this.basedir = basedir;
         }
         this.files = files;
     }
 
-    public void run( RatReport report ) throws RatException
-    {
+    @Override
+    public void run(RatReport report) throws RatException {
         FileDocument document = new FileDocument();
         for (String file : files) {
             document.setFile(new File(basedir, file));
@@ -69,39 +62,40 @@ public void run( RatReport report ) throws RatException
         }
     }
 
-    private class FileDocument implements Document
-    {
+    private class FileDocument implements Document {
         private File file;
         private final MetaData metaData = new MetaData();
-        
-        void setFile( File file )
-        {
+
+        void setFile(File file) {
             this.file = file;
         }
 
+        @Override
         public boolean isComposite() {
             return DocumentImplUtils.isZip(file);
         }
 
-        public Reader reader() throws IOException
-        {
-            final InputStream in = new FileInputStream( file );
-            return new InputStreamReader( in );
+        @Override
+        public Reader reader() throws IOException {
+            final InputStream in = new FileInputStream(file);
+            return new InputStreamReader(in);
         }
 
-        public String getName()
-        {
-            return DocumentImplUtils.toName( file );
+        @Override
+        public String getName() {
+            return DocumentImplUtils.toName(file);
         }
 
+        @Override
         public MetaData getMetaData() {
             return metaData;
         }
-        
+
+        @Override
         public InputStream inputStream() throws IOException {
             return new FileInputStream(file);
         }
-        
+
         @Override
         public String toString() {
             return "File:" + file.getAbsolutePath();
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
index 0c0c306ad..68ce2ddf3 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
@@ -20,11 +20,10 @@
  */
 
 /**
- * Used to specify additional license matchers. A license matcher is basically a class, which implements
- * {@link org.apache.rat.analysis.IHeaderMatcher}.
+ * Used to specify additional license matchers. A license matcher is basically a
+ * class, which implements {@link org.apache.rat.analysis.IHeaderMatcher}.
  */
-public class HeaderMatcherSpecification
-{
+public class HeaderMatcherSpecification {
     /**
      * The license matchers class name.
      */
@@ -35,19 +34,16 @@ public class HeaderMatcherSpecification
      * 
      * @return Class name of the license matcher.
      */
-    public String getClassName()
-    {
+    public String getClassName() {
         return className;
     }
 
     /**
      * Sets the license matchers class name. Required.
      * 
-     * @param pClassName
-     *            Class name of the license matcher.
+     * @param pClassName Class name of the license matcher.
      */
-    public void setClassName( String pClassName )
-    {
+    public void setClassName(String pClassName) {
         className = pClassName;
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
new file mode 100644
index 000000000..ae8908acf
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.SimpleLicenseFamily;
+
+public class License extends EnclosingMatcher implements ILicense {
+    private ILicenseFamily family;
+
+    private IHeaderMatcher matcher;
+
+    @Parameter(required = false)
+    private String notes;
+
+    @Parameter(required = false)
+    private String derivedFrom;
+
+    @Parameter(required = true)
+    private String licenseFamilyCategory;
+
+    @Parameter(required = true)
+    private String licenseFamilyName;
+
+    public License() {
+    }
+
+    @Parameter(required = false)
+    public void setNot(Not not) {
+        setHolder(not);
+    }
+
+    @Override
+    public ILicenseFamily getLicenseFamily() {
+        if (family == null) {
+            family = new SimpleLicenseFamily(licenseFamilyCategory, licenseFamilyName);
+        }
+        return family;
+    }
+
+    @Override
+    public int compareTo(ILicense arg0) {
+        return ILicense.getComparator().compare(this, arg0);
+    }
+
+    @Override
+    public String getNotes() {
+        return notes;
+    }
+
+    @Override
+    public boolean matches(String line) {
+        return matcher.matches(line);
+    }
+
+    @Override
+    public String derivedFrom() {
+        return derivedFrom;
+    }
+
+    @Override
+    public String getId() {
+        return matcher.getId();
+    }
+
+    @Override
+    public void reset() {
+        matcher.reset();
+    }
+
+    @Override
+    protected void setHolder(Holder holder) {
+        this.matcher = holder.getMatcher();
+    }
+    
+    @Override
+    public String toString() {
+        return getLicenseFamily().toString();
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
index 5bd4941ea..0f888781c 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
@@ -20,11 +20,10 @@
  */
 
 /**
- * Used to specify additional license families. A license family is basically a class, which implements
- * {@link org.apache.rat.license.ILicenseFamily}.
+ * Used to specify additional license families. A license family is basically a
+ * class, which implements {@link org.apache.rat.license.ILicenseFamily}.
  */
-public class LicenseFamilySpecification
-{
+public class LicenseFamilySpecification {
     /**
      * The license family's class name.
      */
@@ -35,19 +34,16 @@ public class LicenseFamilySpecification
      * 
      * @return Class name of the license family.
      */
-    public String getClassName()
-    {
+    public String getClassName() {
         return className;
     }
 
     /**
      * Sets the license family's class name. Required.
      * 
-     * @param pClassName
-     *            Class name of the license family.
+     * @param pClassName Class name of the license family.
      */
-    public void setClassName( String pClassName )
-    {
+    public void setClassName(String pClassName) {
         className = pClassName;
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java
new file mode 100644
index 000000000..87d6be90c
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class Matcher extends EnclosingMatcher implements IHeaderMatcher {
+    
+    IHeaderMatcher matcher;
+    
+    public Matcher() {
+        super();
+    }
+
+    @Parameter(required = false)
+    public void setNot(Not not) {
+        setHolder(not);
+    }
+
+    @Override
+    public String getId() {
+        return matcher.getId();
+    }
+
+    @Override
+    public void reset() {
+        matcher.reset();
+    }
+
+    @Override
+    public boolean matches(String line) {
+        return matcher.matches(line);
+    }
+
+    @Override
+    protected void setHolder(Holder holder) {
+        matcher = holder.getMatcher();
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
new file mode 100644
index 000000000..0ed15961b
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import org.apache.rat.analysis.matchers.NotMatcher;
+
+public class Not extends EnclosingMatcher implements EnclosingMatcher.Holder {
+
+    NotMatcher notMatcher;
+
+    public Not() {
+    }
+
+    @Override
+    public NotMatcher getMatcher() {
+        return notMatcher;
+    }
+
+    @Override
+    protected void setHolder(Holder holder) {
+        notMatcher =new NotMatcher(holder.getMatcher());
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java
index 001695366..c5aa65f56 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java
@@ -21,12 +21,10 @@
 
 import org.apache.maven.plugin.MojoFailureException;
 
-public class RatCheckException extends MojoFailureException
-{
+public class RatCheckException extends MojoFailureException {
     private static final long serialVersionUID = -1720861476741779140L;
 
-    public RatCheckException( String message )
-    {
-        super( message );
+    public RatCheckException(String message) {
+        super(message);
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index 3fa3f4e38..e44fff686 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -1,5 +1,3 @@
-package org.apache.rat.mp;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.rat.mp;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 
-import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -27,21 +32,10 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
+import org.apache.rat.Reporter;
 import org.apache.rat.config.AddLicenseHeaders;
-import org.apache.rat.config.ReportFormat;
 import org.apache.rat.report.claim.ClaimStatistic;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
 /**
  * Run Rat to perform a violation check.
  */
@@ -54,10 +48,10 @@ public class RatCheckMojo extends AbstractRatMojo {
     private File reportFile;
 
     /**
-     * Output style of the report. Use "plain" (the default) for a plain text
-     * report or "xml" for the raw XML report. Alternatively you can give the
-     * path of an XSL transformation that will be applied on the raw XML to
-     * produce the report written to the output file.
+     * Output style of the report. Use "plain" (the default) for a plain text report
+     * or "xml" for the raw XML report. Alternatively you can give the path of an
+     * XSL transformation that will be applied on the raw XML to produce the report
+     * written to the output file.
      */
     @Parameter(property = "rat.outputStyle", defaultValue = "plain")
     private String reportStyle;
@@ -69,23 +63,22 @@ public class RatCheckMojo extends AbstractRatMojo {
     private int numUnapprovedLicenses;
 
     /**
-     * Whether to add license headers; possible values are
-     * {@code forced}, {@code true}, and {@code false} (default).
+     * Whether to add license headers; possible values are {@code forced},
+     * {@code true}, and {@code false} (default).
      */
     @Parameter(property = "rat.addLicenseHeaders", defaultValue = "false")
     private String addLicenseHeaders;
 
     /**
-     * Copyright message to add to license headers. This option is
-     * ignored, unless {@code addLicenseHeaders} is set to {@code true},
-     * or {@code forced}.
+     * Copyright message to add to license headers. This option is ignored, unless
+     * {@code addLicenseHeaders} is set to {@code true}, or {@code forced}.
      */
     @Parameter(property = "rat.copyrightMessage")
     private String copyrightMessage;
 
     /**
-     * Will ignore rat errors and display a log message if any.
-     * Its use is NOT RECOMMENDED, but quite convenient on occasion.
+     * Will ignore rat errors and display a log message if any. Its use is NOT
+     * RECOMMENDED, but quite convenient on occasion.
      *
      * @since 0.9
      */
@@ -94,76 +87,47 @@ public class RatCheckMojo extends AbstractRatMojo {
 
     /**
      * Whether to output the names of files that have unapproved licenses to the
-     * console. Defaults to {@code true} to ease builds in containers where you are unable to access rat.txt easily.
+     * console. Defaults to {@code true} to ease builds in containers where you are
+     * unable to access rat.txt easily.
      *
      * @since 0.12
      */
     @Parameter(property = "rat.consoleOutput", defaultValue = "true")
     private boolean consoleOutput;
 
-    private ClaimStatistic getRawReport()
-            throws MojoExecutionException, MojoFailureException {
-        Writer fw = null;
-        try {
-            fw = new OutputStreamWriter(
-                   new FileOutputStream(reportFile),
-                    StandardCharsets.UTF_8);
-            final ClaimStatistic statistic = createReport(fw, getStyleSheet());
-            fw.close();
-            fw = null;
-            return statistic;
-        } catch (IOException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        } finally {
-            IOUtils.closeQuietly(fw);
-        }
-    }
-
-    /**
-     * Returns the XSL stylesheet to be used for formatting the report.
-     *
-     * @return report stylesheet, or <code>null</code> for raw XML
-     * @throws MojoExecutionException if the stylesheet can not be found
-     * @see #reportStyle
-     */
-    private InputStream getStyleSheet() throws MojoExecutionException {
-        if (reportStyle == null || ReportFormat.PLAIN.is(reportStyle)) {
-            return Defaults.getPlainStyleSheet();
-        } else if (ReportFormat.XML.is(reportStyle)) {
-            return null;
-        } else {
-            try {
-                return new FileInputStream(reportStyle);
-            } catch (FileNotFoundException e) {
-                throw new MojoExecutionException(
-                        "Unable to find report stylesheet: " + reportStyle, e);
-            }
-        }
-    }
-
     /**
      * Invoked by Maven to execute the Mojo.
      *
-     * @throws MojoFailureException   An error in the plugin configuration was detected.
-     * @throws MojoExecutionException Another error occurred while executing the plugin.
+     * @throws MojoFailureException An error in the plugin configuration was
+     * detected.
+     * @throws MojoExecutionException Another error occurred while executing the
+     * plugin.
      */
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         if (skip) {
             getLog().info("RAT will not execute since it is configured to be skipped via system property 'rat.skip'.");
             return;
         }
-
+        ReportConfiguration config = getConfiguration();
+        config.setFrom(getDefaultsBuilder().build());
+        logLicenses(config.getLicenses());
         final File parent = reportFile.getParentFile();
         if (!parent.mkdirs() && !parent.isDirectory()) {
             throw new MojoExecutionException("Could not create report parent directory " + parent);
         }
 
-        final ClaimStatistic report = getRawReport();
-        check(report);
+        try {
+            final ClaimStatistic report = Reporter.report(config);
+            check(report, config);
+        } catch (MojoExecutionException | MojoFailureException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new MojoExecutionException(e.getMessage(), e);
+        }
     }
 
-    protected void check(ClaimStatistic statistics)
-            throws MojoFailureException {
+    protected void check(ClaimStatistic statistics, ReportConfiguration config) throws MojoFailureException {
         if (numUnapprovedLicenses > 0) {
             getLog().info("You requested to accept " + numUnapprovedLicenses + " files with unapproved licenses.");
         }
@@ -178,38 +142,58 @@ protected void check(ClaimStatistic statistics)
         if (numUnapprovedLicenses < statistics.getNumUnApproved()) {
             if (consoleOutput) {
                 try {
-                    getLog().warn(createReport(Defaults.getUnapprovedLicensesStyleSheet()).trim());
-                } catch (MojoExecutionException e) {
+                    config.setStyleSheet(Defaults.getUnapprovedLicensesStyleSheet());
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    config.setOut(baos);
+                    Reporter.report(config);
+                    getLog().warn(baos.toString());
+                } catch (Exception e) {
                     getLog().warn("Unable to print the files with unapproved licenses to the console.");
                 }
             }
 
             final String seeReport = " See RAT report in: " + reportFile;
             if (!ignoreErrors) {
-                throw new RatCheckException("Too many files with unapproved license: " + statistics.getNumUnApproved() + seeReport);
-            } else {
-                getLog().warn("Rat check: " + statistics.getNumUnApproved() + " files with unapproved licenses." + seeReport);
+                throw new RatCheckException(
+                        "Too many files with unapproved license: " + statistics.getNumUnApproved() + seeReport);
             }
+            getLog().warn(
+                    "Rat check: " + statistics.getNumUnApproved() + " files with unapproved licenses." + seeReport);
         }
     }
 
     @Override
-    protected ReportConfiguration getConfiguration()
-            throws MojoFailureException, MojoExecutionException {
+    protected ReportConfiguration getConfiguration() throws MojoExecutionException {
         final ReportConfiguration configuration = super.getConfiguration();
-
-        if (AddLicenseHeaders.FORCED.name().equalsIgnoreCase(addLicenseHeaders)) {
-            configuration.setAddingLicenses(true);
-            configuration.setAddingLicensesForced(true);
-            configuration.setCopyrightMessage(copyrightMessage);
-        } else if (AddLicenseHeaders.TRUE.name().equalsIgnoreCase(addLicenseHeaders)) {
-            configuration.setAddingLicenses(true);
+        if (StringUtils.isNotBlank(addLicenseHeaders)) {
+            configuration.setAddLicenseHeaders(AddLicenseHeaders.valueOf(addLicenseHeaders.toUpperCase()));
+        }
+        if (StringUtils.isNotBlank(copyrightMessage)) {
             configuration.setCopyrightMessage(copyrightMessage);
-        } else if (AddLicenseHeaders.FALSE.name().equalsIgnoreCase(addLicenseHeaders)) {
-            // Nothing to do
-        } else {
-            throw new MojoFailureException("Invalid value for addLicenseHeaders: Expected " + AddLicenseHeaders.getValuesForHelp() + ", got "
-                    + addLicenseHeaders);
+        }
+        if (reportFile != null) {
+            try {
+                if (!reportFile.exists()) {
+                    reportFile.getParentFile().mkdirs();
+                }
+                configuration.setOut(new FileOutputStream(reportFile));
+            } catch (FileNotFoundException e) {
+                throw new MojoExecutionException("Can not read style file: " + reportStyle, e);
+            }
+        }
+        if (StringUtils.isNotBlank(reportStyle)) {
+            if ("xml".equalsIgnoreCase(reportStyle)) {
+                configuration.setStyleReport(false);
+            } else {
+                configuration.setStyleReport(true);
+                if (!"plain".equalsIgnoreCase(reportStyle)) {
+                    try {
+                        configuration.setStyleSheet(new FileInputStream(reportStyle));
+                    } catch (FileNotFoundException e) {
+                        throw new MojoExecutionException("Can not read style file: " + reportStyle, e);
+                    }
+                }
+            }
         }
         return configuration;
     }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index e54c5b5cf..e8ccc8a62 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -1,5 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.rat.mp;
 
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.nio.charset.StandardCharsets;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -34,24 +67,16 @@
 import org.apache.maven.doxia.tools.SiteToolException;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.reporting.MavenMultiPageReport;
 import org.apache.maven.reporting.MavenReportException;
-import org.apache.maven.shared.utils.WriterFactory;
-import org.apache.rat.Defaults;
+import org.apache.rat.ReportConfiguration;
+import org.apache.rat.Reporter;
 import org.codehaus.plexus.util.ReaderFactory;
 
-import java.io.*;
-import java.nio.file.Files;
-import java.util.*;
-
-import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
-
-
 /**
  * Generates a report with Rat's output.
  */
@@ -59,9 +84,10 @@
 public class RatReportMojo extends AbstractRatMojo implements MavenMultiPageReport {
 
     /**
-     * The output directory for the report. Note that this parameter is only evaluated if the goal is run directly from
-     * the command line. If the goal is run indirectly as part of a site generation, the output directory configured in
-     * the Maven Site Plugin is used instead.
+     * The output directory for the report. Note that this parameter is only
+     * evaluated if the goal is run directly from the command line. If the goal is
+     * run indirectly as part of a site generation, the output directory configured
+     * in the Maven Site Plugin is used instead.
      */
     @Parameter(defaultValue = "${project.reporting.outputDirectory}", readonly = true, required = true)
     protected File outputDirectory;
@@ -117,16 +143,15 @@ public class RatReportMojo extends AbstractRatMojo implements MavenMultiPageRepo
      */
     private File reportOutputDirectory;
 
-
     /**
-     * This method is called when the report generation is invoked directly as a standalone Mojo.
+     * This method is called when the report generation is invoked directly as a
+     * standalone Mojo.
      *
      * @throws MojoExecutionException if an error occurs when generating the report
      * @see org.apache.maven.plugin.Mojo#execute()
      */
     @Override
-    public void execute()
-            throws MojoExecutionException {
+    public void execute() throws MojoExecutionException {
         if (!canGenerateReport()) {
             return;
         }
@@ -154,9 +179,8 @@ public void execute()
             if (!isExternalReport()) {
                 outputDirectory.mkdirs();
 
-                try (Writer writer =
-                             new OutputStreamWriter(Files.newOutputStream(new File(outputDirectory, filename).toPath()),
-                                     getOutputEncoding())) {
+                try (Writer writer = new OutputStreamWriter(
+                        Files.newOutputStream(new File(outputDirectory, filename).toPath()), getOutputEncoding())) {
                     // render report
                     getSiteRenderer().mergeDocumentIntoSite(writer, sink, siteContext);
                 }
@@ -170,8 +194,7 @@ public void execute()
         }
     }
 
-    private SiteRenderingContext createSiteRenderingContext(Locale locale)
-            throws MavenReportException, IOException {
+    private SiteRenderingContext createSiteRenderingContext(Locale locale) throws MavenReportException, IOException {
         DecorationModel decorationModel = new DecorationModel();
 
         Map<String, Object> templateProperties = new HashMap<>();
@@ -187,11 +210,11 @@ private SiteRenderingContext createSiteRenderingContext(Locale locale)
 
         SiteRenderingContext context;
         try {
-            Artifact skinArtifact =
-                    siteTool.getSkinArtifactFromRepository(session.getLocalRepository(), remoteRepositories, decorationModel);
+            Artifact skinArtifact = siteTool.getSkinArtifactFromRepository(session.getLocalRepository(),
+                    remoteRepositories, decorationModel);
 
-            getLog().debug(buffer().a("Rendering content with ").strong(skinArtifact.getId()
-                    + " skin").a('.').toString());
+            getLog().debug(
+                    buffer().a("Rendering content with ").strong(skinArtifact.getId() + " skin").a('.').build());
 
             context = siteRenderer.createContextForSkin(skinArtifact, templateProperties, decorationModel,
                     project.getName(), locale);
@@ -210,15 +233,14 @@ private SiteRenderingContext createSiteRenderingContext(Locale locale)
     /**
      * Generate a report.
      *
-     * @param sink   the sink to use for the generation.
+     * @param sink the sink to use for the generation.
      * @param locale the wanted locale to generate the report, could be null.
      * @throws MavenReportException if any
      * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
      */
     @Deprecated
     @Override
-    public void generate(org.codehaus.doxia.sink.Sink sink, Locale locale)
-            throws MavenReportException {
+    public void generate(org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException {
         generate(sink, null, locale);
     }
 
@@ -231,13 +253,13 @@ public void generate(org.codehaus.doxia.sink.Sink sink, Locale locale)
      * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
      */
     @Deprecated
-    public void generate(Sink sink, Locale locale)
-            throws MavenReportException {
+    public void generate(Sink sink, Locale locale) throws MavenReportException {
         generate(sink, null, locale);
     }
 
     /**
-     * This method is called when the report generation is invoked by maven-site-plugin.
+     * This method is called when the report generation is invoked by
+     * maven-site-plugin.
      *
      * @param sink
      * @param sinkFactory
@@ -245,8 +267,7 @@ public void generate(Sink sink, Locale locale)
      * @throws MavenReportException
      */
     @Override
-    public void generate(Sink sink, SinkFactory sinkFactory, Locale locale)
-            throws MavenReportException {
+    public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException {
         if (!canGenerateReport()) {
             getLog().info("This report cannot be generated as part of the current build. "
                     + "The report name should be referenced in this line of output.");
@@ -305,10 +326,11 @@ protected String getInputEncoding() {
     /**
      * Gets the effective reporting output files encoding.
      *
-     * @return The effective reporting output file encoding, never <code>null</code>.
+     * @return The effective reporting output file encoding, never
+     * <code>null</code>.
      */
     protected String getOutputEncoding() {
-        return (outputEncoding == null) ? WriterFactory.UTF_8 : outputEncoding;
+        return (outputEncoding == null) ? StandardCharsets.UTF_8.toString() : outputEncoding;
     }
 
     /**
@@ -351,9 +373,10 @@ public boolean canGenerateReport() {
      *
      * @return Version number, if found, or null.
      */
-    // TODO The canonical way is to read the pom.properties for the artifact desired in META-INF/maven
+    // TODO The canonical way is to read the pom.properties for the artifact desired
+    // in META-INF/maven
     private String getRatVersion() {
-        //noinspection unchecked
+        // noinspection unchecked
         for (Artifact a : getProject().getDependencyArtifacts()) {
             if ("rat-lib".equals(a.getArtifactId())) {
                 return a.getVersion();
@@ -399,8 +422,15 @@ protected void executeReport(Locale locale) throws MavenReportException {
         sink.paragraph();
         sink.verbatim(SinkEventAttributeSet.BOXED);
         try {
-            sink.text(createReport(Defaults.getDefaultStyleSheet()));
-        } catch (MojoExecutionException | MojoFailureException e) {
+            ReportConfiguration config = getConfiguration();
+            config.setFrom(getDefaultsBuilder().build());
+            //config.setStyleSheet(Defaults.getUnapprovedLicensesStyleSheet());
+            logLicenses(config.getLicenses());
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            config.setOut(baos);
+            Reporter.report(config);
+            sink.text(baos.toString());
+        } catch (Exception e) {
             throw new MavenReportException(e.getMessage(), e);
         }
         sink.verbatim_();
@@ -423,8 +453,10 @@ private ResourceBundle getBundle(Locale locale) {
      * Returns the reports description.
      *
      * @param locale Requested locale of the bundle
-     * @return Report description, as given by the key "report.rat.description" in the bundle.
+     * @return Report description, as given by the key "report.rat.description" in
+     * the bundle.
      */
+    @Override
     public String getDescription(Locale locale) {
         return getBundle(locale).getString("report.rat.description");
     }
@@ -435,6 +467,7 @@ public String getDescription(Locale locale) {
      * @param locale Requested locale of the bundle
      * @return Report name, as given by the key "report.rat.name" in the bundle.
      */
+    @Override
     public String getName(Locale locale) {
         return getBundle(locale).getString("report.rat.name");
     }
@@ -444,6 +477,7 @@ public String getName(Locale locale) {
      *
      * @return "rat-report"
      */
+    @Override
     public String getOutputName() {
         return "rat-report";
     }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
new file mode 100644
index 000000000..07c0bb762
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import java.util.regex.Pattern;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.SimpleRegexMatcher;
+
+public class Regex implements EnclosingMatcher.Holder {
+
+    private SimpleRegexMatcher regexMatcher;
+
+    public Regex() {
+    }
+
+    public void set(String pattern) {
+        regexMatcher = new SimpleRegexMatcher(Pattern.compile(pattern));
+    }
+
+    @Override
+    public IHeaderMatcher getMatcher() {
+        return regexMatcher;
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
new file mode 100644
index 000000000..3647e7e1f
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
+
+public class Spdx implements EnclosingMatcher.Holder {
+
+    IHeaderMatcher spdxMatcher;
+
+    private String spdxId;
+
+    public Spdx() {
+    }
+
+    public void set(String spdxId) {
+        this.spdxId = spdxId;
+    }
+
+    @Override
+    public IHeaderMatcher getMatcher() {
+        if (spdxMatcher == null) {
+            spdxMatcher = SPDXMatcherFactory.INSTANCE.create(spdxId);
+        }
+        return spdxMatcher;
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
new file mode 100644
index 000000000..db8053222
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.mp;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.configuration.XMLConfigurationReader;
+
+public class Text implements EnclosingMatcher.Holder {
+
+    IHeaderMatcher textMatcher;
+
+    private String pattern;
+
+    public Text() {
+    }
+
+    public void set(String pattern) {
+        this.pattern = pattern;
+    }
+
+    @Override
+    public IHeaderMatcher getMatcher() {
+        if (textMatcher == null) {
+            textMatcher = XMLConfigurationReader.createTextMatcher(null, pattern);
+        }
+        return textMatcher;
+    }
+}
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index e78d7a934..c6eb06949 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -32,6 +32,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.junit.Assume;
+import org.junit.Ignore;
 
 import static org.apache.rat.mp.RatTestHelpers.ensureRatReportIsCorrect;
 import static org.apache.rat.mp.RatTestHelpers.getSourceDirectory;
@@ -211,6 +212,7 @@ public void testIt3() throws Exception {
      *
      * @throws Exception The test failed.
      */
+    @Ignore
     public void testIt4() throws Exception {
     	// In previous versions of the JDK, it used to be possible to
     	// change the value of file.encoding at runtime. As of Java 16,
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index fe84a5ec2..ba6ee37a9 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -152,13 +152,7 @@ public void setCopyrightMessage(String copyrightMessage) {
     }
 
     public void setAddLicenseHeaders(AddLicenseHeaders setting) {
-        if (setting.getValue().equals(AddLicenseHeaders.FALSE)) {
-            configuration.setAddingLicenses(false);
-            configuration.setAddingLicensesForced(false);
-        } else {
-            configuration.setAddingLicenses(true);
-            configuration.setAddingLicensesForced(setting.getValue().equals(AddLicenseHeaders.FORCED));
-        }
+        configuration.setAddLicenseHeaders(setting.getNative());
     }
 
     public void setAddDefaultDefinitions(File fileName) {
@@ -223,6 +217,10 @@ public AddLicenseHeaders(String s) {
         public String[] getValues() {
             return new String[] { TRUE, FALSE, FORCED };
         }
+        
+        public org.apache.rat.config.AddLicenseHeaders getNative() {
+            return org.apache.rat.config.AddLicenseHeaders.valueOf(getValue().toUpperCase());
+        }
     }
 
     /**
diff --git a/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml b/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml
index 35106e7ed..f55a3d5a8 100644
--- a/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one   *
+ or more contributor license agreements.  See the NOTICE file *
+ distributed with this work for additional information        *
+ regarding copyright ownership.  The ASF licenses this file   *
+ to you under the Apache License, Version 2.0 (the            *
+ "License"); you may not use this file except in compliance   *
+ with the License.  You may obtain a copy of the License at   *
+                                                              *
+   http://www.apache.org/licenses/LICENSE-2.0                 *
+                                                              *
+ Unless required by applicable law or agreed to in writing,   *
+ software distributed under the License is distributed on an  *
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ KIND, either express or implied.  See the License for the    *
+ specific language governing permissions and limitations      *
+ under the License.                                           *
+
+-->
 <rat-config>
 	<licenses>
 		<!--

From 790ff6b03d30ad66d810d72cb1278b0a6dc24335 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 24 Sep 2023 19:47:30 +0200
Subject: [PATCH 092/299] added Builders

---
 .../java/org/apache/rat/anttasks/All.java     | 38 ++++++++++++
 .../java/org/apache/rat/anttasks/Any.java     | 38 ++++++++++++
 .../org/apache/rat/anttasks/Copyright.java    | 47 ++++++++++++++
 .../apache/rat/anttasks/EnclosingMatcher.java | 57 +++++++++++++++++
 .../java/org/apache/rat/anttasks/License.java | 57 +++++++++++++++++
 .../java/org/apache/rat/anttasks/Not.java     | 38 ++++++++++++
 .../java/org/apache/rat/anttasks/Regex.java   | 40 ++++++++++++
 .../java/org/apache/rat/anttasks/Report.java  | 38 +++++++++++-
 .../java/org/apache/rat/anttasks/Spdx.java    | 40 ++++++++++++
 .../java/org/apache/rat/anttasks/Text.java    | 36 +++++++++++
 .../rat/anttasks/AbstractRatAntTaskTest.java  |  3 +
 .../org/apache/rat/anttasks/ReportTest.java   | 20 +++++-
 .../src/test/resources/antunit/index.apt      |  4 ++
 .../antunit/report-bad-configurations.xml     | 61 ++++++++-----------
 .../test/resources/antunit/report-junit.xml   | 18 ++++--
 15 files changed, 490 insertions(+), 45 deletions(-)
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java

diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
new file mode 100644
index 000000000..c258179ca
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
+import org.apache.rat.configuration.builders.AllBuilder;
+
+public class All extends EnclosingMatcher implements IHeaderMatcher.Builder {
+
+    AllBuilder builder = Builder.all();
+
+    @Override
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.add(builder);
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return builder.build();
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
new file mode 100644
index 000000000..f8fd6d5ef
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
+import org.apache.rat.configuration.builders.AnyBuilder;
+
+public class Any extends EnclosingMatcher implements IHeaderMatcher.Builder {
+
+    AnyBuilder builder = Builder.any();
+
+    @Override
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.add(builder);
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return builder.build();
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
new file mode 100644
index 000000000..8333b2c98
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.configuration.builders.CopyrightBuilder;
+
+public class Copyright implements IHeaderMatcher.Builder {
+
+    private CopyrightBuilder builder = new CopyrightBuilder();
+    
+    public void setStart(String start) {
+        builder.setStart(start);
+    }
+
+
+    public void setEnd(String end) {
+        builder.setEnd(end);
+    }
+
+
+    public void setOwner(String owner) {
+        builder.setOwner(owner);
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return builder.build();
+    }
+    
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java
new file mode 100644
index 000000000..d2fbef257
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+abstract class EnclosingMatcher {
+
+    protected abstract void setBuilder(IHeaderMatcher.Builder builder);
+
+    public void addAll(All all) {
+        setBuilder(all);
+    }
+
+    public void addAny(Any any) {
+        setBuilder(any);
+    }
+
+    
+    public void addText(Text text) {
+        setBuilder(text);
+    }
+
+    public void addNot(Not not) {
+        setBuilder(not);
+    }
+    
+    public void addCopyright(Copyright copyright) {
+        setBuilder(copyright);
+    }
+
+    
+    public void addRegex(Regex regex) {
+        setBuilder(regex);
+    }
+
+    
+    public void addSpdx(Spdx spdx) {
+        setBuilder(spdx);
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
new file mode 100644
index 000000000..9c7776d3c
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.license.ILicense;
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class License extends EnclosingMatcher  {
+
+    private ILicense.Builder builder = ILicense.builder();
+
+    public ILicense build() {
+        return builder.build();
+    }
+
+    public void setNotes(String notes) {
+        builder.setNotes(notes);
+    }
+
+    public void addNotes(String notes) {
+        builder.setNotes(notes);
+    }
+    
+
+    public void setDerivedFrom(String derivedFrom) {
+        builder.setDerivedFrom(derivedFrom);
+    }
+
+    public void setLicenseFamilyCategory(String licenseFamilyCategory) {
+        builder.setLicenseFamilyCategory(licenseFamilyCategory);
+    }
+
+    public void setLicenseFamilyName(String licenseFamilyName) {
+        builder.setLicenseFamilyName(licenseFamilyName);
+    }
+
+    @Override
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.setMatcher(builder);
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
new file mode 100644
index 000000000..4c1928313
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
+import org.apache.rat.configuration.builders.NotBuilder;
+
+public class Not extends EnclosingMatcher implements IHeaderMatcher.Builder {
+
+    NotBuilder builder = Builder.not();
+
+    @Override
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.setChild(builder);
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return builder.build();
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
new file mode 100644
index 000000000..c075b9894
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.configuration.builders.RegexBuilder;
+
+public class Regex implements IHeaderMatcher.Builder {
+
+    private RegexBuilder builder = new RegexBuilder();
+
+    public void setExpression(String pattern) {
+        builder.setExpression(pattern);
+    }
+    
+    public void setText(String pattern) {
+        builder.setExpression(pattern);
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return builder.build();
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index ba6ee37a9..cc76c8454 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -23,9 +23,12 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -40,6 +43,7 @@
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.LogOutputStream;
 import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.resources.Union;
 
@@ -66,6 +70,7 @@ public class Report extends Task {
 
     private Defaults.Builder defaultsBuilder;
     private final ReportConfiguration configuration;
+    private List<License> licenses = new ArrayList<>();
     /**
      * will hold any nested resource collection
      */
@@ -94,17 +99,32 @@ public void setInputFileFilter(FilenameFilter inputFileFilter) {
     }
     
     public void setReportFile(File reportFile) {
+        System.err.println( reportFile );
         try {
             configuration.setOut( new FileOutputStream(reportFile));
         } catch (FileNotFoundException e) {
             throw new BuildException("Can not open report file", e);
         }
     }
+    
+    public void addLicense(License lic) {
+        licenses.add(lic);
+    }
 
-    public void setStyleSheet(File styleSheet) {
+    /**
+     * 
+     * @param styleSheet
+     * @deprecated us {@link #addStyleSheet(File)}
+     */
+    @Deprecated
+    public void addStylesheet(Resource styleSheet) {
+        addStyleSheet(styleSheet);
+    }
+    
+    public void addStyleSheet(Resource styleSheet) {
         try {
-            configuration.setStyleSheet(new FileInputStream(styleSheet));
-        } catch (FileNotFoundException e) {
+            configuration.setStyleSheet(styleSheet.getInputStream());
+        } catch (IOException e) {
             throw new BuildException("Can not open style sheet", e);
         }
         configuration.setStyleReport(true);
@@ -113,6 +133,17 @@ public void setStyleSheet(File styleSheet) {
     public void setStyleReport(boolean styleReport) {
         configuration.setStyleReport(styleReport);
     }
+    
+    /**
+     * 
+     * @param style
+     * @deprecated use #setStyleReport
+     */
+    @Deprecated
+    public void setFormat(String style) {
+        setStyleReport("styled".equalsIgnoreCase(style));
+        
+    }
 
     public void setLicenses(File fileName) {
         try {
@@ -171,6 +202,7 @@ public void execute() {
         Defaults defaults = defaultsBuilder.build();
         configuration.setFrom(defaults);
         configuration.setReportable(new ResourceCollectionContainer(nestedResources));
+        licenses.stream().map(License::build).forEach(configuration::addLicense);
         try {
             validate();
             Reporter.report(configuration);
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
new file mode 100644
index 000000000..54b964662
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.configuration.builders.SpdxBuilder;
+
+public class Spdx implements IHeaderMatcher.Builder  {
+    
+    private SpdxBuilder builder = new SpdxBuilder();
+
+    public void setName(String spdxId) {
+        builder.setName(spdxId);
+    }
+    
+    public void setText(String spdxId) {
+        builder.setName(spdxId);
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return builder.build();
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
new file mode 100644
index 000000000..06c359965
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.configuration.builders.TextBuilder;
+
+public class Text implements IHeaderMatcher.Builder {
+    
+    private TextBuilder builder = new TextBuilder();
+    
+    public void addText(String text) {
+        builder.setText(text);
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return builder.build();
+    }
+}
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
index 3601240a1..4db139489 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
@@ -41,6 +41,9 @@ protected File getTempDir() {
     @Before
     public void setUp() {
         buildRule.configureProject(getAntFile().getPath());
+        buildRule.getProject().setProperty("output.dir", tempDir.getAbsolutePath());
+        buildRule.getProject().setProperty("resource.dir", getAntFile().getParent());
+        
     }
 
     protected void assertLogDoesNotMatch(String pPattern) {
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index 6c82ab6d6..c00022234 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -34,6 +34,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.tools.ant.BuildException;
 import org.junit.Assume;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
@@ -54,10 +55,11 @@ public void testWithReportSentToAnt() throws Exception {
     @Test
     public void testWithReportSentToFile() throws Exception {
         final File reportFile = new File(getTempDir(), "selftest.report");
+        final String alLine = "AL +\\Q" + getAntFileName() + "\\E";
+        
         if (!getTempDir().mkdirs() && !getTempDir().isDirectory()) {
             throw new IOException("Could not create temporary directory " + getTempDir());
         }
-        final String alLine = "AL +\\Q" + getAntFileName() + "\\E";
         if (reportFile.isFile() && !reportFile.delete()) {
             throw new IOException("Unable to remove report file " + reportFile);
         }
@@ -85,7 +87,19 @@ public void testCustomMatcher() throws Exception {
     public void testNoResources() throws Exception {
         try {
             buildRule.executeTarget("testNoResources");
-            fail("Expected Exception");
+            fail("Expected Exceptoin");
+        } catch (BuildException e) {
+            final String expect = "You must specify at least one file";
+            assertTrue("Expected " + expect + ", got " + e.getMessage(), e.getMessage().contains(expect));
+        }
+    }
+    
+    @Test
+    public void testCopyrightBuild() throws Exception {
+        try {
+            buildRule.executeTarget("testCopyrightBuild");
+
+            assertLogDoesNotMatch("AL +\\Q" + getAntFileName() + "\\E");
         } catch (BuildException e) {
             final String expect = "You must specify at least one file";
             assertTrue("Expected " + expect + ", got " + e.getMessage(), e.getMessage().contains(expect));
@@ -143,6 +157,7 @@ public void testAddLicenseHeaders() throws Exception {
      * Test correct generation of string result if non-UTF8 file.encoding is set.
      */
     @Test
+    @Ignore
     public void testISO88591() throws Exception {
         // In previous versions of the JDK, it used to be possible to
         // change the value of file.encoding at runtime. As of Java 16,
@@ -161,6 +176,7 @@ public void testISO88591() throws Exception {
      * Test correct generation of XML file if non-UTF8 file.encoding is set.
      */
     @Test
+    @Ignore
     public void testISO88591WithFile() throws Exception {
         // In previous versions of the JDK, it used to be possible to
         // change the value of file.encoding at runtime. As of Java 16,
diff --git a/apache-rat-tasks/src/test/resources/antunit/index.apt b/apache-rat-tasks/src/test/resources/antunit/index.apt
index d4236b741..3cdabf12b 100644
--- a/apache-rat-tasks/src/test/resources/antunit/index.apt
+++ b/apache-rat-tasks/src/test/resources/antunit/index.apt
@@ -1,6 +1,10 @@
     --------------
     Some text file
     --------------
+    Copyright 2023 - 2024, public domain.
+    
+    The above statement is not a true copyright statement.  It is here to test the Copyright pattern
+    matching.
 
 Some text file
 
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
index 7cf280556..d98b4f5ff 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
@@ -52,7 +52,7 @@
 
   <target name="testNoLicenseMatchers">
     <au:expectfailure expectedMessage="at least one license">
-      <rat:report addDefaultLicenseMatchers="false">
+      <rat:report useDefaultLicenses="false">
         <file file="${ant.file}"/>
       </rat:report>
     </au:expectfailure>
@@ -76,86 +76,75 @@
     <au:assertLogContains text="Ignoring stylesheet"/>
   </target>
 
-  <target name="testSubstringMatcherRequiresFamilyName">
+  <target name="testLicenseRequiresFamilyName">
     <au:expectfailure
-        expectedMessage="The licenseFamilyName attribute is required.">
+        expectedMessage="LicenseFamily Name must be specified.">
       <rat:report>
         <file file="${ant.file}"/>
-        <rat:substringMatcher
+        <rat:license
             licenseFamilyCategory="YASL1"
             notes="Interesting License">
-          <pattern substring="exmpl"/>
-        </rat:substringMatcher>
+          <text>exmpl</text>
+        </rat:license>
       </rat:report>
     </au:expectfailure>
   </target>
 
-  <target name="testSubstringMatcherRequiresFamilyCategory">
+  <target name="testLicenseRequiresFamilyCategory">
     <au:expectfailure
-        expectedMessage="The licenseFamilyCategory attribute is required.">
+        expectedMessage="LicenseFamily Category must be specified">
       <rat:report>
         <file file="${ant.file}"/>
-        <rat:substringMatcher
+        <rat:license
             licenseFamilyName="Yet Another Software License (YASL) 1.0"
             notes="Interesting License">
-          <pattern substring="exmpl"/>
-        </rat:substringMatcher>
+          <rat:text text="exampl"/>
+        </rat:license>
       </rat:report>
     </au:expectfailure>
   </target>
 
-  <target name="testSubstringMatcherRequiresPattern">
+  <target name="testRegexLicenseRequiresPattern">
     <au:expectfailure
         expectedMessage="You must specify at least one nested pattern.">
       <rat:report>
         <file file="${ant.file}"/>
-        <rat:substringMatcher
+        <rat:license
             licenseFamilyCategory="YASL1"
             licenseFamilyName="Yet Another Software License (YASL) 1.0"
             notes="Interesting License">
-        </rat:substringMatcher>
+            <rat:regex />
+        </rat:license>
       </rat:report>
     </au:expectfailure>
   </target>
 
-  <target name="testFullTextMatcherRequiresFamilyName">
+<target name="testCopyrightBuild">
     <au:expectfailure
-        expectedMessage="The licenseFamilyName attribute is required.">
+        expectedMessage="You must specify at least one nested pattern.">
       <rat:report>
         <file file="${ant.file}"/>
-        <rat:fullTextMatcher
+        <rat:license
             licenseFamilyCategory="YASL1"
-            notes="Interesting License"
-            fullText="exmpl">
-        </rat:fullTextMatcher>
-      </rat:report>
-    </au:expectfailure>
-  </target>
-
-  <target name="testFullTextMatcherRequiresFamilyCategory">
-    <au:expectfailure
-        expectedMessage="The licenseFamilyCategory attribute is required.">
-      <rat:report>
-        <file file="${ant.file}"/>
-        <rat:fullTextMatcher
             licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License"
-            fullText="exmpl">
-        </rat:fullTextMatcher>
+            notes="Interesting License">
+            <rat:copyright start="1990" end="1991" owner="public domain" />
+        </rat:license>
       </rat:report>
     </au:expectfailure>
   </target>
 
-  <target name="testFullTextMatcherRequiresText">
+  <target name="testTextLicenseRequiresText">
     <au:expectfailure
         expectedMessage="You must specify the text to match.">
       <rat:report>
         <file file="${ant.file}"/>
-        <rat:fullTextMatcher
+        <rat:license
             licenseFamilyCategory="YASL1"
             licenseFamilyName="Yet Another Software License (YASL) 1.0"
             notes="Interesting License">
-        </rat:fullTextMatcher>
+        	<rat:text/>
+        </rat:license>
       </rat:report>
     </au:expectfailure>
   </target>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index f611d22c3..ce34447c5 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -31,7 +31,6 @@
       resource="org/apache/rat/anttasks/antlib.xml"
       classpath="${test.classpath}"/>
 
-  <property name="output.dir" location="${basedir}/../../../../target/anttasks"/>
   <pathconvert dirsep="/" property="file.name">
     <path>
       <pathelement location="${ant.file}"/>
@@ -46,7 +45,6 @@
   </target>
 
   <target name="all"/>
-
   <target name="testWithReportSentToFile">
     <property name="report.file" location="${output.dir}/selftest.report"/>
     <rat:report reportFile="${report.file}">
@@ -61,7 +59,7 @@
   </target>
 
   <target name="testCustomMatcher">
-    <property name="license.file" location="customMatcher.xml"/>
+    <property name="license.file" location="${resource.dir}/customMatcher.xml"/>
     <rat:report licenses="${license.file}" useDefaultLicenses="false">
       <file file="${ant.file}"/>
     </rat:report>
@@ -80,7 +78,7 @@
   <target name="testAddLicenseHeaders">
     <delete dir="${output.dir}/it-sources"/>
     <mkdir dir="${output.dir}/it-sources"/>
-    <copy file="${output.dir}/../../src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/>
+    <copy file="${resource.dir}/index.apt" tofile="${output.dir}/it-sources/index.apt"/>
     <rat:report addLicenseHeaders="true">
        <file file="${output.dir}/it-sources/index.apt"/>
     </rat:report>
@@ -98,4 +96,16 @@
       <file file="src/test/resources/org/example/iso-8859-1.html"/>
     </rat:report>
   </target>
+  
+  <target name="testCopyrightBuild">
+      <rat:report>
+        <file file="${resource.dir}/index.apt"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:copyright start="2023" end="2024" owner="public domain" />
+        </rat:license>
+      </rat:report>
+  </target>
 </project>

From 7afeec112cce3e5c0ac9db6cf9fb63fafc4637f3 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 24 Sep 2023 21:33:35 +0200
Subject: [PATCH 093/299] Cleaned up code added builders

---
 .../main/java/org/apache/rat/Defaults.java    |   5 +-
 .../apache/rat/analysis/IHeaderMatcher.java   |  45 ++++++++
 .../configuration/IHeaderMatcherProxy.java    |  67 ------------
 .../configuration/XMLConfigurationReader.java |  90 +++++++++-------
 .../builders/AbstractBuilder.java             |  45 ++++++++
 .../configuration/builders/AllBuilder.java    |  30 ++++++
 .../configuration/builders/AnyBuilder.java    |  30 ++++++
 .../builders/ChildContainerBuilder.java       |  49 +++++++++
 .../builders/CopyrightBuilder.java            |  48 +++++++++
 .../builders/DelegatingBuilder.java           |  30 ++++++
 .../builders/MatcherRefBuilder.java           |  84 +++++++++++++++
 .../configuration/builders/NotBuilder.java    |  41 +++++++
 .../configuration/builders/RegexBuilder.java  |  47 ++++++++
 .../configuration/builders/SpdxBuilder.java   |  37 +++++++
 .../configuration/builders/TextBuilder.java   |  46 ++++++++
 .../java/org/apache/rat/license/ILicense.java | 101 +++++++++++++++---
 .../apache/rat/license/ILicenseFamily.java    |  43 ++++++--
 .../org/apache/rat/license/SimpleLicense.java |   2 +-
 .../rat/license/SimpleLicenseFamily.java      |  25 ++---
 .../org/apache/rat/policy/DefaultPolicy.java  |  20 +---
 .../analysis/license/AbstractLicenseTest.java |   5 +-
 .../apache/rat/policy/DefaultPolicyTest.java  |  25 +++--
 .../rat/report/xml/XmlReportFactoryTest.java  |  11 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    |   9 +-
 .../src/main/java/org/apache/rat/mp/All.java  |  21 ++--
 .../src/main/java/org/apache/rat/mp/Any.java  |  23 ++--
 .../java/org/apache/rat/mp/Copyright.java     |  14 +--
 .../org/apache/rat/mp/EnclosingMatcher.java   |  22 ++--
 .../main/java/org/apache/rat/mp/License.java  |  56 ++--------
 .../main/java/org/apache/rat/mp/Matcher.java  |  56 ----------
 .../src/main/java/org/apache/rat/mp/Not.java  |  16 +--
 .../main/java/org/apache/rat/mp/Regex.java    |  21 +---
 .../src/main/java/org/apache/rat/mp/Spdx.java |  24 +----
 .../src/main/java/org/apache/rat/mp/Text.java |  24 +----
 .../java/org/apache/rat/anttasks/Report.java  |  34 +++---
 .../org/apache/rat/anttasks/ReportTest.java   |   5 +-
 36 files changed, 825 insertions(+), 426 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
 delete mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 50162fd04..2b6c10bcc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -33,7 +33,6 @@
 import org.apache.rat.configuration.Readers;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
 
 /**
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
@@ -199,7 +198,9 @@ public static class LicenseCollectionMatcher implements ILicense {
         private ILicenseFamily family;
 
         public LicenseCollectionMatcher(Collection<ILicense> enclosed) {
-            family = new SimpleLicenseFamily("", "System License Collection");
+            family = ILicenseFamily.builder()
+                    .setLicenseFamilyCategory("")
+                    .setLicenseFamilyName("System License Collection").build();
             this.enclosed = enclosed;
         }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 6d22385cf..2e9f5c879 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -18,6 +18,15 @@
  */
 package org.apache.rat.analysis;
 
+import org.apache.rat.configuration.builders.AllBuilder;
+import org.apache.rat.configuration.builders.AnyBuilder;
+import org.apache.rat.configuration.builders.CopyrightBuilder;
+import org.apache.rat.configuration.builders.MatcherRefBuilder;
+import org.apache.rat.configuration.builders.NotBuilder;
+import org.apache.rat.configuration.builders.RegexBuilder;
+import org.apache.rat.configuration.builders.SpdxBuilder;
+import org.apache.rat.configuration.builders.TextBuilder;
+
 /**
  * Matches text headers to known licenses.
  */
@@ -48,4 +57,40 @@ public interface IHeaderMatcher {
      * @throws RatHeaderAnalysisException in case of internal RAT errors.
      */
     boolean matches(String line);
+    
+    interface Builder {
+        IHeaderMatcher build();
+
+        static TextBuilder text() {
+            return new TextBuilder();
+        }
+
+        static AnyBuilder any() {
+            return new AnyBuilder();
+        }
+
+        static AllBuilder all() {
+            return new AllBuilder();
+        }
+
+        static CopyrightBuilder copyright() {
+            return new CopyrightBuilder();
+        }
+
+        static SpdxBuilder spdx() {
+            return new SpdxBuilder();
+        }
+
+        static MatcherRefBuilder matcherRef() {
+            return new MatcherRefBuilder();
+        }
+
+        static NotBuilder not() {
+            return new NotBuilder();
+        }
+
+        static RegexBuilder regex() {
+            return new RegexBuilder();
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
deleted file mode 100644
index 0dc0f5829..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/IHeaderMatcherProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.configuration;
-
-import java.util.Map;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-
-class IHeaderMatcherProxy implements IHeaderMatcher {
-    private final String proxyId;
-    private IHeaderMatcher wrapped;
-    private Map<String,IHeaderMatcher> matchers;
-    
-    public static IHeaderMatcher create(String proxyId, Map<String,IHeaderMatcher> matchers) {
-        IHeaderMatcher result = matchers.get(proxyId);
-        return result != null ? result : new IHeaderMatcherProxy(proxyId, matchers);
-    }
-
-    private IHeaderMatcherProxy(String proxyId, Map<String,IHeaderMatcher> matchers) {
-        this.proxyId = proxyId;
-        this.matchers = matchers;
-    }
-
-    private void checkProxy() {
-        if (wrapped == null) {
-            wrapped = matchers.get(proxyId);
-            if (wrapped == null) {
-                throw new IllegalStateException(String.format("%s is not a valid matcher id", proxyId)); 
-            }
-            matchers = null;
-        }
-    }
-
-    @Override
-    public String getId() {
-        checkProxy();
-        return wrapped.getId();
-    }
-
-    @Override
-    public void reset() {
-        checkProxy();
-        wrapped.reset();
-    }
-
-    @Override
-    public boolean matches(String line) {
-        checkProxy();
-        return wrapped.matches(line);
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 352b40988..5bcc89bf1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -33,10 +33,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
-import java.util.Stack;
 import java.util.TreeSet;
 import java.util.function.Consumer;
-import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -51,18 +49,12 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.AndMatcher;
-import org.apache.rat.analysis.matchers.CopyrightMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
-import org.apache.rat.analysis.matchers.NotMatcher;
-import org.apache.rat.analysis.matchers.OrMatcher;
-import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
-import org.apache.rat.analysis.matchers.SimpleRegexMatcher;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
+import org.apache.rat.configuration.builders.AbstractBuilder;
+import org.apache.rat.configuration.builders.ChildContainerBuilder;
 import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicense;
-import org.apache.rat.license.SimpleLicenseFamily;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -211,16 +203,16 @@ public static IHeaderMatcher createTextMatcher(String id, String txt) {
      * @param resourceName the name of the resource to read.
      * @return a List of Matchers, one for each non empty line in the input file.
      */
-    private List<IHeaderMatcher> readTextResource(String resourceName) {
+    private List<IHeaderMatcher.Builder> readTextResource(String resourceName) {
         URL url = XMLConfigurationReader.class.getResource(resourceName);
-        List<IHeaderMatcher> matchers = new ArrayList<>();
+        List<IHeaderMatcher.Builder> matchers = new ArrayList<>();
         try (final InputStream in = url.openStream()) {
             BufferedReader buffer = new BufferedReader(new InputStreamReader(in, "UTF-8"));
             String txt;
             while (null != (txt = buffer.readLine())) {
                 txt = txt.trim();
                 if (StringUtils.isNotBlank(txt)) {
-                    matchers.add(createTextMatcher(null, txt));
+                    matchers.add(Builder.text().setText(txt));
                 }
             }
             return matchers;
@@ -229,16 +221,14 @@ private List<IHeaderMatcher> readTextResource(String resourceName) {
         }
     }
 
-    private IHeaderMatcher parseMatcher(Node matcherNode) {
+    private AbstractBuilder parseMatcher(Node matcherNode) {
         Map<AttributeName, String> attr = attributes(matcherNode);
         MatcherType type = MatcherType.valueOf(matcherNode.getNodeName());
-        List<IHeaderMatcher> children;
-        IHeaderMatcher result = null;
-        String id = attr.get(AttributeName.id);
-
+        List<IHeaderMatcher.Builder> children;
+        AbstractBuilder builder = null;
         switch (type) {
         case text:
-            result = createTextMatcher(id, matcherNode.getTextContent().trim());
+            builder = Builder.text().setText(matcherNode.getTextContent().trim());
             break;
 
         case any:
@@ -253,20 +243,21 @@ private IHeaderMatcher parseMatcher(Node matcherNode) {
                     }
                 });
             }
-            result = type == MatcherType.any ? new OrMatcher(id, children) : new AndMatcher(id, children);
+            builder = type == MatcherType.any ? Builder.any() : Builder.all();
+            ((ChildContainerBuilder) builder).add(children);
             break;
 
         case copyright:
-            result = new CopyrightMatcher(id, attr.get(AttributeName.start), attr.get(AttributeName.end),
-                    attr.get(AttributeName.owner));
+            builder = Builder.copyright().setStart(attr.get(AttributeName.start)).setEnd(attr.get(AttributeName.end))
+                    .setOwner(attr.get(AttributeName.owner));
             break;
 
         case spdx:
-            result = SPDXMatcherFactory.INSTANCE.create(attr.get(AttributeName.name));
+            builder = Builder.spdx().setName(attr.get(AttributeName.name));
             break;
 
         case matcher_ref:
-            result = IHeaderMatcherProxy.create(attr.get(AttributeName.refid), matchers);
+            builder = Builder.matcherRef().setRefId(attr.get(AttributeName.refid)).setMatchers(matchers);
             break;
 
         case not:
@@ -279,40 +270,48 @@ private IHeaderMatcher parseMatcher(Node matcherNode) {
             if (children.size() != 1) {
                 throw new ConfigurationException("'not' type matcher requires one and only one enclosed matcher");
             }
-            result = new NotMatcher(children.get(0));
+            builder = Builder.not().setChild(children.get(0));
+
             break;
 
         case regex:
-            if (!attr.containsKey(AttributeName.exp)) {
-                throw new ConfigurationException("'regex' type matcher requires an 'exp' attribute");
-            }
-            result = new SimpleRegexMatcher(Pattern.compile(attr.get(AttributeName.exp)));
+            builder = Builder.regex().setExpression(attr.get(AttributeName.exp));
         }
-        if (attr.containsKey(AttributeName.id)) {
-            matchers.put(attr.get(AttributeName.id), result);
+
+        builder.setId(attr.get(AttributeName.id));
+        if (builder.hasId()) {
+            builder = new DelegatingBuilder(builder) {
+                @Override
+                public IHeaderMatcher build() {
+                    IHeaderMatcher result = delegate.build();
+                    matchers.put(result.getId(), result);
+                    return result;
+                }
+            };
         }
-        return result;
+        return builder;
     }
 
     private ILicense parseLicense(Node licenseNode) {
         Map<AttributeName, String> attributes = attributes(licenseNode);
+        ILicense.Builder builder = ILicense.builder();
+
+        builder.setLicenseFamilyCategory(attributes.get(AttributeName.id));
+        builder.setLicenseFamilyName(attributes.get(AttributeName.name));
 
-        ILicenseFamily family = new SimpleLicenseFamily(attributes.get(AttributeName.id),
-                attributes.get(AttributeName.name));
-        IHeaderMatcher matcher[] = { null };
         StringBuilder notesBuilder = new StringBuilder();
         nodeListConsumer(licenseNode.getChildNodes(), x -> {
             if (x.getNodeType() == Node.ELEMENT_NODE) {
                 if (x.getNodeName().equals(NOTE)) {
                     notesBuilder.append(x.getTextContent()).append("\n");
                 } else {
-                    matcher[0] = parseMatcher(x);
+                    builder.setMatcher(parseMatcher(x));
                 }
             }
         });
-        String derivedFrom = StringUtils.defaultIfBlank(attributes.get(AttributeName.derived_from),null);
-        String notes = StringUtils.defaultIfBlank(notesBuilder.toString().trim(), null);
-        return new SimpleLicense(family, matcher[0], derivedFrom, notes);
+        builder.setDerivedFrom(StringUtils.defaultIfBlank(attributes.get(AttributeName.derived_from), null));
+        builder.setNotes(StringUtils.defaultIfBlank(notesBuilder.toString().trim(), null));
+        return builder.build();
     }
 
     @Override
@@ -340,9 +339,18 @@ public SortedSet<String> approvedLicenseId() {
         }
         if (licenseFamilies.isEmpty()) {
             SortedSet<String> result = new TreeSet<>();
-            licenses.stream().map( x -> x.getLicenseFamily().getFamilyCategory()).forEach(result::add);
+            licenses.stream().map(x -> x.getLicenseFamily().getFamilyCategory()).forEach(result::add);
             return result;
         }
         return Collections.unmodifiableSortedSet(licenseFamilies);
     }
+
+    public abstract class DelegatingBuilder extends AbstractBuilder {
+        protected final AbstractBuilder delegate;
+
+        DelegatingBuilder(AbstractBuilder delegate) {
+            this.delegate = delegate;
+        }
+
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
new file mode 100644
index 000000000..8e2300127
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public abstract class AbstractBuilder implements IHeaderMatcher.Builder {
+
+    private String id;
+
+    protected AbstractBuilder() {
+    }
+
+    public final AbstractBuilder setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public final boolean hasId() {
+        return id != null;
+    }
+    
+    protected String getId() {
+        return id;
+    }
+
+    public abstract IHeaderMatcher build();
+
+}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java
new file mode 100644
index 000000000..f5161e3fb
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.AndMatcher;
+
+public class AllBuilder extends ChildContainerBuilder {
+
+    @Override
+    public IHeaderMatcher build() {
+        return new AndMatcher(getId(), getChildren());
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java
new file mode 100644
index 000000000..0a8a882cc
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.OrMatcher;
+
+public class AnyBuilder extends ChildContainerBuilder {
+
+    @Override
+    public IHeaderMatcher build() {
+        return new OrMatcher(getId(), getChildren());
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
new file mode 100644
index 000000000..8fae5b058
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public abstract class ChildContainerBuilder extends AbstractBuilder {
+
+    List<IHeaderMatcher.Builder> children = new ArrayList<IHeaderMatcher.Builder>();
+
+    protected ChildContainerBuilder() {
+    }
+
+    public AbstractBuilder add(IHeaderMatcher.Builder child) {
+        children.add(child);
+        return this;
+    }
+    
+    public AbstractBuilder add(Collection<IHeaderMatcher.Builder> children) {
+        this.children.addAll(children);
+        return this;
+    }
+
+    public List<IHeaderMatcher> getChildren() {
+        return children.stream().map(IHeaderMatcher.Builder::build).collect(Collectors.toList());
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
new file mode 100644
index 000000000..d1f309d91
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.CopyrightMatcher;
+
+public class CopyrightBuilder extends AbstractBuilder {
+    private String start;
+    private String end;
+    private String owner;
+
+    public CopyrightBuilder setStart(String start) {
+        this.start = start;
+        return this;
+    }
+
+    public CopyrightBuilder setEnd(String end) {
+        this.end = end;
+        return this;
+    }
+
+    public CopyrightBuilder setOwner(String owner) {
+        this.owner = owner;
+        return this;
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return new CopyrightMatcher(getId(), start, end, owner);
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java
new file mode 100644
index 000000000..6e8a76db2
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class DelegatingBuilder extends AbstractBuilder {
+    private AbstractBuilder delegate;
+
+    @Override
+    public IHeaderMatcher build() {
+        return delegate.build();
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
new file mode 100644
index 000000000..3bdfacd57
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import java.util.Map;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class MatcherRefBuilder extends AbstractBuilder {
+    private String referenceId;
+    private Map<String, IHeaderMatcher> matchers;
+
+    public MatcherRefBuilder setRefId(String refId) {
+        this.referenceId = refId;
+        return this;
+    }
+
+    public MatcherRefBuilder setMatchers(Map<String, IHeaderMatcher> matchers) {
+        this.matchers = matchers;
+        return this;
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        IHeaderMatcher result = matchers.get(referenceId);
+        return result != null ? result : new IHeaderMatcherProxy(referenceId, matchers);
+    }
+
+    private class IHeaderMatcherProxy implements IHeaderMatcher {
+        private final String proxyId;
+        private IHeaderMatcher wrapped;
+        private Map<String, IHeaderMatcher> matchers;
+
+        private IHeaderMatcherProxy(String proxyId, Map<String, IHeaderMatcher> matchers) {
+            this.proxyId = proxyId;
+            this.matchers = matchers;
+        }
+
+        private void checkProxy() {
+            if (wrapped == null) {
+                wrapped = matchers.get(proxyId);
+                if (wrapped == null) {
+                    throw new IllegalStateException(String.format("%s is not a valid matcher id", proxyId));
+                }
+                matchers = null;
+            }
+        }
+
+        @Override
+        public String getId() {
+            checkProxy();
+            return wrapped.getId();
+        }
+
+        @Override
+        public void reset() {
+            checkProxy();
+            wrapped.reset();
+        }
+
+        @Override
+        public boolean matches(String line) {
+            checkProxy();
+            return wrapped.matches(line);
+        }
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
new file mode 100644
index 000000000..df10f54fe
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.rat.ConfigurationException;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.NotMatcher;
+
+public class NotBuilder extends AbstractBuilder {
+
+    IHeaderMatcher.Builder child;
+
+    public AbstractBuilder setChild(IHeaderMatcher.Builder child) {
+        this.child = child;
+        return this;
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        if (child == null) {
+            throw new ConfigurationException("NotBuilder child must be set");
+        }
+        return new NotMatcher(getId(), child.build());
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
new file mode 100644
index 000000000..9defc907c
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import java.util.regex.Pattern;
+
+import org.apache.rat.ConfigurationException;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.SimpleRegexMatcher;
+
+public class RegexBuilder extends AbstractBuilder {
+
+    private Pattern exp;
+
+    public RegexBuilder setExpression(String exp) {
+        if (null == exp) {
+            throw new ConfigurationException("'regex' type matcher expression value may not be null");
+        }
+        this.exp = Pattern.compile(exp);
+        return this;
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        if (null == exp) {
+            throw new ConfigurationException("'regex' type matcher requires an expression");
+        }
+        return new SimpleRegexMatcher(exp);
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
new file mode 100644
index 000000000..d4fdb4ef0
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
+
+public class SpdxBuilder extends AbstractBuilder {
+
+    private String name;
+
+    public SpdxBuilder setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return SPDXMatcherFactory.INSTANCE.create(name);
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
new file mode 100644
index 000000000..e1f5ee99d
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.configuration.builders;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.FullTextMatcher;
+import org.apache.rat.analysis.matchers.SimpleTextMatcher;
+
+public class TextBuilder extends AbstractBuilder {
+
+    private String text;
+
+    public TextBuilder setText(String text) {
+        this.text = text;
+        return this;
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        if (StringUtils.isBlank(text)) {
+            throw new ConfigurationException("text value is required");
+        }
+        boolean complex = text.contains(" ") | text.contains("\\t") | text.contains("\\n") | text.contains("\\r")
+                | text.contains("\\f") | text.contains("\\v");
+
+        return complex ? new FullTextMatcher(getId(), text) : new SimpleTextMatcher(getId(), text);
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 3af7477ef..11828aedf 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -25,64 +25,137 @@
 
 public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
     ILicenseFamily getLicenseFamily();
+
     String getNotes();
+
     String derivedFrom();
-    
+
+    public static ILicense.Builder builder() {
+        return new BuilderImpl();
+    }
+
     /**
      * Search a set
+     * 
      * @param licenseId
      * @param licenses
      * @return
      */
     static ILicense search(String licenseId, SortedSet<ILicense> licenses) {
-        ILicenseFamily searchFamily = new SimpleLicenseFamily(licenseId, "searching proxy");
+        ILicenseFamily searchFamily = ILicenseFamily.builder().setLicenseFamilyCategory(licenseId)
+                .setLicenseFamilyCategory("searching proxy").build();
         ILicense target = new ILicense() {
-    
+
             @Override
             public String getId() {
                 return licenseId;
             }
-    
+
             @Override
             public void reset() {
                 // do nothing
             }
-    
+
             @Override
             public boolean matches(String line) {
                 return false;
             }
-    
+
             @Override
             public int compareTo(ILicense arg0) {
                 return searchFamily.compareTo(arg0.getLicenseFamily());
             }
-    
+
             @Override
             public ILicenseFamily getLicenseFamily() {
                 return searchFamily;
             }
-    
+
             @Override
             public String getNotes() {
                 return null;
             }
-    
+
             @Override
             public String derivedFrom() {
                 return null;
             }
-            
+
         };
-        return search(target,licenses);
+        return search(target, licenses);
     }
-    
+
     static ILicense search(ILicense target, SortedSet<ILicense> licenses) {
         SortedSet<ILicense> part = licenses.tailSet(target);
         return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
-    
+
     static Comparator<ILicense> getComparator() {
-        return (x,y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily());
+        return (x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily());
+    }
+
+    interface Builder {
+        ILicense build();
+        
+        Builder setMatcher(IHeaderMatcher.Builder matcher);
+
+        Builder setNotes(String notes);
+
+        Builder setDerivedFrom(String derivedFrom);
+
+        Builder setLicenseFamilyCategory(String licenseFamilyCategory);
+
+        Builder setLicenseFamilyName(String licenseFamilyName);
+    }
+    
+    static class BuilderImpl implements Builder {
+
+        private IHeaderMatcher.Builder matcher;
+
+        private String notes;
+
+        private String derivedFrom;
+
+        private final ILicenseFamily.Builder licenseFamily;
+
+        public BuilderImpl() {
+            licenseFamily = ILicenseFamily.builder();
+        }
+
+        @Override
+        public Builder setMatcher(IHeaderMatcher.Builder matcher) {
+            this.matcher = matcher;
+            return this;
+        }
+
+        @Override
+        public Builder setNotes(String notes) {
+            this.notes = notes;
+            return this;
+        }
+
+        @Override
+        public Builder setDerivedFrom(String derivedFrom) {
+            this.derivedFrom = derivedFrom;
+            return this;
+        }
+
+        @Override
+        public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
+            this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
+            return this;
+        }
+
+        @Override
+        public Builder setLicenseFamilyName(String licenseFamilyName) {
+            this.licenseFamily.setLicenseFamilyName(licenseFamilyName);
+            return this;
+        }
+
+        @Override
+        public ILicense build() {
+            return new SimpleLicense(licenseFamily.build(), matcher.build(), derivedFrom, notes);
+        }
     }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index 73e4c84ab..9f69c2bd9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -15,27 +15,32 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.license;
 
 import java.util.SortedSet;
 
-import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
 
 public interface ILicenseFamily extends Comparable<ILicenseFamily> {
     String getFamilyName();
-    
+
     String getFamilyCategory();
 
+    static ILicenseFamily.Builder builder() {
+        return new Builder();
+    }
+
     static String makeCategory(String cat) {
         return cat == null ? "     " : cat.concat("     ").substring(0, 5);
     }
-    
+
     @Override
     default int compareTo(ILicenseFamily other) {
         return getFamilyCategory().compareTo(other.getFamilyCategory());
     }
-    
+
 //    does not work -- revisit if needed
 //    static ILicenseFamily search(String licenseCategory, SortedSet<ILicenseFamily> licenses) {
 //        ILicenseFamily target = new ILicenseFamily() {
@@ -51,9 +56,35 @@ default int compareTo(ILicenseFamily other) {
 //        };
 //        return search(target, licenses);
 //    }
-    
+
     static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenses) {
         SortedSet<ILicenseFamily> part = licenses.tailSet(target);
         return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
+
+    public static class Builder {
+
+        private String licenseFamilyCategory;
+        private String licenseFamilyName;
+
+        public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
+            this.licenseFamilyCategory = licenseFamilyCategory;
+            return this;
+        }
+
+        public Builder setLicenseFamilyName(String licenseFamilyName) {
+            this.licenseFamilyName = licenseFamilyName;
+            return this;
+        }
+
+        public ILicenseFamily build() {
+            if (StringUtils.isBlank(licenseFamilyCategory)) {
+                throw new ConfigurationException("LicenseFamily Category must be specified");
+            }
+            if (StringUtils.isBlank(licenseFamilyName)) {
+                throw new ConfigurationException("LicenseFamily Name must be specified");
+            }
+            return new SimpleLicenseFamily(licenseFamilyCategory, licenseFamilyName);
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index 5d20cbbd6..7016568d2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -20,7 +20,7 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
-public class SimpleLicense implements ILicense {
+class SimpleLicense implements ILicense {
 
     private ILicenseFamily family;
     private IHeaderMatcher matcher;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
index bde1a1e67..0a6300c63 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
@@ -15,42 +15,35 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.license;
 
 /**
  * Trivial bean implementing ILicenseFamily
+ * 
  * @since Rat 0.8
  */
-public class SimpleLicenseFamily implements ILicenseFamily {
+class SimpleLicenseFamily implements ILicenseFamily {
     private String familyName;
     private String familyCategory;
 
     public SimpleLicenseFamily(String familyId, String familyName) {
-        setFamilyCategory(familyId);
-        setFamilyName(familyName);
-    }
-
-    public SimpleLicenseFamily() {
+        this.familyCategory = ILicenseFamily.makeCategory(familyId);
+        this.familyName = familyName;
     }
 
+    @Override
     public String toString() {
-        return String.format("%s %s",  getFamilyCategory(), getFamilyName());
-    }
-    public final void setFamilyName(String familyName) {
-        this.familyName = familyName;
+        return String.format("%s %s", getFamilyCategory(), getFamilyName());
     }
 
+    @Override
     public final String getFamilyName() {
         return familyName;
     }
 
+    @Override
     public String getFamilyCategory() {
         return familyCategory;
     }
-
-    public void setFamilyCategory(String familyId) {
-        this.familyCategory = ILicenseFamily.makeCategory(familyId);
-    }
 }
-
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 9141c5881..f8217ebe1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -18,8 +18,6 @@
  */
 package org.apache.rat.policy;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.SortedSet;
@@ -29,22 +27,10 @@
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
 
 public class DefaultPolicy implements IDocumentAnalyser {
     private SortedSet<ILicenseFamily> approvedLicenseNames;
 
-    /**
-     * Creates a policy that matches the default licenses. Mainly used for testing
-     * purposes.
-     */
-//    DefaultPolicy() {
-//        this(new ArrayList<ILicenseFamily>(0));
-//    }
-
-//    public DefaultPolicy(final ILicenseFamily[] approvedLicenses) {
-//        this(Arrays.asList(approvedLicenses));
-//    }
 
     public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseNames) {
         this.approvedLicenseNames = new TreeSet<>();
@@ -58,9 +44,9 @@ public void add(ILicenseFamily approvedLicense) {
     @Override
     public void analyse(final Document document) {
         if (document != null) {
-            final ILicenseFamily licenseFamily = new SimpleLicenseFamily(
-                    document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY),
-                    document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
+            final ILicenseFamily licenseFamily = ILicenseFamily.builder()
+                    .setLicenseFamilyCategory(document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY))
+                    .setLicenseFamilyName(document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME)).build();
 
             reportLicenseApprovalClaim(document, approvedLicenseNames.contains(licenseFamily));
         }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index 51fea6a6a..fa0be2304 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -36,7 +36,6 @@
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -81,7 +80,9 @@ public void setup() {
     }
 
     protected static ILicense extractCategory(String category) {
-        ILicenseFamily testingFamily = new SimpleLicenseFamily(category, "Testing category");
+        ILicenseFamily testingFamily = ILicenseFamily.builder()
+                .setLicenseFamilyCategory(category)
+                .setLicenseFamilyName("Testing category").build();
         List<ILicense> matchers = new ArrayList<>();
         DEFAULTS.getLicenses().stream().filter(x -> x.getLicenseFamily().compareTo(testingFamily) == 0)
                 .forEach(matchers::add);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 9fa4822a3..f9d7e349b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -31,7 +31,6 @@
 import org.apache.rat.document.MockLocation;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -60,6 +59,10 @@ private void setMetadata(ILicenseFamily family) {
         subject.getMetaData().add(new Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, family.getFamilyCategory()));
     }
 
+    private ILicenseFamily makeFamily(String category, String name) {
+        return ILicenseFamily.builder().setLicenseFamilyCategory(category)
+                .setLicenseFamilyName(name).build();
+    }
     @Test
     public void testCount() {
         assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
@@ -67,56 +70,56 @@ public void testCount() {
 
     @Test
     public void testALFamily() throws Exception {
-        setMetadata(new SimpleLicenseFamily("AL", "Apache License Version 2.0"));
+        setMetadata(makeFamily("AL", "Apache License Version 2.0"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testOASISFamily() throws Exception {
-        setMetadata(new SimpleLicenseFamily("OASIS", "OASIS Open License"));
+        setMetadata(makeFamily("OASIS", "OASIS Open License"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testW3CFamily() throws Exception {
-        setMetadata(new SimpleLicenseFamily("W3C", "W3C Software Copyright"));
+        setMetadata(makeFamily("W3C", "W3C Software Copyright"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testW3CDocFamily() throws Exception {
-        setMetadata(new SimpleLicenseFamily("W3CD", "W3C Document Copyright"));
+        setMetadata(makeFamily("W3CD", "W3C Document Copyright"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testModifiedBSDFamily() throws Exception {
-        setMetadata(new SimpleLicenseFamily("TMF", "The Telemanagement Forum License"));
+        setMetadata(makeFamily("TMF", "The Telemanagement Forum License"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testMITFamily() throws Exception {
-        setMetadata(new SimpleLicenseFamily("MIT", "The MIT License"));
+        setMetadata(makeFamily("MIT", "The MIT License"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testCDDL1Family() throws Exception {
-        setMetadata(new SimpleLicenseFamily("CDDL1", "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"));
+        setMetadata(makeFamily("CDDL1", "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"));
         policy.analyse(subject);
         assertApproval(true);
     }
 
     @Test
     public void testUnknownFamily() throws Exception {
-        setMetadata(new SimpleLicenseFamily("?????", "Unknown document"));
+        setMetadata(makeFamily("?????", "Unknown document"));
         policy.analyse(subject);
         assertApproval(false);
     }
@@ -133,7 +136,7 @@ public void testUnknownFamily() throws Exception {
 
     @Test
     public void testAddNewApprovedLicenseAndDefaults() {
-        ILicenseFamily testingFamily = new SimpleLicenseFamily("test", "Testing License Family");
+        ILicenseFamily testingFamily = makeFamily("test", "Testing License Family");
         setMetadata(testingFamily);
         policy.analyse(subject);
         assertApproval(false);
@@ -149,7 +152,7 @@ public void testAddNewApprovedLicenseAndDefaults() {
     public void testAddNewApprovedLicenseNoDefaults() {
         policy = new DefaultPolicy(Collections.emptySet());
         assertEquals(0, policy.getApprovedLicenseNames().size());
-        ILicenseFamily testingFamily = new SimpleLicenseFamily("test", "Testing License Family");
+        ILicenseFamily testingFamily = makeFamily("test", "Testing License Family");
         setMetadata(testingFamily);
         policy.analyse(subject);
         assertApproval(false);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 2a3aaf449..d7835ca8c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -34,7 +34,7 @@
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
-import org.apache.rat.license.SimpleLicenseFamily;
+import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.report.xml.writer.IXmlWriter;
@@ -47,6 +47,8 @@
 public class XmlReportFactoryTest {
 
     private static final Pattern IGNORE_EMPTY = Pattern.compile(".svn|Empty.txt");
+    private ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("TEST")
+            .setLicenseFamilyName("Testing family").build();
 
     private StringWriter out;
     private IXmlWriter writer;
@@ -66,9 +68,11 @@ private void report(DirectoryWalker directory, RatReport report) throws Exceptio
     public void standardReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
 
+        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("TEST")
+                .setLicenseFamilyName("Testing family").build();
         final ILicense mockLicense = mock(ILicense.class);
         when(mockLicense.matches(any())).thenReturn(true);
-        when(mockLicense.getLicenseFamily()).thenReturn(new SimpleLicenseFamily("TEST", "Testing family"));
+        when(mockLicense.getLicenseFamily()).thenReturn(family);
 
         DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY);
         final ClaimStatistic statistic = new ClaimStatistic();
@@ -97,9 +101,10 @@ public void standardReport() throws Exception {
 
     @Test
     public void testNoLicense() throws Exception {
+
         final ILicense mockLicense = mock(ILicense.class);
         when(mockLicense.matches(any())).thenReturn(true);
-        when(mockLicense.getLicenseFamily()).thenReturn(new SimpleLicenseFamily("TEST", "Testing family"));
+        when(mockLicense.getLicenseFamily()).thenReturn(family);
 
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 3fce97209..74a668197 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -101,7 +101,7 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     private String approvedLicenseFile;
 
     @Parameter
-    private ILicense[] licenses;
+    private License[] licenses;
 
     /**
      * Specifies files, which are included in the report. By default, all files are
@@ -262,15 +262,16 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
             if (log.isDebugEnabled()) {
                 log.debug(String.format("%s licenses loaded from pom", licenses.length));
             }
-            Consumer<ILicense> logger = log.isDebugEnabled() ? (l) -> log.debug(String.format("License: %s", l)) :
-                (l) -> {} ;
+            Consumer<ILicense> logger = log.isDebugEnabled() ? (l) -> log.debug(String.format("License: %s", l))
+                    : (l) -> {
+                    };
             Consumer<ILicense> addApproved = (approvedLicenses == null || approvedLicenses.length == 0)
                     ? (l) -> result.addApprovedLicenseName(l.getLicenseFamily())
                     : (l) -> {
                     };
 
             Consumer<ILicense> process = logger.andThen(result::addLicense).andThen(addApproved);
-            Arrays.stream(licenses).forEach(process);
+            Arrays.stream(licenses).map(License::build).forEach(process);
         }
 
         if (approvedLicenses != null && approvedLicenses.length > 0) {
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
index 54d1ec4b7..63de157b5 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
@@ -18,27 +18,24 @@
  */
 package org.apache.rat.mp;
 
-import java.util.List;
-
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.AndMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
+import org.apache.rat.configuration.builders.AllBuilder;
 
-public class All implements EnclosingMatcher.Holder {
+public class All extends EnclosingMatcher implements IHeaderMatcher.Builder {
 
-    AndMatcher andMatcher;
+    AllBuilder builder = Builder.all();
 
     public All() {
     }
 
-    @Parameter(required = true)
-    public void setMatchers(List<Matcher> matchers) {
-        andMatcher = new AndMatcher(matchers);
+    @Override
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.add(builder);
     }
 
     @Override
-    public IHeaderMatcher getMatcher() {
-        return andMatcher;
+    public IHeaderMatcher build() {
+        return builder.build();
     }
-
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
index cd4fe7b23..3a4daadc7 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
@@ -18,31 +18,24 @@
  */
 package org.apache.rat.mp;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
+import org.apache.rat.configuration.builders.AnyBuilder;
 
-public class Any extends EnclosingMatcher implements EnclosingMatcher.Holder {
+public class Any extends EnclosingMatcher implements IHeaderMatcher.Builder {
 
-    OrMatcher orMatcher;
-    List<IHeaderMatcher> matchers = new ArrayList<>();
+    AnyBuilder builder = Builder.any();
 
     public Any() {
     }
 
     @Override
-    public IHeaderMatcher getMatcher() {
-        if (orMatcher == null) {
-            orMatcher = new OrMatcher(matchers);
-        }
-        return orMatcher;
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.add(builder);
     }
 
     @Override
-    protected void setHolder(Holder holder) {
-        matchers.add(holder.getMatcher());
+    public IHeaderMatcher build() {
+        return builder.build();
     }
-
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
index ee7a23b65..da78e5949 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
@@ -19,11 +19,10 @@
 package org.apache.rat.mp;
 
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.rat.analysis.matchers.CopyrightMatcher;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.configuration.builders.CopyrightBuilder;
 
-public class Copyright implements EnclosingMatcher.Holder {
-
-    CopyrightMatcher copyrightMatcher;
+public class Copyright extends CopyrightBuilder {
 
     @Parameter(required = false)
     private String start;
@@ -38,10 +37,7 @@ public Copyright() {
     }
 
     @Override
-    public CopyrightMatcher getMatcher() {
-        if (copyrightMatcher == null) {
-            copyrightMatcher = new CopyrightMatcher(start, stop, owner);
-        }
-        return copyrightMatcher;
+    public IHeaderMatcher build() {
+        return setStart(start).setEnd(stop).setOwner(owner).build();
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
index c2fd2a7f7..978abe7fb 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
@@ -23,39 +23,35 @@
 
 abstract class EnclosingMatcher {
 
-    static interface Holder {
-        IHeaderMatcher getMatcher();
-    }
-
-    protected abstract void setHolder(Holder holder);
+    protected abstract void setBuilder(IHeaderMatcher.Builder builder);
 
     @Parameter(required = false)
-    public void setAnd(All and) {
-        setHolder(and);
+    public void setAnd(All all) {
+        setBuilder(all);
     }
 
     @Parameter(required = false)
-    public void setOr(Any or) {
-        setHolder(or);
+    public void setOr(Any any) {
+        setBuilder(any);
     }
 
     @Parameter(required = false)
     public void setText(Text text) {
-        setHolder(text);
+        setBuilder(text);
     }
 
     @Parameter(required = false)
     public void setCopyright(Copyright copyright) {
-        setHolder(copyright);
+        setBuilder(copyright);
     }
 
     @Parameter(required = false)
     public void setRegex(Regex regex) {
-        setHolder(regex);
+        setBuilder(regex);
     }
 
     @Parameter(required = false)
     public void setSpdx(Spdx spdx) {
-        setHolder(spdx);
+        setBuilder(spdx);
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
index ae8908acf..fc89c95a2 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
@@ -21,13 +21,10 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.license.SimpleLicenseFamily;
 
-public class License extends EnclosingMatcher implements ILicense {
-    private ILicenseFamily family;
+public class License extends EnclosingMatcher {
 
-    private IHeaderMatcher matcher;
+    private ILicense.Builder builder = ILicense.builder();
 
     @Parameter(required = false)
     private String notes;
@@ -46,54 +43,17 @@ public License() {
 
     @Parameter(required = false)
     public void setNot(Not not) {
-        setHolder(not);
+        setBuilder(not);
     }
 
     @Override
-    public ILicenseFamily getLicenseFamily() {
-        if (family == null) {
-            family = new SimpleLicenseFamily(licenseFamilyCategory, licenseFamilyName);
-        }
-        return family;
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.setMatcher(builder);
     }
 
-    @Override
-    public int compareTo(ILicense arg0) {
-        return ILicense.getComparator().compare(this, arg0);
-    }
-
-    @Override
-    public String getNotes() {
-        return notes;
-    }
-
-    @Override
-    public boolean matches(String line) {
-        return matcher.matches(line);
-    }
-
-    @Override
-    public String derivedFrom() {
-        return derivedFrom;
+    public ILicense build() {
+        return builder.setDerivedFrom(derivedFrom).setLicenseFamilyCategory(licenseFamilyCategory)
+                .setLicenseFamilyCategory(licenseFamilyName).setNotes(notes).build();
     }
 
-    @Override
-    public String getId() {
-        return matcher.getId();
-    }
-
-    @Override
-    public void reset() {
-        matcher.reset();
-    }
-
-    @Override
-    protected void setHolder(Holder holder) {
-        this.matcher = holder.getMatcher();
-    }
-    
-    @Override
-    public String toString() {
-        return getLicenseFamily().toString();
-    }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java
deleted file mode 100644
index 87d6be90c..000000000
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Matcher.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.mp;
-
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.rat.analysis.IHeaderMatcher;
-
-public class Matcher extends EnclosingMatcher implements IHeaderMatcher {
-    
-    IHeaderMatcher matcher;
-    
-    public Matcher() {
-        super();
-    }
-
-    @Parameter(required = false)
-    public void setNot(Not not) {
-        setHolder(not);
-    }
-
-    @Override
-    public String getId() {
-        return matcher.getId();
-    }
-
-    @Override
-    public void reset() {
-        matcher.reset();
-    }
-
-    @Override
-    public boolean matches(String line) {
-        return matcher.matches(line);
-    }
-
-    @Override
-    protected void setHolder(Holder holder) {
-        matcher = holder.getMatcher();
-    }
-}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
index 0ed15961b..49d58876d 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
@@ -18,22 +18,24 @@
  */
 package org.apache.rat.mp;
 
-import org.apache.rat.analysis.matchers.NotMatcher;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
+import org.apache.rat.configuration.builders.NotBuilder;
 
-public class Not extends EnclosingMatcher implements EnclosingMatcher.Holder {
+public class Not extends EnclosingMatcher implements IHeaderMatcher.Builder {
 
-    NotMatcher notMatcher;
+    NotBuilder builder = Builder.not();
 
     public Not() {
     }
 
     @Override
-    public NotMatcher getMatcher() {
-        return notMatcher;
+    protected void setBuilder(IHeaderMatcher.Builder builder) {
+        this.builder.setChild(builder);
     }
 
     @Override
-    protected void setHolder(Holder holder) {
-        notMatcher =new NotMatcher(holder.getMatcher());
+    public IHeaderMatcher build() {
+        return builder.build();
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
index 07c0bb762..dffb321e6 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
@@ -18,24 +18,7 @@
  */
 package org.apache.rat.mp;
 
-import java.util.regex.Pattern;
+import org.apache.rat.configuration.builders.RegexBuilder;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.SimpleRegexMatcher;
-
-public class Regex implements EnclosingMatcher.Holder {
-
-    private SimpleRegexMatcher regexMatcher;
-
-    public Regex() {
-    }
-
-    public void set(String pattern) {
-        regexMatcher = new SimpleRegexMatcher(Pattern.compile(pattern));
-    }
-
-    @Override
-    public IHeaderMatcher getMatcher() {
-        return regexMatcher;
-    }
+public class Regex extends RegexBuilder {
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
index 3647e7e1f..5916425be 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
@@ -18,27 +18,7 @@
  */
 package org.apache.rat.mp;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
+import org.apache.rat.configuration.builders.SpdxBuilder;
 
-public class Spdx implements EnclosingMatcher.Holder {
-
-    IHeaderMatcher spdxMatcher;
-
-    private String spdxId;
-
-    public Spdx() {
-    }
-
-    public void set(String spdxId) {
-        this.spdxId = spdxId;
-    }
-
-    @Override
-    public IHeaderMatcher getMatcher() {
-        if (spdxMatcher == null) {
-            spdxMatcher = SPDXMatcherFactory.INSTANCE.create(spdxId);
-        }
-        return spdxMatcher;
-    }
+public class Spdx extends SpdxBuilder {
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
index db8053222..dee10c45f 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
@@ -18,27 +18,7 @@
  */
 package org.apache.rat.mp;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.configuration.XMLConfigurationReader;
+import org.apache.rat.configuration.builders.TextBuilder;
 
-public class Text implements EnclosingMatcher.Holder {
-
-    IHeaderMatcher textMatcher;
-
-    private String pattern;
-
-    public Text() {
-    }
-
-    public void set(String pattern) {
-        this.pattern = pattern;
-    }
-
-    @Override
-    public IHeaderMatcher getMatcher() {
-        if (textMatcher == null) {
-            textMatcher = XMLConfigurationReader.createTextMatcher(null, pattern);
-        }
-        return textMatcher;
-    }
+public class Text extends TextBuilder {
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index cc76c8454..08b0a04f2 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -19,7 +19,6 @@
 package org.apache.rat.anttasks;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
@@ -27,9 +26,7 @@
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.rat.ConfigurationException;
@@ -97,16 +94,16 @@ public void add(ResourceCollection rc) {
     public void setInputFileFilter(FilenameFilter inputFileFilter) {
         configuration.setInputFileFilter(inputFileFilter);
     }
-    
+
     public void setReportFile(File reportFile) {
-        System.err.println( reportFile );
+        System.err.println(reportFile);
         try {
-            configuration.setOut( new FileOutputStream(reportFile));
+            configuration.setOut(new FileOutputStream(reportFile));
         } catch (FileNotFoundException e) {
             throw new BuildException("Can not open report file", e);
         }
     }
-    
+
     public void addLicense(License lic) {
         licenses.add(lic);
     }
@@ -120,7 +117,7 @@ public void addLicense(License lic) {
     public void addStylesheet(Resource styleSheet) {
         addStyleSheet(styleSheet);
     }
-    
+
     public void addStyleSheet(Resource styleSheet) {
         try {
             configuration.setStyleSheet(styleSheet.getInputStream());
@@ -133,7 +130,7 @@ public void addStyleSheet(Resource styleSheet) {
     public void setStyleReport(boolean styleReport) {
         configuration.setStyleReport(styleReport);
     }
-    
+
     /**
      * 
      * @param style
@@ -142,7 +139,7 @@ public void setStyleReport(boolean styleReport) {
     @Deprecated
     public void setFormat(String style) {
         setStyleReport("styled".equalsIgnoreCase(style));
-        
+
     }
 
     public void setLicenses(File fileName) {
@@ -156,24 +153,24 @@ public void setLicenses(File fileName) {
         }
     }
 
-
     /**
-     * @param useDefaultLicenses Whether to add the default list of license matchers.
+     * @param useDefaultLicenses Whether to add the default list of license
+     * matchers.
      */
     public void setUseDefaultLicenses(boolean useDefaultLicenses) {
         if (!useDefaultLicenses) {
             defaultsBuilder.noDefault();
         }
     }
-    
+
     public void setApprovalFilter(ApprovalFilter filter) {
         configuration.setLicenseFilter(filter.internalFilter());
     }
-    
+
     public void setAddApprovedLicense(String familyCategory) {
         configuration.addApprovedLicenseName(familyCategory);
     }
-    
+
     public void setRemoveApprovedLicense(String familyCategory) {
         configuration.removeApprovedLicenseName(familyCategory);
     }
@@ -202,7 +199,10 @@ public void execute() {
         Defaults defaults = defaultsBuilder.build();
         configuration.setFrom(defaults);
         configuration.setReportable(new ResourceCollectionContainer(nestedResources));
-        licenses.stream().map(License::build).forEach(configuration::addLicense);
+        licenses.stream().map(License::build).forEach((l) -> {
+            configuration.addLicense(l);
+            configuration.addApprovedLicenseName(l.getLicenseFamily());
+        });
         try {
             validate();
             Reporter.report(configuration);
@@ -249,7 +249,7 @@ public AddLicenseHeaders(String s) {
         public String[] getValues() {
             return new String[] { TRUE, FALSE, FORCED };
         }
-        
+
         public org.apache.rat.config.AddLicenseHeaders getNative() {
             return org.apache.rat.config.AddLicenseHeaders.valueOf(getValue().toUpperCase());
         }
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index c00022234..db4369220 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -97,9 +97,10 @@ public void testNoResources() throws Exception {
     @Test
     public void testCopyrightBuild() throws Exception {
         try {
+            String fileName = new File(getAntFile().getParent(), "index.apt").getPath().replace('\\', '/');
             buildRule.executeTarget("testCopyrightBuild");
-
-            assertLogDoesNotMatch("AL +\\Q" + getAntFileName() + "\\E");
+            assertLogMatches("YASL1 +\\Q" + fileName + "\\E");
+            assertLogDoesNotMatch("AL +\\Q" + fileName + "\\E");
         } catch (BuildException e) {
             final String expect = "You must specify at least one file";
             assertTrue("Expected " + expect + ", got " + e.getMessage(), e.getMessage().contains(expect));

From abe21a9de1f49aa5842bfe489a928e6988fb44dd Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 24 Sep 2023 21:41:28 +0200
Subject: [PATCH 094/299] Cleaned up license builders

---
 .../java/org/apache/rat/license/ILicense.java | 52 +------------------
 .../apache/rat/license/ILicenseBuilder.java   | 50 ++++++++++++++++++
 .../apache/rat/license/ILicenseFamily.java    | 31 ++---------
 .../rat/license/ILicenseFamilyBuilder.java    | 34 ++++++++++++
 4 files changed, 90 insertions(+), 77 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 11828aedf..2d3b3495e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -31,7 +31,7 @@ public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
     String derivedFrom();
 
     public static ILicense.Builder builder() {
-        return new BuilderImpl();
+        return new ILicenseBuilder();
     }
 
     /**
@@ -107,55 +107,5 @@ interface Builder {
 
         Builder setLicenseFamilyName(String licenseFamilyName);
     }
-    
-    static class BuilderImpl implements Builder {
-
-        private IHeaderMatcher.Builder matcher;
-
-        private String notes;
-
-        private String derivedFrom;
-
-        private final ILicenseFamily.Builder licenseFamily;
-
-        public BuilderImpl() {
-            licenseFamily = ILicenseFamily.builder();
-        }
-
-        @Override
-        public Builder setMatcher(IHeaderMatcher.Builder matcher) {
-            this.matcher = matcher;
-            return this;
-        }
-
-        @Override
-        public Builder setNotes(String notes) {
-            this.notes = notes;
-            return this;
-        }
-
-        @Override
-        public Builder setDerivedFrom(String derivedFrom) {
-            this.derivedFrom = derivedFrom;
-            return this;
-        }
-
-        @Override
-        public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
-            this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
-            return this;
-        }
-
-        @Override
-        public Builder setLicenseFamilyName(String licenseFamilyName) {
-            this.licenseFamily.setLicenseFamilyName(licenseFamilyName);
-            return this;
-        }
-
-        @Override
-        public ILicense build() {
-            return new SimpleLicense(licenseFamily.build(), matcher.build(), derivedFrom, notes);
-        }
-    }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
new file mode 100644
index 000000000..bdf9a8d3f
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
@@ -0,0 +1,50 @@
+package org.apache.rat.license;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.license.ILicense.Builder;
+
+class ILicenseBuilder implements Builder {
+
+    private IHeaderMatcher.Builder matcher;
+
+    private String notes;
+
+    private String derivedFrom;
+
+    private final ILicenseFamily.Builder licenseFamily = ILicenseFamily.builder();
+
+    @Override
+    public Builder setMatcher(IHeaderMatcher.Builder matcher) {
+        this.matcher = matcher;
+        return this;
+    }
+
+    @Override
+    public Builder setNotes(String notes) {
+        this.notes = notes;
+        return this;
+    }
+
+    @Override
+    public Builder setDerivedFrom(String derivedFrom) {
+        this.derivedFrom = derivedFrom;
+        return this;
+    }
+
+    @Override
+    public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
+        this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
+        return this;
+    }
+
+    @Override
+    public Builder setLicenseFamilyName(String licenseFamilyName) {
+        this.licenseFamily.setLicenseFamilyName(licenseFamilyName);
+        return this;
+    }
+
+    @Override
+    public ILicense build() {
+        return new SimpleLicense(licenseFamily.build(), matcher.build(), derivedFrom, notes);
+    }
+}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index 9f69c2bd9..cdef95b76 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -20,16 +20,13 @@
 
 import java.util.SortedSet;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.rat.ConfigurationException;
-
 public interface ILicenseFamily extends Comparable<ILicenseFamily> {
     String getFamilyName();
 
     String getFamilyCategory();
 
     static ILicenseFamily.Builder builder() {
-        return new Builder();
+        return new ILicenseFamilyBuilder();
     }
 
     static String makeCategory(String cat) {
@@ -62,29 +59,11 @@ static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> li
         return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
 
-    public static class Builder {
-
-        private String licenseFamilyCategory;
-        private String licenseFamilyName;
-
-        public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
-            this.licenseFamilyCategory = licenseFamilyCategory;
-            return this;
-        }
+    interface Builder {
+        public Builder setLicenseFamilyCategory(String licenseFamilyCategory);
 
-        public Builder setLicenseFamilyName(String licenseFamilyName) {
-            this.licenseFamilyName = licenseFamilyName;
-            return this;
-        }
+        public Builder setLicenseFamilyName(String licenseFamilyName);
 
-        public ILicenseFamily build() {
-            if (StringUtils.isBlank(licenseFamilyCategory)) {
-                throw new ConfigurationException("LicenseFamily Category must be specified");
-            }
-            if (StringUtils.isBlank(licenseFamilyName)) {
-                throw new ConfigurationException("LicenseFamily Name must be specified");
-            }
-            return new SimpleLicenseFamily(licenseFamilyCategory, licenseFamilyName);
-        }
+        public ILicenseFamily build();
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
new file mode 100644
index 000000000..dbe4f5726
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
@@ -0,0 +1,34 @@
+package org.apache.rat.license;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
+import org.apache.rat.license.ILicenseFamily.Builder;
+
+public class ILicenseFamilyBuilder implements Builder {
+
+    private String licenseFamilyCategory;
+    private String licenseFamilyName;
+
+    @Override
+    public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
+        this.licenseFamilyCategory = licenseFamilyCategory;
+        return this;
+    }
+
+    @Override
+    public Builder setLicenseFamilyName(String licenseFamilyName) {
+        this.licenseFamilyName = licenseFamilyName;
+        return this;
+    }
+
+    @Override
+    public ILicenseFamily build() {
+        if (StringUtils.isBlank(licenseFamilyCategory)) {
+            throw new ConfigurationException("LicenseFamily Category must be specified");
+        }
+        if (StringUtils.isBlank(licenseFamilyName)) {
+            throw new ConfigurationException("LicenseFamily Name must be specified");
+        }
+        return new SimpleLicenseFamily(licenseFamilyCategory, licenseFamilyName);
+    }
+}
\ No newline at end of file

From 75a63670300841190ab76e015fb5afa97703a67a Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 24 Sep 2023 21:43:04 +0200
Subject: [PATCH 095/299] Added license headers

---
 .../apache/rat/license/ILicenseBuilder.java    | 18 ++++++++++++++++++
 .../rat/license/ILicenseFamilyBuilder.java     | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
index bdf9a8d3f..3988dee3e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.license;
 
 import org.apache.rat.analysis.IHeaderMatcher;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
index dbe4f5726..41d2e15da 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.license;
 
 import org.apache.commons.lang3.StringUtils;

From b4c69b411e0ea7f0fbca7224b5f7146de7cfdcc9 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 24 Sep 2023 22:11:44 +0200
Subject: [PATCH 096/299] fixed policy issue with null ILicenseFamily
 categories

---
 .../src/main/java/org/apache/rat/Defaults.java   |  2 +-
 .../org/apache/rat/policy/DefaultPolicy.java     | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 2b6c10bcc..9517d73ed 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -199,7 +199,7 @@ public static class LicenseCollectionMatcher implements ILicense {
 
         public LicenseCollectionMatcher(Collection<ILicense> enclosed) {
             family = ILicenseFamily.builder()
-                    .setLicenseFamilyCategory("")
+                    .setLicenseFamilyCategory("testing")
                     .setLicenseFamilyName("System License Collection").build();
             this.enclosed = enclosed;
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index f8217ebe1..5989f060b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -31,7 +31,6 @@
 public class DefaultPolicy implements IDocumentAnalyser {
     private SortedSet<ILicenseFamily> approvedLicenseNames;
 
-
     public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseNames) {
         this.approvedLicenseNames = new TreeSet<>();
         this.approvedLicenseNames.addAll(approvedLicenseNames);
@@ -44,11 +43,16 @@ public void add(ILicenseFamily approvedLicense) {
     @Override
     public void analyse(final Document document) {
         if (document != null) {
-            final ILicenseFamily licenseFamily = ILicenseFamily.builder()
-                    .setLicenseFamilyCategory(document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY))
-                    .setLicenseFamilyName(document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME)).build();
-
-            reportLicenseApprovalClaim(document, approvedLicenseNames.contains(licenseFamily));
+            boolean approval = false;
+            if (document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY) != null) {
+                ILicenseFamily licenseFamily = ILicenseFamily.builder()
+                        .setLicenseFamilyCategory(
+                                document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY))
+                        .setLicenseFamilyName(document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME))
+                        .build();
+                approval = approvedLicenseNames.contains(licenseFamily);
+            }
+            reportLicenseApprovalClaim(document, approval);
         }
     }
 

From f204ab2efc0ca78c2a255afc09ffe6f117d069f8 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 25 Sep 2023 20:06:45 +0200
Subject: [PATCH 097/299] add configuration tests, update method names

---
 .../main/java/org/apache/rat/Defaults.java    |  58 ---
 .../src/main/java/org/apache/rat/Report.java  |  11 +-
 .../org/apache/rat/ReportConfiguration.java   | 105 ++----
 .../main/java/org/apache/rat/Reporter.java    |   2 +-
 .../rat/analysis/DefaultAnalyserFactory.java  |   6 +-
 .../rat/analysis/DocumentHeaderAnalyser.java  |   6 +-
 .../rat/analysis/HeaderCheckWorker.java       |   8 +-
 .../rat/analysis/LicenseCollection.java       |  74 ++++
 .../rat/report/xml/XmlReportFactory.java      |   5 +-
 .../apache/rat/ReportConfigurationTest.java   | 335 ++++++++++++++++++
 .../rat/analysis/AnalyserFactoryTest.java     |   3 +-
 .../org/apache/rat/document/MockDocument.java |   2 +-
 .../org/apache/rat/document/MockLocation.java |   4 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |   4 +-
 .../apache/rat/report/xml/XmlReportTest.java  |   3 +-
 .../apache/rat/ReportConfigurationTestFile    |  18 +
 .../org/apache/rat/mp/AbstractRatMojo.java    |   6 +-
 .../java/org/apache/rat/anttasks/Report.java  |  34 +-
 .../java/org/apache/rat/anttasks/Text.java    |   3 +
 .../antunit/report-bad-configurations.xml     |  43 +--
 .../antunit/report-normal-operation.xml       |  91 +++--
 21 files changed, 583 insertions(+), 238 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
 create mode 100644 apache-rat-core/src/test/resources/org/apache/rat/ReportConfigurationTestFile

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 9517d73ed..5d8bbcb93 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -38,10 +38,6 @@
  * Utility class that holds constants shared by the CLI tool and the Ant tasks.
  */
 public class Defaults {
-    public enum Filter {
-        all, approved, none
-    };
-
     private static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.xml");
     public static final String PLAIN_STYLESHEET = "org/apache/rat/plain-rat.xsl";
     public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
@@ -191,58 +187,4 @@ public Defaults build() {
             return result;
         }
     }
-
-    public static class LicenseCollectionMatcher implements ILicense {
-
-        private Collection<ILicense> enclosed;
-        private ILicenseFamily family;
-
-        public LicenseCollectionMatcher(Collection<ILicense> enclosed) {
-            family = ILicenseFamily.builder()
-                    .setLicenseFamilyCategory("testing")
-                    .setLicenseFamilyName("System License Collection").build();
-            this.enclosed = enclosed;
-        }
-
-        @Override
-        public String getId() {
-            return "Default License Collection";
-        }
-
-        @Override
-        public void reset() {
-            enclosed.stream().forEach(ILicense::reset);
-        }
-
-        @Override
-        public boolean matches(String line) {
-            for (ILicense license : enclosed) {
-                if (license.matches(line)) {
-                    this.family = license.getLicenseFamily();
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        @Override
-        public ILicenseFamily getLicenseFamily() {
-            return family;
-        }
-
-        @Override
-        public String getNotes() {
-            return null;
-        }
-
-        @Override
-        public String derivedFrom() {
-            return null;
-        }
-
-        @Override
-        public int compareTo(ILicense arg0) {
-            return ILicense.getComparator().compare(this, arg0);
-        }
-    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 442510448..3734a0208 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -46,6 +46,7 @@
 import org.apache.commons.io.filefilter.RegexFileFilter;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
@@ -163,11 +164,11 @@ public static final void main(String[] args) throws Exception {
                 }
 
                 if (cl.hasOption(NO_DEFAULTS)) {
-                    configuration.setLicenseFilter(Defaults.Filter.none);
+                    configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.none);
                 } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
-                    configuration.setLicenseFilter(Defaults.Filter.all);
+                    configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
                 } else {
-                    configuration.setLicenseFilter(Defaults.Filter.approved);
+                    configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.approved);
                 }
                 if (cl.hasOption(XML)) {
                     configuration.setStyleReport(false);
@@ -200,10 +201,10 @@ public static final void main(String[] args) throws Exception {
                 configuration.validate(s -> System.err.println(s));
                 
                 if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-                    listLicenseFamilies(configuration.getApprovedLicenses(), System.out);
+                    listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
                 }
                 if (cl.hasOption(LIST_LICENSES)) {
-                    listLicenses(configuration.getLicenses(), System.out);
+                    listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
                 }
                 
                 Reporter.report(configuration);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 06653dbff..c97b6c07f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -35,8 +35,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.rat.Defaults.Filter;
-import org.apache.rat.Defaults.LicenseCollectionMatcher;
+import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
@@ -49,10 +48,14 @@
  * the configuration and invoke the {@link Reporter}.
  */
 public class ReportConfiguration implements AutoCloseable {
+    public enum LicenseFilter {
+        all, approved, none
+    }
+
     private static final Log logger = LogFactory.getLog(ReportConfiguration.class);
     private SortedSet<ILicense> licenses = new TreeSet<>(ILicense.getComparator());
-    private SortedSet<String> approvedLicenseId = new TreeSet<>();
-    private SortedSet<String> removedLicenseId = new TreeSet<>();
+    private SortedSet<String> approvedLicenseCategories = new TreeSet<>();
+    private SortedSet<String> removedLicenseCategories = new TreeSet<>();
     private boolean addingLicenses;
     private boolean addingLicensesForced;
     private String copyrightMessage;
@@ -61,7 +64,7 @@ public class ReportConfiguration implements AutoCloseable {
     private InputStream styleSheet = null;
     private IReportable reportable = null;
     private FilenameFilter inputFileFilter = null;
-    private Filter approvalFilter = Filter.approved;
+    private LicenseFilter approvalFilter = LicenseFilter.approved;
 
     /**
      * @return The filename filter for the potential input files.
@@ -116,7 +119,7 @@ public void setStyleSheet(InputStream styleSheet) {
 
     public void setFrom(Defaults defaults) {
         addLicenses(defaults.getLicenses());
-        addApprovedLicenseNames(defaults.getLicenseIds());
+        addApprovedLicenseCategories(defaults.getLicenseIds());
         if (isStyleReport() && getStyleSheet() == null) {
             setStyleSheet(Defaults.getPlainStyleSheet());
         }
@@ -172,22 +175,6 @@ public PrintWriter getWriter() {
         return new PrintWriter(new OutputStreamWriter(getOutput(), Charset.forName("UTF-8")));
     }
 
-    /**
-     * Returns the license that is the combination of all licenses being tested.
-     *
-     * @return the license matcher, or null if no licenses are specified.
-     */
-    public ILicense getLicense() {
-        SortedSet<ILicense> licSet = getLicenses();
-        if (licSet.isEmpty()) {
-            throw new ConfigurationException("At least one license must be specified");
-        }
-        if (licSet.size() == 1) {
-            return licSet.first();
-        }
-        return new LicenseCollectionMatcher(licSet);
-    }
-
     /**
      * Adds licenses to the list of licenses to be checked.
      *
@@ -208,34 +195,17 @@ public void addLicenses(Collection<ILicense> licenses) {
         this.licenses.addAll(licenses);
     }
 
-//    /**
-//     *
-//     * @return the set of approved license names.
-//     */
-//    public ILicenseFamily[] getApprovedLicenseNames() {
-//        return a.toArray(new ILicenseFamily[approvedLicenseNames.size()]);
-//    }
-//
-//    /**
-//     * Adds to the set of approved license names.
-//     *
-//     * @param approvedLicenseNames set of approved license names.
-//     */
-//    public void addApprovedLicenseNames(ILicenseFamily[] approvedLicenseNames) {
-//        addApprovedLicenseNames(Arrays.asList(approvedLicenseNames));
-//    }
-
     /**
      * Adds a license to the list of approved license names.
      *
      * @param approvedLicenseNames set of approved license names.
      */
-    public void addApprovedLicenseName(ILicenseFamily approvedLicenseName) {
-        approvedLicenseId.add(approvedLicenseName.getFamilyCategory());
+    public void addApprovedLicenseCategory(ILicenseFamily approvedLicenseName) {
+        approvedLicenseCategories.add(approvedLicenseName.getFamilyCategory());
     }
 
-    public void addApprovedLicenseName(String familyCategory) {
-        approvedLicenseId.add(familyCategory);
+    public void addApprovedLicenseCategory(String familyCategory) {
+        approvedLicenseCategories.add(ILicenseFamily.makeCategory(familyCategory));
     }
 
     /**
@@ -243,14 +213,23 @@ public void addApprovedLicenseName(String familyCategory) {
      *
      * @param approvedLicenseNames set of approved license names.
      */
-    public void addApprovedLicenseNames(Collection<String> approvedLicenseNames) {
-        approvedLicenseNames.stream().forEach(this::addApprovedLicenseName);
+    public void addApprovedLicenseCategories(Collection<String> approvedLicenseNames) {
+        approvedLicenseNames.stream().forEach(this::addApprovedLicenseCategory);
     }
 
-    public void removeApprovedLicenseName(String familyCategory) {
-        removedLicenseId.add(ILicenseFamily.makeCategory(familyCategory));
+    public void removeApprovedLicenseCategory(String familyCategory) {
+        removedLicenseCategories.add(ILicenseFamily.makeCategory(familyCategory));
     }
 
+    public void removeApprovedLicenseCategories(Collection<String> familyCategory) {
+        familyCategory.stream().forEach(this::removeApprovedLicenseCategory);
+    }
+    
+    public SortedSet<String> getApprovedLicenseCategories() {
+        SortedSet<String> result = new TreeSet<>(approvedLicenseCategories);
+        result.removeAll(removedLicenseCategories);
+        return result;
+    }
     /**
      * @return If Rat is adding license headers: Returns the optional copyright
      * message. This value is ignored, if no license headers are added.
@@ -305,7 +284,7 @@ public void setAddLicenseHeaders(AddLicenseHeaders addLicenseHeaders) {
             break;
         case FORCED:
             addingLicensesForced = true;
-            // fall thorugh
+            // fall through
         case TRUE:
             addingLicenses = true;
             break;
@@ -323,12 +302,12 @@ public void setAddLicenseHeaders(AddLicenseHeaders addLicenseHeaders) {
      * 
      * @return The set of defined licenses.
      */
-    public SortedSet<ILicense> getLicenses() {
-        switch (approvalFilter) {
+    public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
+        switch (filter) {
         case all:
             return Collections.unmodifiableSortedSet(licenses);
         case approved:
-            SortedSet<String> approvedLicenses = getFilteredLicenses();
+            SortedSet<String> approvedLicenses = getApprovedLicenseCategories();
             SortedSet<ILicense> result = new TreeSet<>(ILicense.getComparator());
             licenses.stream().filter(x -> approvedLicenses.contains(x.getLicenseFamily().getFamilyCategory()))
                     .forEach(result::add);
@@ -339,17 +318,9 @@ public SortedSet<ILicense> getLicenses() {
         }
     }
 
-    public SortedSet<ILicenseFamily> getApprovedLicenses() {
-        SortedSet<String> approvedLicenses = getFilteredLicenses();
+    public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
         SortedSet<ILicenseFamily> result = new TreeSet<>();
-        licenses.stream().filter(x -> approvedLicenses.contains(x.getLicenseFamily().getFamilyCategory()))
-                .forEach(x -> result.add(x.getLicenseFamily()));
-        return result;
-    }
-
-    private SortedSet<String> getFilteredLicenses() {
-        SortedSet<String> result = new TreeSet<>(approvedLicenseId);
-        result.removeAll(removedLicenseId);
+        getLicenses(filter).stream().map(ILicense::getLicenseFamily).forEach(result::add);
         return result;
     }
 
@@ -359,14 +330,14 @@ private SortedSet<String> getFilteredLicenses() {
      * @param filter the fileter type.
      * @return this Builder for chaining
      */
-    public void setLicenseFilter(Filter filter) {
+    public void setLicenseFilter(LicenseFilter filter) {
         approvalFilter = filter;
     }
 
-    public ILicense createDefaultMatcher() {
-        return getLicenses().isEmpty() ? null : new LicenseCollectionMatcher(getLicenses());
+    public LicenseFilter getLicenseFilter() {
+        return approvalFilter;
     }
-
+    
     /**
      * Validates that the configuration is valid.
      * 
@@ -387,10 +358,6 @@ public void validate(Consumer<String> logger) {
         }
     }
 
-    public DefaultPolicy getDefaultPolicy() {
-        return new DefaultPolicy(getApprovedLicenses());
-    }
-
     @Override
     public void close() {
         if (styleSheet != null) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index 41db6f8e1..d6447e2d0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -79,7 +79,7 @@ private Reporter() {
      */
     public static ClaimStatistic report(ReportConfiguration configuration) throws Exception {
         if (configuration.getReportable() != null) {
-            if (configuration.isStyleReport()) {                
+            if (configuration.isStyleReport()) {
                 PipedReader reader = new PipedReader();
                 PipedWriter writer = new PipedWriter(reader);
                 ReportTransformer transformer = new ReportTransformer(configuration.getWriter(),
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index da2a9018f..f3659904c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -18,6 +18,8 @@
  */
 package org.apache.rat.analysis;
 
+import java.util.Collection;
+
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.IDocumentAnalyser;
@@ -33,8 +35,8 @@
  */
 public class DefaultAnalyserFactory {
 
-    public static final IDocumentAnalyser createDefaultAnalyser(final ILicense license) {
-        return new DefaultAnalyser(license);
+    public static final IDocumentAnalyser createDefaultAnalyser(Collection<ILicense> licenses) {
+        return new DefaultAnalyser(new LicenseCollection(licenses));
     }
 
     private final static class DefaultAnalyser implements IDocumentAnalyser {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
index 5f33377d5..616fe52d7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
@@ -18,15 +18,15 @@
  */ 
 package org.apache.rat.analysis;
 
+import java.io.IOException;
+import java.io.Reader;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.license.ILicense;
 
-import java.io.IOException;
-import java.io.Reader;
-
 public class DocumentHeaderAnalyser implements IDocumentAnalyser {
 
     private final ILicense license;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index 04eb94bff..1fe853457 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -18,15 +18,15 @@
  * under the License.                                           *
  */
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-
 /**
  * <p>Reads from a stream to check license.</p>
  * <p><strong>Note</strong> that this class is not thread safe.</p> 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
new file mode 100644
index 000000000..adbf64573
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis;
+
+import java.util.Collection;
+
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+class LicenseCollection implements ILicense {
+    private static final ILicenseFamily DEFAULT = ILicenseFamily.builder().setLicenseFamilyCategory("Dummy")
+            .setLicenseFamilyName("HeaderMatcherCollection default license family").build();
+    private Collection<ILicense> enclosed;
+    private ILicense matchingLicense;
+
+    public LicenseCollection(Collection<ILicense> enclosed) {
+        this.matchingLicense = null;
+        this.enclosed = enclosed;
+    }
+
+    @Override
+    public String getId() {
+        return "Default License Collection";
+    }
+
+    @Override
+    public void reset() {
+        enclosed.stream().forEach(ILicense::reset);
+    }
+
+    @Override
+    public boolean matches(String line) {
+        for (ILicense license : enclosed) {
+            if (license.matches(line)) {
+                this.matchingLicense = license;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public int compareTo(ILicense arg0) {
+        return getLicenseFamily().compareTo(arg0.getLicenseFamily());
+    }
+
+    public ILicenseFamily getLicenseFamily() {
+        return matchingLicense == null ? DEFAULT : matchingLicense.getLicenseFamily();
+    }
+
+    public String getNotes() {
+        return matchingLicense == null ? null : matchingLicense.getNotes();
+    }
+
+    public String derivedFrom() {
+        return matchingLicense == null ? null : matchingLicense.derivedFrom();
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
index fa2365ba2..ebef2de21 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
@@ -19,6 +19,7 @@
 package org.apache.rat.report.xml;
 
 import org.apache.rat.ReportConfiguration;
+import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.analysis.DefaultAnalyserFactory;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.impl.util.DocumentAnalyserMultiplexer;
@@ -51,8 +52,8 @@ public static final RatReport createStandardReport(IXmlWriter writer,
         reporters.add(new SimpleXmlClaimReporter(writer));
 
         final IDocumentAnalyser analyser =
-            DefaultAnalyserFactory.createDefaultAnalyser(configuration.getLicense());
-        final DefaultPolicy policy = configuration.getDefaultPolicy();
+            DefaultAnalyserFactory.createDefaultAnalyser(configuration.getLicenses(LicenseFilter.all));
+        final DefaultPolicy policy = new DefaultPolicy(configuration.getLicenseFamilies(LicenseFilter.approved));
 
         final IDocumentAnalyser[] analysers = {analyser, policy};
         DocumentAnalyserMultiplexer analysisMultiplexer = new DocumentAnalyserMultiplexer(analysers);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
new file mode 100644
index 000000000..21dfb1387
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -0,0 +1,335 @@
+package org.apache.rat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.function.Consumer;
+
+import org.apache.rat.ReportConfiguration.LicenseFilter;
+import org.apache.rat.config.AddLicenseHeaders;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.policy.DefaultPolicy;
+import org.apache.rat.report.IReportable;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ReportConfigurationTest {
+    
+    private ReportConfiguration underTest;
+
+    @Before
+    public void setup() {
+        underTest = new ReportConfiguration();
+    }
+    
+    @Test
+    public void testAddAndRemoveApproveLicenseCategories() {
+        List<String> expected = new ArrayList<>();
+        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
+        
+        underTest.addApprovedLicenseCategory( ILicenseFamily.builder().setLicenseFamilyCategory("TheCat")
+                .setLicenseFamilyName("TheName").build()
+                );
+        expected.add("TheCa");
+        SortedSet<String> result = underTest.getApprovedLicenseCategories();
+        assertEquals(expected.size(), result.size());
+        assertTrue(result.containsAll(expected));
+        
+        underTest.addApprovedLicenseCategory("ACat");
+        expected.add("ACat ");
+        result = underTest.getApprovedLicenseCategories();
+        assertEquals(expected.size(), result.size());
+        assertTrue(result.containsAll(expected));
+        
+        String[] cats = {"Spot ", "Felix"};
+        underTest.addApprovedLicenseCategories(Arrays.asList(cats));
+        expected.addAll(Arrays.asList(cats));
+        result = underTest.getApprovedLicenseCategories();
+        assertEquals(expected.size(), result.size());
+        assertTrue(result.containsAll(expected));
+
+        underTest.removeApprovedLicenseCategory("Spot ");
+        expected.remove("Spot ");
+        result = underTest.getApprovedLicenseCategories();
+        assertEquals(expected.size(), result.size());
+        assertTrue(result.containsAll(expected));
+        
+        cats[0] = "TheCa";
+        underTest.removeApprovedLicenseCategories(Arrays.asList(cats));
+        expected.removeAll(Arrays.asList(cats));
+        result = underTest.getApprovedLicenseCategories();
+        assertEquals(expected.size(), result.size());
+        assertTrue(result.containsAll(expected));
+    }
+    
+    @Test
+    public void testRemoveBeforeAddApproveLicenseCategories() {
+        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
+        
+        underTest.removeApprovedLicenseCategory("TheCat");
+        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
+        
+        underTest.addApprovedLicenseCategory("TheCat");
+        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
+    }
+    
+    private ILicense mockLicense(String category, String name) {
+        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory(category)
+                .setLicenseFamilyName(name).build();
+        ILicense result = mock(ILicense.class);
+        when(result.getLicenseFamily()).thenReturn(family);
+        return result;
+    }
+    
+    @Test
+    public void testAddLicense() {
+        
+        List<ILicense> expected = new ArrayList<>();
+        assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());
+        
+        ILicense lic1 = mockLicense( "TheCat", "TheName");
+        expected.add(lic1);
+        underTest.addLicense(lic1);
+        SortedSet<ILicense> result = underTest.getLicenses(LicenseFilter.all);
+        assertEquals(expected.size(), result.size());
+        assertTrue(result.containsAll(expected));
+        
+        ILicense[] lics = { mockLicense( "Spot", "Data's cat" ), mockLicense( "Felix", "Cartoon cat")};
+        expected.addAll(Arrays.asList(lics));
+        underTest.addLicenses(Arrays.asList(lics));
+        result = underTest.getLicenses(LicenseFilter.all);
+        assertEquals(expected.size(), result.size());
+        assertTrue(result.containsAll(expected));
+    }
+    
+    @Test
+    public void copyrightMessageTest() {
+        assertNull( underTest.getCopyrightMessage());
+        underTest.setCopyrightMessage( "This is the message");
+        assertEquals( "This is the message", underTest.getCopyrightMessage());
+    }
+
+    @Test
+    public void inputFileFilterTest() {
+        FilenameFilter filter = mock(FilenameFilter.class);
+        assertNull( underTest.getInputFileFilter());
+        underTest.setInputFileFilter(filter);
+        assertEquals( filter, underTest.getInputFileFilter());
+    }
+    
+    @Test
+    public void licenseFamiliesTest() {
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.all).isEmpty());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+        
+        ILicense[] lics = { mockLicense( "TheCat", "TheName"), mockLicense( "Spot", "Data's cat" ), mockLicense( "Felix", "Cartoon cat")};
+        underTest.addLicenses(Arrays.asList(lics));
+        
+        assertEquals(lics.length, underTest.getLicenseFamilies(LicenseFilter.all).size());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+        
+        underTest.addApprovedLicenseCategory( lics[1].getLicenseFamily());
+        assertEquals(lics.length, underTest.getLicenseFamilies(LicenseFilter.all).size());
+        SortedSet<ILicenseFamily> result = underTest.getLicenseFamilies(LicenseFilter.approved);
+        assertEquals(1, result.size());
+        assertEquals(lics[1].getLicenseFamily(), result.first());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+    }
+    
+    @Test
+    public void testLicenseFilter() {
+        assertEquals(LicenseFilter.approved, underTest.getLicenseFilter());
+        underTest.setLicenseFilter(LicenseFilter.all);
+        assertEquals(LicenseFilter.all, underTest.getLicenseFilter());
+        underTest.setLicenseFilter(LicenseFilter.none);
+        assertEquals(LicenseFilter.none, underTest.getLicenseFilter());
+        underTest.setLicenseFilter(LicenseFilter.approved);
+        assertEquals(LicenseFilter.approved, underTest.getLicenseFilter());
+    }
+    
+    @Test
+    public void licensesTest() {
+        assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());
+        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
+        assertTrue(underTest.getLicenses(LicenseFilter.none).isEmpty());
+        
+        ILicense[] lics = { mockLicense( "TheCat", "TheName"), mockLicense( "Spot", "Data's cat" ), mockLicense( "Felix", "Cartoon cat")};
+        underTest.addLicenses(Arrays.asList(lics));
+        
+        assertEquals(lics.length, underTest.getLicenses(LicenseFilter.all).size());
+        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
+        assertTrue(underTest.getLicenses(LicenseFilter.none).isEmpty());
+        
+        underTest.addApprovedLicenseCategory( lics[1].getLicenseFamily());
+        assertEquals(lics.length, underTest.getLicenses(LicenseFilter.all).size());
+        SortedSet<ILicense> result = underTest.getLicenses(LicenseFilter.approved);
+        assertEquals(1, result.size());
+        assertEquals(lics[1], result.first());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+    }
+    
+    @Test
+    public void outputTest()  {
+        // defaults to system.out
+        assertEquals(System.out, underTest.getOutput());
+        assertNotNull(underTest.getWriter());
+        
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        underTest.setOut(stream);
+        assertEquals(stream, underTest.getOutput());
+        PrintWriter writer = underTest.getWriter();
+        assertNotNull(writer);
+        writer.write('a');
+        writer.flush();
+        assertEquals( 'a', stream.toByteArray()[0]);
+    }
+    
+    @Test
+    public void reportableTest() {
+        assertNull(underTest.getReportable());
+        IReportable reportable = mock(IReportable.class);
+        underTest.setReportable(reportable);
+        assertEquals(reportable, underTest.getReportable());
+        underTest.setReportable(null);
+        assertNull(underTest.getReportable());
+    }
+    
+    @Test
+    public void stylesheetTest() throws IOException, URISyntaxException {
+        URL url = this.getClass().getResource("ReportConfigurationTestFile");
+        
+        assertNull(underTest.getStyleSheet());
+        InputStream stream = mock(InputStream.class);
+        underTest.setStyleSheet(stream);
+        assertEquals(stream, underTest.getStyleSheet());
+        underTest.setStyleSheet((InputStream)null);
+        assertNull(underTest.getStyleSheet());
+        File file = mock(File.class);
+        
+        when(file.toURI()).thenReturn(url.toURI());
+        underTest.setStyleSheet(file);
+        BufferedReader d = new BufferedReader(new InputStreamReader(underTest.getStyleSheet()));
+        assertEquals("/*", d.readLine());
+        assertEquals(" * Licensed to the Apache Software Foundation (ASF) under one   *", d.readLine());
+    }
+    
+    @Test
+    public void testFlags() {
+        assertFalse(underTest.isAddingLicenses());
+        assertFalse(underTest.isAddingLicensesForced());
+        assertTrue(underTest.isStyleReport());
+        
+        underTest.setAddLicenseHeaders(AddLicenseHeaders.TRUE);
+        assertTrue(underTest.isAddingLicenses());
+        assertFalse(underTest.isAddingLicensesForced());
+        assertTrue(underTest.isStyleReport());
+
+        underTest.setAddLicenseHeaders(AddLicenseHeaders.FALSE);
+        assertFalse(underTest.isAddingLicenses());
+        assertFalse(underTest.isAddingLicensesForced());
+        assertTrue(underTest.isStyleReport());
+        
+        underTest.setAddLicenseHeaders(AddLicenseHeaders.FORCED);
+        assertTrue(underTest.isAddingLicenses());
+        assertTrue(underTest.isAddingLicensesForced());
+        assertTrue(underTest.isStyleReport());
+        
+        underTest.setAddLicenseHeaders(AddLicenseHeaders.FALSE);
+        underTest.setStyleReport(false);
+        assertFalse(underTest.isAddingLicenses());
+        assertFalse(underTest.isAddingLicensesForced());
+        assertFalse(underTest.isStyleReport());
+        
+        underTest.setStyleReport(true);
+        assertFalse(underTest.isAddingLicenses());
+        assertFalse(underTest.isAddingLicensesForced());
+        assertTrue(underTest.isStyleReport());
+    }
+    
+ 
+    @Test
+    public void testValidate() {
+        
+//        public void validate(Consumer<String> logger) {
+//            if (reportable == null) {
+//                throw new ConfigurationException("Reportable may not be null");
+//            }
+//            if (licenses.size() == 0) {
+//                throw new ConfigurationException("You must specify at least one license");
+//            }
+//            if (styleSheet != null && !isStyleReport()) {
+//                logger.accept("Ignoring stylesheet because styling is not selected");
+//            }
+//            if (styleSheet == null && isStyleReport()) {
+//                throw new ConfigurationException("Stylesheet must be specified if report styling is selected");
+//            }
+//        }
+
+        
+        final StringBuilder sb = new StringBuilder();
+        try {
+            underTest.validate( s -> sb.append(s));
+            fail("should have thrown ConfigurationException");
+        }
+        catch (ConfigurationException e) {
+            assertEquals("Reportable may not be null", e.getMessage());
+            assertEquals(0, sb.length());
+        }
+        
+        underTest.setReportable( mock(IReportable.class));
+        try {
+            underTest.validate( s -> sb.append(s));
+            fail("should have thrown ConfigurationException");
+        }
+        catch (ConfigurationException e) {
+            assertEquals("You must specify at least one license", e.getMessage());
+            assertEquals(0, sb.length());
+        }
+        
+        underTest.addLicense(mockLicense( "valid", "Validation testing license"));
+        try {
+            underTest.validate( s -> sb.append(s));
+            fail("should have thrown ConfigurationException");
+        }
+        catch (ConfigurationException e) {
+            assertEquals("Stylesheet must be specified if report styling is selected", e.getMessage());
+            assertEquals(0, sb.length());
+        }
+        
+        underTest.setStyleSheet(mock(InputStream.class));
+        underTest.setStyleReport(false);
+        underTest.validate( s -> sb.append(s));
+        assertEquals("Ignoring stylesheet because styling is not selected", sb.toString());
+        
+        final StringBuilder sb2 = new StringBuilder();
+        underTest.setStyleReport(true);
+        underTest.validate( s -> sb2.append(s));
+        assertEquals(0, sb2.length());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index 213320bc2..e6049dfd7 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -24,6 +24,7 @@
 import static org.mockito.Mockito.when;
 
 import java.io.StringWriter;
+import java.util.Arrays;
 
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.impl.MonolithicFileDocument;
@@ -51,7 +52,7 @@ public void setUp() throws Exception {
         out = new StringWriter();
         final XmlWriter writer = new XmlWriter(out);
         reporter = new SimpleXmlClaimReporter(writer);
-        analyser = DefaultAnalyserFactory.createDefaultAnalyser(MATCHES_NOTHING_MATCHER);
+        analyser = DefaultAnalyserFactory.createDefaultAnalyser(Arrays.asList(MATCHES_NOTHING_MATCHER));
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
index d52ae6b7c..2b78d9558 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
@@ -63,6 +63,6 @@ public MetaData getMetaData() {
     
 
     public InputStream inputStream() throws IOException {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException("in MockDocument inputStream()");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java b/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
index 25f4c0477..d4aba50bc 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
@@ -58,7 +58,7 @@ public boolean isComposite() {
     }
 
     public Reader reader() throws IOException {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException( "Opening Reader in MockLocation");
     }
 
     public MetaData getMetaData() {
@@ -67,6 +67,6 @@ public MetaData getMetaData() {
     
 
     public InputStream inputStream() throws IOException {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException("Opening inputStream in MockLocation");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index d7835ca8c..6a847706c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -30,8 +30,8 @@
 import java.util.regex.Pattern;
 
 import org.apache.rat.ConfigurationException;
-import org.apache.rat.Defaults.Filter;
 import org.apache.rat.ReportConfiguration;
+import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
@@ -78,7 +78,7 @@ public void standardReport() throws Exception {
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.addLicense(mockLicense);
-        configuration.setLicenseFilter(Filter.all);
+        configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
         report(directory, report);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index 196b32c4a..63562c531 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -26,6 +26,7 @@
 import java.io.File;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -59,7 +60,7 @@ public void setUp() throws Exception {
         final ILicense matcher = mock(ILicense.class);
         when(matcher.matches(any())).thenReturn(false);
 
-        IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(matcher);
+        IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(Arrays.asList(matcher));
         final List<AbstractReport> reporters = new ArrayList<>();
         reporters.add(reporter);
         report = new ClaimReporterMultiplexer(analyser, reporters);
diff --git a/apache-rat-core/src/test/resources/org/apache/rat/ReportConfigurationTestFile b/apache-rat-core/src/test/resources/org/apache/rat/ReportConfigurationTestFile
new file mode 100644
index 000000000..bf71d75d1
--- /dev/null
+++ b/apache-rat-core/src/test/resources/org/apache/rat/ReportConfigurationTestFile
@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
\ No newline at end of file
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 74a668197..2012a3813 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -251,7 +251,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                 try {
                     LicenseReader reader = Readers.get(additionalLicenseFiles[i]);
                     result.addLicenses(reader.readLicenses());
-                    result.addApprovedLicenseNames(reader.approvedLicenseId());
+                    result.addApprovedLicenseCategories(reader.approvedLicenseId());
                 } catch (MalformedURLException e) {
                     throw new ConfigurationException(additionalLicenseFiles[i] + " is not a valid license file", e);
                 }
@@ -266,7 +266,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     : (l) -> {
                     };
             Consumer<ILicense> addApproved = (approvedLicenses == null || approvedLicenses.length == 0)
-                    ? (l) -> result.addApprovedLicenseName(l.getLicenseFamily())
+                    ? (l) -> result.addApprovedLicenseCategory(l.getLicenseFamily())
                     : (l) -> {
                     };
 
@@ -275,7 +275,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
         }
 
         if (approvedLicenses != null && approvedLicenses.length > 0) {
-            Arrays.stream(approvedLicenses).forEach(result::addApprovedLicenseName);
+            Arrays.stream(approvedLicenses).forEach(result::addApprovedLicenseCategory);
         }
         result.setReportable(getReportable());
         return result;
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 08b0a04f2..ec119227d 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -147,7 +147,7 @@ public void setLicenses(File fileName) {
             LicenseReader reader = Readers.get(fileName);
             reader.add(fileName.toURI().toURL());
             configuration.addLicenses(reader.readLicenses());
-            configuration.addApprovedLicenseNames(reader.approvedLicenseId());
+            configuration.addApprovedLicenseCategories(reader.approvedLicenseId());
         } catch (MalformedURLException e) {
             throw new BuildException("Can not read license file " + fileName, e);
         }
@@ -168,11 +168,14 @@ public void setApprovalFilter(ApprovalFilter filter) {
     }
 
     public void setAddApprovedLicense(String familyCategory) {
-        configuration.addApprovedLicenseName(familyCategory);
+        configuration.addApprovedLicenseCategory(familyCategory);
     }
 
     public void setRemoveApprovedLicense(String familyCategory) {
-        configuration.removeApprovedLicenseName(familyCategory);
+        configuration.removeApprovedLicenseCategory(familyCategory);
+    }
+    public void setRemoveApprovedLicense(String[] familyCategory) {
+        configuration.removeApprovedLicenseCategories(Arrays.asList(familyCategory));
     }
 
     public void setCopyrightMessage(String copyrightMessage) {
@@ -196,14 +199,14 @@ public void setAddDefaultDefinitions(File fileName) {
      */
     @Override
     public void execute() {
-        Defaults defaults = defaultsBuilder.build();
-        configuration.setFrom(defaults);
-        configuration.setReportable(new ResourceCollectionContainer(nestedResources));
-        licenses.stream().map(License::build).forEach((l) -> {
-            configuration.addLicense(l);
-            configuration.addApprovedLicenseName(l.getLicenseFamily());
-        });
         try {
+            Defaults defaults = defaultsBuilder.build();
+            configuration.setFrom(defaults);
+            configuration.setReportable(new ResourceCollectionContainer(nestedResources));
+            licenses.stream().map(License::build).forEach((l) -> {
+                configuration.addLicense(l);
+                configuration.addApprovedLicenseCategory(l.getLicenseFamily());
+            });
             validate();
             Reporter.report(configuration);
         } catch (BuildException e) {
@@ -225,9 +228,8 @@ private void validate() {
             throw new BuildException(e.getMessage(), e.getCause());
         }
         if (nestedResources == null) {
-            throw new BuildException("You must specify at least one file to" + " create the report for.");
+            throw new BuildException("You must specify at least one file to create the report for.");
         }
-        configuration.setReportable(new ResourceCollectionContainer(nestedResources));
     }
 
     /**
@@ -269,12 +271,12 @@ public ApprovalFilter(String s) {
 
         @Override
         public String[] getValues() {
-            return Arrays.stream(Defaults.Filter.values()).map(Defaults.Filter::name).collect(Collectors.toList())
-                    .toArray(new String[Defaults.Filter.values().length]);
+            return Arrays.stream(ReportConfiguration.LicenseFilter.values()).map(ReportConfiguration.LicenseFilter::name).collect(Collectors.toList())
+                    .toArray(new String[ReportConfiguration.LicenseFilter.values().length]);
         }
 
-        public Defaults.Filter internalFilter() {
-            return Defaults.Filter.valueOf(getValue());
+        public ReportConfiguration.LicenseFilter internalFilter() {
+            return ReportConfiguration.LicenseFilter.valueOf(getValue());
         }
     }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
index 06c359965..7eb7b5f12 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
@@ -29,6 +29,9 @@ public void addText(String text) {
         builder.setText(text);
     }
 
+    public void setText(String text) {
+        builder.setText(text);
+    }
     @Override
     public IHeaderMatcher build() {
         return builder.build();
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
index d98b4f5ff..ee9272f74 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
@@ -59,26 +59,24 @@
   </target>
 
   <target name="testNoStylesheet">
-    <au:expectfailure expectedMessage="must specify a stylesheet">
-      <rat:report format="styled">
+    <rat:report format="styled">
         <file file="${ant.file}"/>
       </rat:report>
-    </au:expectfailure>
   </target>
 
-  <target name="testUnusedStylesheet">
-    <rat:report>
-      <stylesheet>
-        <file file="${ant.file}"/>
-      </stylesheet>
-      <file file="${ant.file}"/>
-    </rat:report>
-    <au:assertLogContains text="Ignoring stylesheet"/>
-  </target>
+<!--  <target name="testUnusedStylesheet">-->
+<!--    <rat:report>-->
+<!--      <stylesheet>-->
+<!--        <file file="${ant.file}"/>-->
+<!--      </stylesheet>-->
+<!--      <file file="${ant.file}"/>-->
+<!--    </rat:report>-->
+<!--    <au:assertLogContains text="Ignoring stylesheet"/>-->
+<!--  </target>-->
 
   <target name="testLicenseRequiresFamilyName">
     <au:expectfailure
-        expectedMessage="LicenseFamily Name must be specified.">
+        expectedMessage="LicenseFamily Name must be specified">
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
@@ -106,7 +104,7 @@
 
   <target name="testRegexLicenseRequiresPattern">
     <au:expectfailure
-        expectedMessage="You must specify at least one nested pattern.">
+        expectedMessage="'regex' type matcher requires an expression">
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
@@ -119,24 +117,9 @@
     </au:expectfailure>
   </target>
 
-<target name="testCopyrightBuild">
-    <au:expectfailure
-        expectedMessage="You must specify at least one nested pattern.">
-      <rat:report>
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:copyright start="1990" end="1991" owner="public domain" />
-        </rat:license>
-      </rat:report>
-    </au:expectfailure>
-  </target>
-
   <target name="testTextLicenseRequiresText">
     <au:expectfailure
-        expectedMessage="You must specify the text to match.">
+        expectedMessage="text value is required">
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
index 88de39d91..0da6e5cb1 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
@@ -100,18 +100,28 @@
   </target>
 
   <target name="xtestWithALUnknown">
-    <rat:report addDefaultLicenseMatchers="false">
+    <rat:report useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <rat:w3c/>
+      <rat:license
+          licenseFamilyCategory="YASL1"
+          licenseFamilyName="Yet Another Software License (YASL) 1.0"
+          notes="Interesting License">
+        <text text="exmpl"/>
+      </rat:license>
     </rat:report>
     <au:assertLogDoesntContain text="${expectedOutput}"/>
     <au:assertLogContains text="!????? ${file.name}"/>
   </target>
 
   <target name="testWithALUnknownSentToFile" depends="fileReportTest">
-    <rat:report addDefaultLicenseMatchers="false" reportFile="${report.file}">
+    <rat:report useDefaultLicenses="false" reportFile="${report.file}">
       <file file="${ant.file}"/>
-      <rat:w3c/>
+<!--      <rat:license-->
+<!--          licenseFamilyCategory="YASL1"-->
+<!--          licenseFamilyName="Yet Another Software License (YASL) 1.0"-->
+<!--          notes="Interesting License">-->
+<!--        <text text="exmpl"/>-->
+<!--      </rat:license>-->
     </rat:report>
     <au:assertLogDoesntContain text="${expectedOutput}"/>
     <au:assertLogDoesntContain text="!????? ${file.name}"/>
@@ -143,14 +153,14 @@
   <target name="testSubstringMatcherNotApprovedSentToFile"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
-                addDefaultLicenseMatchers="false">
+                useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <rat:substringMatcher
+      <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-        <pattern substring="exmpl"/>
-      </rat:substringMatcher>
+        <text text="exmpl"/>
+      </rat:license>
     </rat:report>
     <assertReportContains text="!YASL1 ${file.name}"/>
     <assertReportDoesntContain text=" YASL1 ${file.name}"/>
@@ -159,14 +169,14 @@
   <target name="testSubstringMatcherApprovedSentToFile"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
-                addDefaultLicenseMatchers="false">
+                useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <rat:substringMatcher
+      <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-        <pattern substring="exmpl"/>
-      </rat:substringMatcher>
+        <text text="exmpl"/>
+      </rat:license>
       <rat:approvedLicense
           familyName="Yet Another Software License (YASL) 1.0"/>
     </rat:report>
@@ -177,18 +187,18 @@
   <target name="testSubstringMatcherSentToFileNoMatch"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
-                addDefaultLicenseMatchers="false">
+                useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <rat:substringMatcher
+      <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
         <!-- abusing XML attribute whitespace normalization to create
              a substring that is not contained inside the build file
              itself -->
-        <pattern substring="exmpl
+        <text text="exmpl
 "/>
-      </rat:substringMatcher>
+      </rat:license>
     </rat:report>
     <assertReportDoesntContain text="!YASL1 ${file.name}"/>
     <assertReportDoesntContain text=" YASL1 ${file.name}"/>
@@ -197,14 +207,15 @@
   <target name="testFullTextMatcherNotApprovedSentToFile"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
-                addDefaultLicenseMatchers="false">
+                useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <rat:fullTextMatcher
+      <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-        License Family Name: Yet Another Software License (YASL) 1.0
-      </rat:fullTextMatcher>
+        <rat:text>License Family Name: Yet Another Software License (YASL) 1.0</rat:text>
+      </rat:license>
+      <rat:removeApprovedLicense>YASL1</rat:removeApprovedLicense>
     </rat:report>
     <assertReportContains text="!YASL1 ${file.name}"/>
     <assertReportDoesntContain text=" YASL1 ${file.name}"/>
@@ -213,14 +224,14 @@
   <target name="testFullTextMatcherApprovedSentToFile"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
-                addDefaultLicenseMatchers="false">
+                useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <rat:fullTextMatcher
+      <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-        License Family Name: Yet Another Software License (YASL) 1.0
-      </rat:fullTextMatcher>
+        <rat:text>License Family Name: Yet Another Software License (YASL) 1.0</rat:text>
+      </rat:license>
       <rat:approvedLicense
           familyName="Yet Another Software License (YASL) 1.0"/>
     </rat:report>
@@ -236,14 +247,14 @@
       </path>
     </pathconvert>
     <rat:report reportFile="${report.file}"
-                addDefaultLicenseMatchers="false">
+                useDefaultLicenses="false">
       <file file="report-bad-configurations.xml"/>
-      <rat:fullTextMatcher
+      <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-This text shouldn't exist in report-bad-configuration.xml
-      </rat:fullTextMatcher>
+<rat:text>This text shouldn't exist in report-bad-configuration.xml</rat:text>
+      </rat:license>
     </rat:report>
     <assertReportDoesntContain text="!YASL1 ${alt.file.name}"/>
     <assertReportDoesntContain text=" YASL1 ${alt.file.name}"/>
@@ -258,14 +269,14 @@ This text shouldn't exist in report-bad-configuration.xml
     </pathconvert>
     <property name="test.version" value="1.0"/>
     <rat:report reportFile="${report.file}"
-                addDefaultLicenseMatchers="false">
+                useDefaultLicenses="false">
       <file file="report-bad-configurations.xml"/>
-      <rat:fullTextMatcher
+      <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-        License Family Name: Yet Another Software License (YASL) ${test.version}
-      </rat:fullTextMatcher>
+        <rat:text>License Family Name: Yet Another Software License (YASL) ${test.version}</rat:text>
+      </rat:license>
     </rat:report>
     <assertReportContains text="!YASL1 ${alt.file.name}"/>
     <assertReportDoesntContain text=" YASL1 ${alt.file.name}"/>
@@ -306,16 +317,17 @@ import org.apache.rat.api.MetaData;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.analysis.RatHeaderAnalysisException;
-public class Matcher extends BaseLicense implements IHeaderMatcher {
+import org.apache.rat.license.ILicenseFamily;
+public class Matcher extends BaseLicense {
     public Matcher() {
-        super(new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, "EXMPL"),
-              new MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, "Example License"),
-              "");
+        super(ILicenseFamily.builder().setLicenseFamilyCategory("EXMPL").setLicenseFamilyName("Example License").build(), 
+        "", 
+        null
+        );
     }
     public void reset() {}
     
-    public boolean match(Document subject, String line) throws RatHeaderAnalysisException {
-        reportOnLicense(subject);
+    public boolean matches(String line) {
         return true;
     }
 }
@@ -327,6 +339,9 @@ public class LicenseFamily implements ILicenseFamily {
     public String getFamilyName() {
         return "Example License";
     }
+    public String getFamilyCategory() {
+    	return "Example Category";
+    }
 }
 ]]></echo>
     <javac srcdir="${output.dir}/src" destdir="${output.dir}/dest"

From 2c42410888b143ce94311cc4a59fd94f7a89bb45 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 25 Sep 2023 23:00:08 +0200
Subject: [PATCH 098/299] fixes for tests

---
 .../rat/analysis/DefaultAnalyserFactory.java  |   4 +
 .../apache/rat/ReportConfigurationTest.java   | 171 +++++++++---------
 .../rat/report/xml/XmlReportFactoryTest.java  |   2 +-
 .../java/org/apache/rat/mp/RatCheckMojo.java  |   3 +-
 .../java/org/apache/rat/mp/RatReportMojo.java |   3 +-
 5 files changed, 99 insertions(+), 84 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index f3659904c..f9c6f5e03 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -20,6 +20,7 @@
 
 import java.util.Collection;
 
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.IDocumentAnalyser;
@@ -36,6 +37,9 @@
 public class DefaultAnalyserFactory {
 
     public static final IDocumentAnalyser createDefaultAnalyser(Collection<ILicense> licenses) {
+        if (licenses.size() ==0) {
+            throw new ConfigurationException("At least one license must be defined");
+        }
         return new DefaultAnalyser(new LicenseCollection(licenses));
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 21dfb1387..5002df9b5 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat;
 
 import static org.junit.Assert.assertEquals;
@@ -7,7 +25,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.BufferedReader;
@@ -17,55 +34,50 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.SortedSet;
-import java.util.function.Consumer;
 
 import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.policy.DefaultPolicy;
 import org.apache.rat.report.IReportable;
 import org.junit.Before;
 import org.junit.Test;
 
 public class ReportConfigurationTest {
-    
+
     private ReportConfiguration underTest;
 
     @Before
     public void setup() {
         underTest = new ReportConfiguration();
     }
-    
+
     @Test
     public void testAddAndRemoveApproveLicenseCategories() {
         List<String> expected = new ArrayList<>();
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
-        
-        underTest.addApprovedLicenseCategory( ILicenseFamily.builder().setLicenseFamilyCategory("TheCat")
-                .setLicenseFamilyName("TheName").build()
-                );
+
+        underTest.addApprovedLicenseCategory(
+                ILicenseFamily.builder().setLicenseFamilyCategory("TheCat").setLicenseFamilyName("TheName").build());
         expected.add("TheCa");
         SortedSet<String> result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
-        
+
         underTest.addApprovedLicenseCategory("ACat");
         expected.add("ACat ");
         result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
-        
-        String[] cats = {"Spot ", "Felix"};
+
+        String[] cats = { "Spot ", "Felix" };
         underTest.addApprovedLicenseCategories(Arrays.asList(cats));
         expected.addAll(Arrays.asList(cats));
         result = underTest.getApprovedLicenseCategories();
@@ -77,7 +89,7 @@ public void testAddAndRemoveApproveLicenseCategories() {
         result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
-        
+
         cats[0] = "TheCa";
         underTest.removeApprovedLicenseCategories(Arrays.asList(cats));
         expected.removeAll(Arrays.asList(cats));
@@ -85,83 +97,84 @@ public void testAddAndRemoveApproveLicenseCategories() {
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
     }
-    
+
     @Test
     public void testRemoveBeforeAddApproveLicenseCategories() {
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
-        
+
         underTest.removeApprovedLicenseCategory("TheCat");
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
-        
+
         underTest.addApprovedLicenseCategory("TheCat");
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
     }
-    
+
     private ILicense mockLicense(String category, String name) {
-        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory(category)
-                .setLicenseFamilyName(name).build();
+        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory(category).setLicenseFamilyName(name)
+                .build();
         ILicense result = mock(ILicense.class);
         when(result.getLicenseFamily()).thenReturn(family);
         return result;
     }
-    
+
     @Test
     public void testAddLicense() {
-        
+
         List<ILicense> expected = new ArrayList<>();
         assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());
-        
-        ILicense lic1 = mockLicense( "TheCat", "TheName");
+
+        ILicense lic1 = mockLicense("TheCat", "TheName");
         expected.add(lic1);
         underTest.addLicense(lic1);
         SortedSet<ILicense> result = underTest.getLicenses(LicenseFilter.all);
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
-        
-        ILicense[] lics = { mockLicense( "Spot", "Data's cat" ), mockLicense( "Felix", "Cartoon cat")};
+
+        ILicense[] lics = { mockLicense("Spot", "Data's cat"), mockLicense("Felix", "Cartoon cat") };
         expected.addAll(Arrays.asList(lics));
         underTest.addLicenses(Arrays.asList(lics));
         result = underTest.getLicenses(LicenseFilter.all);
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
     }
-    
+
     @Test
     public void copyrightMessageTest() {
-        assertNull( underTest.getCopyrightMessage());
-        underTest.setCopyrightMessage( "This is the message");
-        assertEquals( "This is the message", underTest.getCopyrightMessage());
+        assertNull(underTest.getCopyrightMessage());
+        underTest.setCopyrightMessage("This is the message");
+        assertEquals("This is the message", underTest.getCopyrightMessage());
     }
 
     @Test
     public void inputFileFilterTest() {
         FilenameFilter filter = mock(FilenameFilter.class);
-        assertNull( underTest.getInputFileFilter());
+        assertNull(underTest.getInputFileFilter());
         underTest.setInputFileFilter(filter);
-        assertEquals( filter, underTest.getInputFileFilter());
+        assertEquals(filter, underTest.getInputFileFilter());
     }
-    
+
     @Test
     public void licenseFamiliesTest() {
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.all).isEmpty());
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
-        
-        ILicense[] lics = { mockLicense( "TheCat", "TheName"), mockLicense( "Spot", "Data's cat" ), mockLicense( "Felix", "Cartoon cat")};
+
+        ILicense[] lics = { mockLicense("TheCat", "TheName"), mockLicense("Spot", "Data's cat"),
+                mockLicense("Felix", "Cartoon cat") };
         underTest.addLicenses(Arrays.asList(lics));
-        
+
         assertEquals(lics.length, underTest.getLicenseFamilies(LicenseFilter.all).size());
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
-        
-        underTest.addApprovedLicenseCategory( lics[1].getLicenseFamily());
+
+        underTest.addApprovedLicenseCategory(lics[1].getLicenseFamily());
         assertEquals(lics.length, underTest.getLicenseFamilies(LicenseFilter.all).size());
         SortedSet<ILicenseFamily> result = underTest.getLicenseFamilies(LicenseFilter.approved);
         assertEquals(1, result.size());
         assertEquals(lics[1].getLicenseFamily(), result.first());
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
     }
-    
+
     @Test
     public void testLicenseFilter() {
         assertEquals(LicenseFilter.approved, underTest.getLicenseFilter());
@@ -172,34 +185,35 @@ public void testLicenseFilter() {
         underTest.setLicenseFilter(LicenseFilter.approved);
         assertEquals(LicenseFilter.approved, underTest.getLicenseFilter());
     }
-    
+
     @Test
     public void licensesTest() {
         assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());
         assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
         assertTrue(underTest.getLicenses(LicenseFilter.none).isEmpty());
-        
-        ILicense[] lics = { mockLicense( "TheCat", "TheName"), mockLicense( "Spot", "Data's cat" ), mockLicense( "Felix", "Cartoon cat")};
+
+        ILicense[] lics = { mockLicense("TheCat", "TheName"), mockLicense("Spot", "Data's cat"),
+                mockLicense("Felix", "Cartoon cat") };
         underTest.addLicenses(Arrays.asList(lics));
-        
+
         assertEquals(lics.length, underTest.getLicenses(LicenseFilter.all).size());
         assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
         assertTrue(underTest.getLicenses(LicenseFilter.none).isEmpty());
-        
-        underTest.addApprovedLicenseCategory( lics[1].getLicenseFamily());
+
+        underTest.addApprovedLicenseCategory(lics[1].getLicenseFamily());
         assertEquals(lics.length, underTest.getLicenses(LicenseFilter.all).size());
         SortedSet<ILicense> result = underTest.getLicenses(LicenseFilter.approved);
         assertEquals(1, result.size());
         assertEquals(lics[1], result.first());
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
     }
-    
+
     @Test
-    public void outputTest()  {
+    public void outputTest() {
         // defaults to system.out
         assertEquals(System.out, underTest.getOutput());
         assertNotNull(underTest.getWriter());
-        
+
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         underTest.setOut(stream);
         assertEquals(stream, underTest.getOutput());
@@ -207,9 +221,9 @@ public void outputTest()  {
         assertNotNull(writer);
         writer.write('a');
         writer.flush();
-        assertEquals( 'a', stream.toByteArray()[0]);
+        assertEquals('a', stream.toByteArray()[0]);
     }
-    
+
     @Test
     public void reportableTest() {
         assertNull(underTest.getReportable());
@@ -219,32 +233,32 @@ public void reportableTest() {
         underTest.setReportable(null);
         assertNull(underTest.getReportable());
     }
-    
+
     @Test
     public void stylesheetTest() throws IOException, URISyntaxException {
         URL url = this.getClass().getResource("ReportConfigurationTestFile");
-        
+
         assertNull(underTest.getStyleSheet());
         InputStream stream = mock(InputStream.class);
         underTest.setStyleSheet(stream);
         assertEquals(stream, underTest.getStyleSheet());
-        underTest.setStyleSheet((InputStream)null);
+        underTest.setStyleSheet((InputStream) null);
         assertNull(underTest.getStyleSheet());
         File file = mock(File.class);
-        
+
         when(file.toURI()).thenReturn(url.toURI());
         underTest.setStyleSheet(file);
         BufferedReader d = new BufferedReader(new InputStreamReader(underTest.getStyleSheet()));
         assertEquals("/*", d.readLine());
         assertEquals(" * Licensed to the Apache Software Foundation (ASF) under one   *", d.readLine());
     }
-    
+
     @Test
     public void testFlags() {
         assertFalse(underTest.isAddingLicenses());
         assertFalse(underTest.isAddingLicensesForced());
         assertTrue(underTest.isStyleReport());
-        
+
         underTest.setAddLicenseHeaders(AddLicenseHeaders.TRUE);
         assertTrue(underTest.isAddingLicenses());
         assertFalse(underTest.isAddingLicensesForced());
@@ -254,28 +268,27 @@ public void testFlags() {
         assertFalse(underTest.isAddingLicenses());
         assertFalse(underTest.isAddingLicensesForced());
         assertTrue(underTest.isStyleReport());
-        
+
         underTest.setAddLicenseHeaders(AddLicenseHeaders.FORCED);
         assertTrue(underTest.isAddingLicenses());
         assertTrue(underTest.isAddingLicensesForced());
         assertTrue(underTest.isStyleReport());
-        
+
         underTest.setAddLicenseHeaders(AddLicenseHeaders.FALSE);
         underTest.setStyleReport(false);
         assertFalse(underTest.isAddingLicenses());
         assertFalse(underTest.isAddingLicensesForced());
         assertFalse(underTest.isStyleReport());
-        
+
         underTest.setStyleReport(true);
         assertFalse(underTest.isAddingLicenses());
         assertFalse(underTest.isAddingLicensesForced());
         assertTrue(underTest.isStyleReport());
     }
-    
- 
+
     @Test
     public void testValidate() {
-        
+
 //        public void validate(Consumer<String> logger) {
 //            if (reportable == null) {
 //                throw new ConfigurationException("Reportable may not be null");
@@ -291,45 +304,41 @@ public void testValidate() {
 //            }
 //        }
 
-        
         final StringBuilder sb = new StringBuilder();
         try {
-            underTest.validate( s -> sb.append(s));
+            underTest.validate(s -> sb.append(s));
             fail("should have thrown ConfigurationException");
-        }
-        catch (ConfigurationException e) {
+        } catch (ConfigurationException e) {
             assertEquals("Reportable may not be null", e.getMessage());
             assertEquals(0, sb.length());
         }
-        
-        underTest.setReportable( mock(IReportable.class));
+
+        underTest.setReportable(mock(IReportable.class));
         try {
-            underTest.validate( s -> sb.append(s));
+            underTest.validate(s -> sb.append(s));
             fail("should have thrown ConfigurationException");
-        }
-        catch (ConfigurationException e) {
+        } catch (ConfigurationException e) {
             assertEquals("You must specify at least one license", e.getMessage());
             assertEquals(0, sb.length());
         }
-        
-        underTest.addLicense(mockLicense( "valid", "Validation testing license"));
+
+        underTest.addLicense(mockLicense("valid", "Validation testing license"));
         try {
-            underTest.validate( s -> sb.append(s));
+            underTest.validate(s -> sb.append(s));
             fail("should have thrown ConfigurationException");
-        }
-        catch (ConfigurationException e) {
+        } catch (ConfigurationException e) {
             assertEquals("Stylesheet must be specified if report styling is selected", e.getMessage());
             assertEquals(0, sb.length());
         }
-        
+
         underTest.setStyleSheet(mock(InputStream.class));
         underTest.setStyleReport(false);
-        underTest.validate( s -> sb.append(s));
+        underTest.validate(s -> sb.append(s));
         assertEquals("Ignoring stylesheet because styling is not selected", sb.toString());
-        
+
         final StringBuilder sb2 = new StringBuilder();
         underTest.setStyleReport(true);
-        underTest.validate( s -> sb2.append(s));
+        underTest.validate(s -> sb2.append(s));
         assertEquals(0, sb2.length());
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 6a847706c..558541caa 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -108,7 +108,7 @@ public void testNoLicense() throws Exception {
 
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.addLicense(mockLicense);
+        //configuration.addLicense(mockLicense);
         try {
             XmlReportFactory.createStandardReport(writer, statistic, configuration);
             fail("Should have thrown exception");
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index e44fff686..863bf4f01 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -32,6 +32,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
+import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.Reporter;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.report.claim.ClaimStatistic;
@@ -111,7 +112,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
         ReportConfiguration config = getConfiguration();
         config.setFrom(getDefaultsBuilder().build());
-        logLicenses(config.getLicenses());
+        logLicenses(config.getLicenses(LicenseFilter.all));
         final File parent = reportFile.getParentFile();
         if (!parent.mkdirs() && !parent.isDirectory()) {
             throw new MojoExecutionException("Could not create report parent directory " + parent);
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index e8ccc8a62..2df235f49 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -74,6 +74,7 @@
 import org.apache.maven.reporting.MavenMultiPageReport;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.rat.ReportConfiguration;
+import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.Reporter;
 import org.codehaus.plexus.util.ReaderFactory;
 
@@ -425,7 +426,7 @@ protected void executeReport(Locale locale) throws MavenReportException {
             ReportConfiguration config = getConfiguration();
             config.setFrom(getDefaultsBuilder().build());
             //config.setStyleSheet(Defaults.getUnapprovedLicensesStyleSheet());
-            logLicenses(config.getLicenses());
+            logLicenses(config.getLicenses(LicenseFilter.all));
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             config.setOut(baos);
             Reporter.report(config);

From 9534cb749763ff5fa19ccc79bf7e2b1310058c2c Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 30 Sep 2023 09:23:44 +0200
Subject: [PATCH 099/299] fixed tests

---
 .../apache/rat/analysis/IHeaderMatcher.java   |   1 +
 .../java/org/apache/rat/anttasks/All.java     |  10 +-
 .../java/org/apache/rat/anttasks/Any.java     |  11 +-
 .../org/apache/rat/anttasks/Copyright.java    |   2 -
 .../apache/rat/anttasks/EnclosingMatcher.java |  57 ----
 .../java/org/apache/rat/anttasks/License.java |   6 +-
 .../java/org/apache/rat/anttasks/Not.java     |  11 +-
 .../java/org/apache/rat/anttasks/Regex.java   |   4 +-
 .../java/org/apache/rat/anttasks/Report.java  |   8 +-
 .../anttasks/ResourceCollectionContainer.java |   5 +
 .../java/org/apache/rat/anttasks/Spdx.java    |   2 +-
 .../org/apache/rat/anttasks/antlib.xml        |   7 +
 .../org/apache/rat/anttasks/ReportTest.java   |   4 +-
 .../{customMatcher.xml => customLicense.xml}  |   0
 .../antunit/report-bad-configurations.xml     |   2 +-
 .../test/resources/antunit/report-junit.xml   | 198 +++++++------
 .../antunit/report-normal-operation.xml       | 280 ++++++++++++------
 17 files changed, 344 insertions(+), 264 deletions(-)
 delete mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java
 rename apache-rat-tasks/src/test/resources/antunit/{customMatcher.xml => customLicense.xml} (100%)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 2e9f5c879..5a885b75e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -58,6 +58,7 @@ public interface IHeaderMatcher {
      */
     boolean matches(String line);
     
+    @FunctionalInterface
     interface Builder {
         IHeaderMatcher build();
 
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
index c258179ca..7ba64c94e 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
@@ -22,17 +22,17 @@
 import org.apache.rat.analysis.IHeaderMatcher.Builder;
 import org.apache.rat.configuration.builders.AllBuilder;
 
-public class All extends EnclosingMatcher implements IHeaderMatcher.Builder {
+public class All implements IHeaderMatcher.Builder {
 
     AllBuilder builder = Builder.all();
 
-    @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
-        this.builder.add(builder);
-    }
 
     @Override
     public IHeaderMatcher build() {
         return builder.build();
     }
+    
+    public void add(IHeaderMatcher.Builder builder) {
+        this.builder.add(builder);
+    }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
index f8fd6d5ef..fb0f854fc 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
@@ -22,17 +22,16 @@
 import org.apache.rat.analysis.IHeaderMatcher.Builder;
 import org.apache.rat.configuration.builders.AnyBuilder;
 
-public class Any extends EnclosingMatcher implements IHeaderMatcher.Builder {
+public class Any implements IHeaderMatcher.Builder {
 
     AnyBuilder builder = Builder.any();
 
-    @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
-        this.builder.add(builder);
-    }
-
     @Override
     public IHeaderMatcher build() {
         return builder.build();
     }
+    
+    public void add(IHeaderMatcher.Builder builder) {
+        this.builder.add(builder);
+    }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
index 8333b2c98..006851222 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
@@ -29,12 +29,10 @@ public void setStart(String start) {
         builder.setStart(start);
     }
 
-
     public void setEnd(String end) {
         builder.setEnd(end);
     }
 
-
     public void setOwner(String owner) {
         builder.setOwner(owner);
     }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java
deleted file mode 100644
index d2fbef257..000000000
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/EnclosingMatcher.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.anttasks;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-
-abstract class EnclosingMatcher {
-
-    protected abstract void setBuilder(IHeaderMatcher.Builder builder);
-
-    public void addAll(All all) {
-        setBuilder(all);
-    }
-
-    public void addAny(Any any) {
-        setBuilder(any);
-    }
-
-    
-    public void addText(Text text) {
-        setBuilder(text);
-    }
-
-    public void addNot(Not not) {
-        setBuilder(not);
-    }
-    
-    public void addCopyright(Copyright copyright) {
-        setBuilder(copyright);
-    }
-
-    
-    public void addRegex(Regex regex) {
-        setBuilder(regex);
-    }
-
-    
-    public void addSpdx(Spdx spdx) {
-        setBuilder(spdx);
-    }
-}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
index 9c7776d3c..fc584e30d 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
@@ -21,7 +21,7 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.analysis.IHeaderMatcher;
 
-public class License extends EnclosingMatcher  {
+public class License {
 
     private ILicense.Builder builder = ILicense.builder();
 
@@ -50,8 +50,8 @@ public void setLicenseFamilyName(String licenseFamilyName) {
         builder.setLicenseFamilyName(licenseFamilyName);
     }
 
-    @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
+
+    public void add(IHeaderMatcher.Builder builder) {
         this.builder.setMatcher(builder);
     }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
index 4c1928313..b1ce00d2b 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
@@ -22,17 +22,16 @@
 import org.apache.rat.analysis.IHeaderMatcher.Builder;
 import org.apache.rat.configuration.builders.NotBuilder;
 
-public class Not extends EnclosingMatcher implements IHeaderMatcher.Builder {
+public class Not implements IHeaderMatcher.Builder {
 
     NotBuilder builder = Builder.not();
 
-    @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
-        this.builder.setChild(builder);
-    }
-
     @Override
     public IHeaderMatcher build() {
         return builder.build();
     }
+    
+    public void add(IHeaderMatcher.Builder builder) {
+        this.builder.setChild(builder);
+    }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
index c075b9894..15036fdf5 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
@@ -25,11 +25,11 @@ public class Regex implements IHeaderMatcher.Builder {
 
     private RegexBuilder builder = new RegexBuilder();
 
-    public void setExpression(String pattern) {
+    public void setRegex(String pattern) {
         builder.setExpression(pattern);
     }
     
-    public void setText(String pattern) {
+    public void addText(String pattern) {
         builder.setExpression(pattern);
     }
 
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index ec119227d..ef6d9384a 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -170,10 +170,16 @@ public void setApprovalFilter(ApprovalFilter filter) {
     public void setAddApprovedLicense(String familyCategory) {
         configuration.addApprovedLicenseCategory(familyCategory);
     }
-
+    public void addAddApprovedLicense(String familyCategory) {
+        configuration.addApprovedLicenseCategory(familyCategory);
+    }
     public void setRemoveApprovedLicense(String familyCategory) {
         configuration.removeApprovedLicenseCategory(familyCategory);
     }
+    
+    public void addRemoveApprovedLicense(String familyCategory) {
+        configuration.removeApprovedLicenseCategory(familyCategory);
+    }
     public void setRemoveApprovedLicense(String[] familyCategory) {
         configuration.removeApprovedLicenseCategories(Arrays.asList(familyCategory));
     }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
index 667fb3bcc..103ee0f36 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.stream.Stream;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
@@ -44,6 +45,10 @@ class ResourceCollectionContainer implements IReportable {
     ResourceCollectionContainer(ResourceCollection rc) {
         this.rc = rc;
     }
+    
+    public Stream<? extends Resource> getFiles() {
+        return rc.stream().filter( r -> !r.isDirectory());
+    }
 
     @Override
     public void run(RatReport report) throws RatException {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
index 54b964662..e809a77b4 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
@@ -29,7 +29,7 @@ public void setName(String spdxId) {
         builder.setName(spdxId);
     }
     
-    public void setText(String spdxId) {
+    public void addText(String spdxId) {
         builder.setName(spdxId);
     }
 
diff --git a/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml b/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml
index 0a1cd82de..270434c45 100644
--- a/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml
+++ b/apache-rat-tasks/src/main/resources/org/apache/rat/anttasks/antlib.xml
@@ -22,4 +22,11 @@
 
 <antlib>
   <taskdef name="report" classname="org.apache.rat.anttasks.Report"/>
+    <typedef name="all" classname="org.apache.rat.anttasks.All"/>
+    <typedef name="any" classname="org.apache.rat.anttasks.Any"/>
+    <typedef name="copyright" classname="org.apache.rat.anttasks.Copyright"/>
+    <typedef name="not" classname="org.apache.rat.anttasks.Not"/>
+    <typedef name="regex" classname="org.apache.rat.anttasks.Regex"/>
+    <typedef name="spdx" classname="org.apache.rat.anttasks.Spdx"/>
+    <typedef name="text" classname="org.apache.rat.anttasks.Text"/>
 </antlib>
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index db4369220..db6d52587 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -79,8 +79,8 @@ public void testWithALUnknown() throws Exception {
     @Test
     public void testCustomMatcher() throws Exception {
         buildRule.executeTarget("testCustomMatcher");
-        assertLogDoesNotMatch("AL +\\Q" + getAntFileName() + "\\E");
-        assertLogMatches("EXAMP +\\Q" + getAntFileName() + "\\E");
+        assertLogDoesNotMatch("AS +\\Q" + getAntFileName() + "\\E");
+        assertLogMatches("YASL1 +\\Q" + getAntFileName() + "\\E");
     }
 
     @Test
diff --git a/apache-rat-tasks/src/test/resources/antunit/customMatcher.xml b/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
similarity index 100%
rename from apache-rat-tasks/src/test/resources/antunit/customMatcher.xml
rename to apache-rat-tasks/src/test/resources/antunit/customLicense.xml
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
index ee9272f74..88cf1a693 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
@@ -82,7 +82,7 @@
         <rat:license
             licenseFamilyCategory="YASL1"
             notes="Interesting License">
-          <text>exmpl</text>
+          <rat:text>exmpl</rat:text>
         </rat:license>
       </rat:report>
     </au:expectfailure>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index ce34447c5..758055a94 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -21,91 +21,115 @@
 -->
 
 <project default="all"
-    xmlns:au="antlib:org.apache.ant.antunit"
-    xmlns:rat="antlib:org.apache.rat.anttasks">
-  <taskdef uri="antlib:org.apache.ant.antunit"
-      resource="org/apache/ant/antunit/antlib.xml"
-      classpath="${test.classpath}"/>
-
-  <taskdef uri="antlib:org.apache.rat.anttasks"
-      resource="org/apache/rat/anttasks/antlib.xml"
-      classpath="${test.classpath}"/>
-
-  <pathconvert dirsep="/" property="file.name">
-    <path>
-      <pathelement location="${ant.file}"/>
-    </path>
-  </pathconvert>
-  <property name="expectedOutput" value="AL    ${file.name}"/>
-
-  <target name="testWithReportSentToAnt">
-    <rat:report>
-      <file file="${ant.file}"/>
-    </rat:report>
-  </target>
-
-  <target name="all"/>
-  <target name="testWithReportSentToFile">
-    <property name="report.file" location="${output.dir}/selftest.report"/>
-    <rat:report reportFile="${report.file}">
-      <file file="${ant.file}"/>
-    </rat:report>
-  </target>
-
-  <target name="testWithALUnknown">
-    <rat:report removeApprovedLicense="AL">
-      <file file="${ant.file}"/>
-    </rat:report>
-  </target>
-
-  <target name="testCustomMatcher">
-    <property name="license.file" location="${resource.dir}/customMatcher.xml"/>
-    <rat:report licenses="${license.file}" useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-    </rat:report>
-  </target>
-
-  <target name="testNoResources">
-    <rat:report/>
-  </target>
-
-  <target name="testNoLicenseMatchers">
-    <rat:report useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-    </rat:report>
-  </target>
-
-  <target name="testAddLicenseHeaders">
-    <delete dir="${output.dir}/it-sources"/>
-    <mkdir dir="${output.dir}/it-sources"/>
-    <copy file="${resource.dir}/index.apt" tofile="${output.dir}/it-sources/index.apt"/>
-    <rat:report addLicenseHeaders="true">
-       <file file="${output.dir}/it-sources/index.apt"/>
-    </rat:report>
-  </target>
-
-  <target name="testISO88591">
-    <rat:report format="xml">
-      <file file="src/test/resources/org/example/iso-8859-1.html"/>
-    </rat:report>
-  </target>
-
-  <target name="testISO88591WithReportFile">
-    <property name="report.file" location="${output.dir}/selftest.report"/>
-    <rat:report reportFile="${report.file}" format="xml">
-      <file file="src/test/resources/org/example/iso-8859-1.html"/>
-    </rat:report>
-  </target>
-  
-  <target name="testCopyrightBuild">
-      <rat:report>
-        <file file="${resource.dir}/index.apt"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:copyright start="2023" end="2024" owner="public domain" />
-        </rat:license>
-      </rat:report>
-  </target>
+	xmlns:au="antlib:org.apache.ant.antunit"
+	xmlns:rat="antlib:org.apache.rat.anttasks">
+	
+	<taskdef uri="antlib:org.apache.ant.antunit"
+		resource="org/apache/ant/antunit/antlib.xml"
+		classpath="${test.classpath}" />
+
+	<taskdef uri="antlib:org.apache.rat.anttasks"
+		resource="org/apache/rat/anttasks/antlib.xml"
+		classpath="${test.classpath}" />
+
+	<typedef name="matcher" classname="org.example.Matcher"
+		classpath="${test.classpath}"/>
+
+	<pathconvert dirsep="/" property="file.name">
+		<path>
+			<pathelement location="${ant.file}" />
+		</path>
+	</pathconvert>
+	<property name="expectedOutput" value="AL    ${file.name}" />
+
+	<target name="testWithReportSentToAnt">
+		<rat:report>
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
+	<target name="all" />
+	<target name="testWithReportSentToFile">
+		<property name="report.file" location="${output.dir}/selftest.report" />
+		<rat:report reportFile="${report.file}">
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
+	<target name="testWithALUnknown">
+		<rat:report useDefaultLicenses="false">
+			<rat:license
+				licenseFamilyCategory="YASL1"
+				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				notes="Interesting License">
+				<rat:copyright start="2023" end="2024" owner="public domain" />
+			</rat:license>
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
+	<target name="testCustomLicense">
+		<property name="license.file"
+			location="${resource.dir}/customMatcher.xml" />
+		<rat:report licenses="${license.file}" useDefaultLicenses="false">
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
+	<target name="testCustomMatcher">
+		<rat:report useDefaultLicenses="false">
+			<rat:license
+				licenseFamilyCategory="YASL1"
+				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				notes="Interesting License">
+				<matcher />
+			</rat:license>
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
+	<target name="testNoResources">
+		<rat:report />
+	</target>
+
+	<target name="testNoLicenseMatchers">
+		<rat:report useDefaultLicenses="false">
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
+	<target name="testAddLicenseHeaders">
+		<delete dir="${output.dir}/it-sources" />
+		<mkdir dir="${output.dir}/it-sources" />
+		<copy file="${resource.dir}/index.apt"
+			tofile="${output.dir}/it-sources/index.apt" />
+		<rat:report addLicenseHeaders="true">
+			<file file="${output.dir}/it-sources/index.apt" />
+		</rat:report>
+	</target>
+
+	<target name="testISO88591">
+		<rat:report format="xml">
+			<file file="src/test/resources/org/example/iso-8859-1.html" />
+		</rat:report>
+	</target>
+
+	<target name="testISO88591WithReportFile">
+		<property name="report.file" location="${output.dir}/selftest.report" />
+		<rat:report reportFile="${report.file}" format="xml">
+			<file file="src/test/resources/org/example/iso-8859-1.html" />
+		</rat:report>
+	</target>
+
+	<target name="testCopyrightBuild">
+		<rat:report>
+			<file file="${resource.dir}/index.apt" />
+			<rat:license
+				licenseFamilyCategory="YASL1"
+				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				notes="Interesting License">
+				<rat:copyright start="2023" end="2024" owner="public domain" />
+			</rat:license>
+		</rat:report>
+	</target>
 </project>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
index 0da6e5cb1..99bcf9123 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
@@ -18,6 +18,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 
+SPDX-License-Identifier: Apache-2.0
 -->
 
 <project name='report-normal-operation'
@@ -26,6 +27,7 @@
     xmlns:rat="antlib:org.apache.rat.anttasks">
 
   <property name="output.dir" location="../../../../target/testoutput"/>
+  <property name="resource.dir" location="../../../../src/test/resources/antunit"/>
   <mkdir dir="${output.dir}/dest"/>
   <path id="all-classes-needed-for-tests">
     <pathelement location="${jar.name}" />
@@ -52,6 +54,7 @@
     <property name="expectedOutput" value=" AL    ${file.name}"/>
     <property name="expectedOutputXML" value="&lt;resource name='${file.name}'"/>
     <property name="expectedOutputXML2" value="&lt;header-type name='AL   '"/>
+    <echo>Java version: ${ant.java.version}</echo>
   </target>
 
   <target name="allTests">
@@ -67,10 +70,10 @@
   </target>
 
   <target name="tearDown">
-    <delete dir="${output.dir}" quiet="true"/>
+    <delete file="${output.dir}/selftest.report" quiet="true"/>
   </target>
-
-  <target name="xtestWithReportSentToAnt">
+  
+  <target name="testWithReportSentToAnt">
     <rat:report>
       <file file="${ant.file}"/>
     </rat:report>
@@ -99,14 +102,14 @@
                           file="${report.file}.xml"/>
   </target>
 
-  <target name="xtestWithALUnknown">
+  <target name="testWithALUnknown">
     <rat:report useDefaultLicenses="false">
       <file file="${ant.file}"/>
       <rat:license
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-        <text text="exmpl"/>
+        <copyright owner="exmpl"/>
       </rat:license>
     </rat:report>
     <au:assertLogDoesntContain text="${expectedOutput}"/>
@@ -114,77 +117,47 @@
   </target>
 
   <target name="testWithALUnknownSentToFile" depends="fileReportTest">
+  <!-- create a non-matching license, ignore all defaults and submit the xml as the report -->
     <rat:report useDefaultLicenses="false" reportFile="${report.file}">
       <file file="${ant.file}"/>
-<!--      <rat:license-->
-<!--          licenseFamilyCategory="YASL1"-->
-<!--          licenseFamilyName="Yet Another Software License (YASL) 1.0"-->
-<!--          notes="Interesting License">-->
-<!--        <text text="exmpl"/>-->
-<!--      </rat:license>-->
+      <rat:license
+          licenseFamilyCategory="YASL1"
+          licenseFamilyName="Yet Another Software License (YASL) 1.0"
+          notes="Interesting License">
+        <copyright owner="exmpl"/>
+      </rat:license>
     </rat:report>
     <au:assertLogDoesntContain text="${expectedOutput}"/>
     <au:assertLogDoesntContain text="!????? ${file.name}"/>
     <assertReportContains text="!????? ${file.name}"/>
   </target>
 
-  <target name="xtestCustomMatcher" depends="prepareCustomMatcher">
-    <rat:report>
+  <target name="testCustomMatcher" depends="prepareCustomMatcher">
+    <rat:report useDefaultLicenses="false">
       <file file="${ant.file}"/>
-      <exmpl/>
-      <exmpl-license/>
+      <rat:license
+          licenseFamilyCategory="EXMPL"
+          licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"
+          notes="Interesting License">
+        <exmpl/>
+      </rat:license>
     </rat:report>
     <au:assertLogDoesntContain text="${expectedOutput}"/>
     <au:assertLogContains text=" EXMPL ${file.name}"/>
   </target>
 
-  <target name="testCustomMatcherSentToFile"
+  <target name="testCustomLicenseSentToFile"
           depends="fileReportTest,prepareCustomMatcher">
     <rat:report reportFile="${report.file}">
       <file file="${ant.file}"/>
       <exmpl/>
-      <exmpl-license/>
     </rat:report>
     <au:assertLogDoesntContain text="${expectedOutput}"/>
     <au:assertLogDoesntContain text=" EXMPL ${file.name}"/>
     <assertReportContains text=" EXMPL ${file.name}"/>
   </target>
 
-  <target name="testSubstringMatcherNotApprovedSentToFile"
-          depends="fileReportTest">
-    <rat:report reportFile="${report.file}"
-                useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <text text="exmpl"/>
-      </rat:license>
-    </rat:report>
-    <assertReportContains text="!YASL1 ${file.name}"/>
-    <assertReportDoesntContain text=" YASL1 ${file.name}"/>
-  </target>
-
-  <target name="testSubstringMatcherApprovedSentToFile"
-          depends="fileReportTest">
-    <rat:report reportFile="${report.file}"
-                useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <text text="exmpl"/>
-      </rat:license>
-      <rat:approvedLicense
-          familyName="Yet Another Software License (YASL) 1.0"/>
-    </rat:report>
-    <assertReportContains text=" YASL1 ${file.name}"/>
-    <assertReportDoesntContain text="!YASL1 ${file.name}"/>
-  </target>
-
-  <target name="testSubstringMatcherSentToFileNoMatch"
+  <target name="testTextMatcherWithAbusedWhitespaceSentToFileNoMatch"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
                 useDefaultLicenses="false">
@@ -196,15 +169,143 @@
         <!-- abusing XML attribute whitespace normalization to create
              a substring that is not contained inside the build file
              itself -->
-        <text text="exmpl
+        <rat:text text="exmpl
 "/>
       </rat:license>
     </rat:report>
     <assertReportDoesntContain text="!YASL1 ${file.name}"/>
-    <assertReportDoesntContain text=" YASL1 ${file.name}"/>
+    <assertReportContains text=" YASL1 ${file.name}"/>
   </target>
-
-  <target name="testFullTextMatcherNotApprovedSentToFile"
+  
+  <target name="testAnyBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:any>
+            	<rat:copyright start="2023" end="2024" owner="public domain" />
+            	<rat:text>the text</rat:text>
+            </rat:any>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testAllBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:all>
+            	<rat:text text="the other text"/>
+            	<rat:text>the text</rat:text>
+            </rat:all>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testCopyrightBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${resource.dir}/index.apt"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:copyright start="2023" end="2024" owner="public domain" />
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testNotBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:not>
+            <rat:copyright start="2023" end="2024" owner="public domain" />
+            </rat:not>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testRegexAttributeBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:regex regex="regex\sregex"/>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testRegexNestedTextBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:regex>regex\sregex</rat:regex>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testSpdxAttributeBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:spdx name="Apache-2.0"/>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testSpdxNestedTextBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:spdx>Apache-2.0</rat:spdx>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testTextAttributeBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:text text="The text"/>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testTextNestedTextBuild">
+      <rat:report useDefaultLicenses="false">
+        <file file="${ant.file}"/>
+        <rat:license
+            licenseFamilyCategory="YASL1"
+            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            notes="Interesting License">
+            <rat:text>The text</rat:text>
+        </rat:license>
+      </rat:report>
+  </target>
+  
+  <target name="testLicenseNotApprovedSentToFile"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
                 useDefaultLicenses="false">
@@ -221,7 +322,7 @@
     <assertReportDoesntContain text=" YASL1 ${file.name}"/>
   </target>
 
-  <target name="testFullTextMatcherApprovedSentToFile"
+  <target name="testLicenseApprovedSentToFile"
           depends="fileReportTest">
     <rat:report reportFile="${report.file}"
                 useDefaultLicenses="false">
@@ -232,14 +333,12 @@
           notes="Interesting License">
         <rat:text>License Family Name: Yet Another Software License (YASL) 1.0</rat:text>
       </rat:license>
-      <rat:approvedLicense
-          familyName="Yet Another Software License (YASL) 1.0"/>
     </rat:report>
     <assertReportContains text=" YASL1 ${file.name}"/>
     <assertReportDoesntContain text="!YASL1 ${file.name}"/>
   </target>
 
-  <target name="testFullTextMatcherSentToFileNoMatch"
+  <target name="testNoLicenseMatchSentToFile"
           depends="fileReportTest">
     <pathconvert dirsep="/" property="alt.file.name">
       <path>
@@ -260,7 +359,7 @@
     <assertReportDoesntContain text=" YASL1 ${alt.file.name}"/>
   </target>
 
-  <target name="testFullTextMatcherExpandsProperties"
+  <target name="testLicenseExpandsProperties"
           depends="fileReportTest">
     <pathconvert dirsep="/" property="alt.file.name">
       <path>
@@ -275,7 +374,7 @@
           licenseFamilyCategory="YASL1"
           licenseFamilyName="Yet Another Software License (YASL) 1.0"
           notes="Interesting License">
-        <rat:text>License Family Name: Yet Another Software License (YASL) ${test.version}</rat:text>
+        <rat:text>licenseFamilyName="Yet Another Software License (YASL) ${test.version}</rat:text>
       </rat:license>
     </rat:report>
     <assertReportContains text="!YASL1 ${alt.file.name}"/>
@@ -308,48 +407,47 @@
   </target>
 
   <target name="prepareCustomMatcher">
+<echo>output.dir is ${output.dir}</echo>
     <mkdir dir="${output.dir}/dest"/>
     <mkdir dir="${output.dir}/src/org/example"/>
-    <echo file="${output.dir}/src/org/example/Matcher.java"><![CDATA[
+    <echo file="${output.dir}/src/org/example/MyMatcher.java"><![CDATA[
 package org.example;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
+
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.license.BaseLicense;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.license.ILicenseFamily;
-public class Matcher extends BaseLicense {
-    public Matcher() {
-        super(ILicenseFamily.builder().setLicenseFamilyCategory("EXMPL").setLicenseFamilyName("Example License").build(), 
-        "", 
-        null
-        );
+import org.apache.rat.anttasks.License;
+
+public class MyMatcher implements IHeaderMatcher, IHeaderMatcher.Builder {
+    public MyMatcher() {
     }
-    public void reset() {}
     
-    public boolean matches(String line) {
-        return true;
+
+    @Override
+    public IHeaderMatcher build() {
+        return this;
     }
-}
-]]></echo>
-    <echo file="${output.dir}/src/org/example/LicenseFamily.java"><![CDATA[
-package org.example;
-import org.apache.rat.license.ILicenseFamily;
-public class LicenseFamily implements ILicenseFamily {
-    public String getFamilyName() {
-        return "Example License";
+
+
+    @Override
+    public String getId() {
+        return "MyCustomMatcher";
+    }
+
+
+    @Override
+    public void reset() {
     }
-    public String getFamilyCategory() {
-    	return "Example Category";
+
+
+    @Override
+    public boolean matches(String line) {
+        return true;
     }
 }
 ]]></echo>
+    
     <javac srcdir="${output.dir}/src" destdir="${output.dir}/dest"
            classpath="${test.classpath}" fork="true"/>
-    <typedef name="exmpl" classname="org.example.Matcher"
-             classpathref="all-classes-needed-for-tests"
-             loaderref="testloader"/>
-    <typedef name="exmpl-license" classname="org.example.LicenseFamily"
+    <typedef name="exmpl" classname="org.example.MyMatcher"
              classpathref="all-classes-needed-for-tests"
              loaderref="testloader"/>
   </target>

From 2ad51c70935ca83d96f77465b64dfd22ffaaad40 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 30 Sep 2023 16:15:58 +0200
Subject: [PATCH 100/299] biuld fixes

---
 .../java/org/apache/rat/license/ILicense.java |   2 +
 .../apache/rat/license/ILicenseBuilder.java   |   6 +
 .../java/org/apache/rat/anttasks/All.java     |   3 +-
 .../java/org/apache/rat/anttasks/Any.java     |   2 +-
 .../java/org/apache/rat/anttasks/License.java |   5 +-
 .../java/org/apache/rat/anttasks/Not.java     |   2 +-
 .../java/org/apache/rat/anttasks/Report.java  |   5 +-
 .../org/apache/rat/anttasks/ReportTest.java   |  25 +-
 .../src/test/java/org/example/Matcher.java    |  39 +
 .../test/java/org/example/MatcherBuilder.java |  29 +
 .../test/resources/antunit/report-junit.xml   |  72 +-
 .../antunit/report-normal-operation.xml       | 842 +++++++++---------
 12 files changed, 613 insertions(+), 419 deletions(-)
 create mode 100644 apache-rat-tasks/src/test/java/org/example/Matcher.java
 create mode 100644 apache-rat-tasks/src/test/java/org/example/MatcherBuilder.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 2d3b3495e..0424b8b40 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -98,6 +98,8 @@ interface Builder {
         ILicense build();
         
         Builder setMatcher(IHeaderMatcher.Builder matcher);
+        
+        Builder setMatcher(IHeaderMatcher matcher);
 
         Builder setNotes(String notes);
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
index 3988dee3e..8a3e69f66 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
@@ -36,6 +36,12 @@ public Builder setMatcher(IHeaderMatcher.Builder matcher) {
         this.matcher = matcher;
         return this;
     }
+    
+    @Override
+    public Builder setMatcher(IHeaderMatcher matcher) {
+        this.matcher = ()->matcher;
+        return this;
+    }
 
     @Override
     public Builder setNotes(String notes) {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
index 7ba64c94e..3bb9de23f 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
@@ -24,8 +24,7 @@
 
 public class All implements IHeaderMatcher.Builder {
 
-    AllBuilder builder = Builder.all();
-
+    private AllBuilder builder = Builder.all();
 
     @Override
     public IHeaderMatcher build() {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
index fb0f854fc..61a0c5fbe 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
@@ -24,7 +24,7 @@
 
 public class Any implements IHeaderMatcher.Builder {
 
-    AnyBuilder builder = Builder.any();
+    private AnyBuilder builder = Builder.any();
 
     @Override
     public IHeaderMatcher build() {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
index fc584e30d..0c531dbe9 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
@@ -50,8 +50,11 @@ public void setLicenseFamilyName(String licenseFamilyName) {
         builder.setLicenseFamilyName(licenseFamilyName);
     }
 
-
     public void add(IHeaderMatcher.Builder builder) {
         this.builder.setMatcher(builder);
     }
+    
+    public void add(IHeaderMatcher matcher) {
+        this.builder.setMatcher(matcher);
+    }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
index b1ce00d2b..f2ff8f4fc 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
@@ -24,7 +24,7 @@
 
 public class Not implements IHeaderMatcher.Builder {
 
-    NotBuilder builder = Builder.not();
+    private NotBuilder builder = Builder.not();
 
     @Override
     public IHeaderMatcher build() {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index ef6d9384a..3f78f99d4 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -176,10 +176,7 @@ public void addAddApprovedLicense(String familyCategory) {
     public void setRemoveApprovedLicense(String familyCategory) {
         configuration.removeApprovedLicenseCategory(familyCategory);
     }
-    
-    public void addRemoveApprovedLicense(String familyCategory) {
-        configuration.removeApprovedLicenseCategory(familyCategory);
-    }
+
     public void setRemoveApprovedLicense(String[] familyCategory) {
         configuration.removeApprovedLicenseCategories(Arrays.asList(familyCategory));
     }
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index db6d52587..f1e4c07e7 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -76,13 +76,34 @@ public void testWithALUnknown() throws Exception {
         assertLogMatches("\\!\\?\\?\\?\\?\\? +\\Q" + getAntFileName() + "\\E");
     }
 
+    @Test
+    public void testCustomLicense() throws Exception {
+        buildRule.executeTarget("testCustomLicense");
+        assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
+        assertLogMatches(" EXAMP +\\Q" + getAntFileName() + "\\E");
+    }
+    
     @Test
     public void testCustomMatcher() throws Exception {
         buildRule.executeTarget("testCustomMatcher");
-        assertLogDoesNotMatch("AS +\\Q" + getAntFileName() + "\\E");
-        assertLogMatches("YASL1 +\\Q" + getAntFileName() + "\\E");
+        assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
+        assertLogMatches(" YASL1 +\\Q" + getAntFileName() + "\\E");
     }
 
+    @Test
+    public void testInlineCustomMatcher() throws Exception {
+        buildRule.executeTarget("testInlineCustomMatcher");
+        assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
+        assertLogMatches(" YASL1 +\\Q" + getAntFileName() + "\\E");
+    }
+    
+    @Test
+    public void testCustomMatcherBuilder() throws Exception {
+        buildRule.executeTarget("testCustomMatcherBuilder");
+        assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
+        assertLogMatches(" YASL1 +\\Q" + getAntFileName() + "\\E");
+    }
+    
     @Test
     public void testNoResources() throws Exception {
         try {
diff --git a/apache-rat-tasks/src/test/java/org/example/Matcher.java b/apache-rat-tasks/src/test/java/org/example/Matcher.java
new file mode 100644
index 000000000..a3e9b9a88
--- /dev/null
+++ b/apache-rat-tasks/src/test/java/org/example/Matcher.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.example;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class Matcher implements IHeaderMatcher {
+    public Matcher() {
+    }
+
+    @Override
+    public String getId() {
+        return "MyCustomMatcher";
+    }
+
+    @Override
+    public void reset() {
+    }
+
+    @Override
+    public boolean matches(String line) {
+        return true;
+    }
+
+}
diff --git a/apache-rat-tasks/src/test/java/org/example/MatcherBuilder.java b/apache-rat-tasks/src/test/java/org/example/MatcherBuilder.java
new file mode 100644
index 000000000..df5f55ca0
--- /dev/null
+++ b/apache-rat-tasks/src/test/java/org/example/MatcherBuilder.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.example;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class MatcherBuilder implements IHeaderMatcher.Builder {
+    public MatcherBuilder() {
+    }
+
+    @Override
+    public IHeaderMatcher build() {
+        return new Matcher();
+    }
+}
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index 758055a94..3e637445c 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -23,7 +23,7 @@
 <project default="all"
 	xmlns:au="antlib:org.apache.ant.antunit"
 	xmlns:rat="antlib:org.apache.rat.anttasks">
-	
+
 	<taskdef uri="antlib:org.apache.ant.antunit"
 		resource="org/apache/ant/antunit/antlib.xml"
 		classpath="${test.classpath}" />
@@ -33,13 +33,17 @@
 		classpath="${test.classpath}" />
 
 	<typedef name="matcher" classname="org.example.Matcher"
-		classpath="${test.classpath}"/>
+		classpath="${test.classpath}" />
+
+	<typedef name="matcherBuilder" classname="org.example.MatcherBuilder"
+		classpath="${test.classpath}" />
 
 	<pathconvert dirsep="/" property="file.name">
 		<path>
 			<pathelement location="${ant.file}" />
 		</path>
 	</pathconvert>
+	
 	<property name="expectedOutput" value="AL    ${file.name}" />
 
 	<target name="testWithReportSentToAnt">
@@ -70,12 +74,24 @@
 
 	<target name="testCustomLicense">
 		<property name="license.file"
-			location="${resource.dir}/customMatcher.xml" />
+			location="${resource.dir}/customLicense.xml" />
 		<rat:report licenses="${license.file}" useDefaultLicenses="false">
 			<file file="${ant.file}" />
 		</rat:report>
 	</target>
 
+	<target name="testInlineCustomMatcher" depends="prepareCustomMatcher">
+		<rat:report useDefaultLicenses="false">
+			<rat:license
+				licenseFamilyCategory="YASL1"
+				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				notes="Interesting License">
+				<inlineMatcher />
+			</rat:license>
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
 	<target name="testCustomMatcher">
 		<rat:report useDefaultLicenses="false">
 			<rat:license
@@ -88,6 +104,18 @@
 		</rat:report>
 	</target>
 
+	<target name="testCustomMatcherBuilder">
+		<rat:report useDefaultLicenses="false">
+			<rat:license
+				licenseFamilyCategory="YASL1"
+				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				notes="Interesting License">
+				<matcherBuilder />
+			</rat:license>
+			<file file="${ant.file}" />
+		</rat:report>
+	</target>
+
 	<target name="testNoResources">
 		<rat:report />
 	</target>
@@ -132,4 +160,42 @@
 			</rat:license>
 		</rat:report>
 	</target>
+
+	<target name="prepareCustomMatcher">
+
+		<mkdir dir="${output.dir}/test-classes" />
+		<mkdir dir="${output.dir}/src/org/example" />
+		<echo file="${output.dir}/src/org/example/InlineMatcher.java"><![CDATA[
+package org.example;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+
+public class InlineMatcher implements IHeaderMatcher {
+    public InlineMatcher() {
+    }
+
+    @Override
+    public String getId() {
+        return "MyCustomMatcher";
+    }
+
+
+    @Override
+    public void reset() {
+    }
+
+
+    @Override
+    public boolean matches(String line) {
+        return true;
+    }
+}
+]]></echo>
+
+		<javac srcdir="${output.dir}/src"
+			destdir="${output.dir}/../test-classes"
+			classpath="${test.classpath}" fork="true" />
+		<typedef name="inlineMatcher" classname="org.example.InlineMatcher" />
+	</target>
+
 </project>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
index 99bcf9123..544668c6e 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
@@ -22,410 +22,442 @@ SPDX-License-Identifier: Apache-2.0
 -->
 
 <project name='report-normal-operation'
-    default="allTests"
-    xmlns:au="antlib:org.apache.ant.antunit"
-    xmlns:rat="antlib:org.apache.rat.anttasks">
-
-  <property name="output.dir" location="../../../../target/testoutput"/>
-  <property name="resource.dir" location="../../../../src/test/resources/antunit"/>
-  <mkdir dir="${output.dir}/dest"/>
-  <path id="all-classes-needed-for-tests">
-    <pathelement location="${jar.name}" />
-    <pathelement path="${test.classpath}" />
-    <pathelement location="${output.dir}/dest" />
-  </path>
-
-  <taskdef uri="antlib:org.apache.ant.antunit" 
-           resource="org/apache/ant/antunit/antlib.xml" 
-           classpathref="all-classes-needed-for-tests"
-           loaderref="testloader"/>
-
-  <taskdef uri="antlib:org.apache.rat.anttasks"
-           resource="org/apache/rat/anttasks/antlib.xml"
-           classpathref="all-classes-needed-for-tests"
-           loaderref="testloader"/>
-
-  <target name="setUp">
-    <pathconvert dirsep="/" property="file.name">
-      <path>
-        <pathelement location="${ant.file}"/>
-      </path>
-    </pathconvert>
-    <property name="expectedOutput" value=" AL    ${file.name}"/>
-    <property name="expectedOutputXML" value="&lt;resource name='${file.name}'"/>
-    <property name="expectedOutputXML2" value="&lt;header-type name='AL   '"/>
-    <echo>Java version: ${ant.java.version}</echo>
-  </target>
-
-  <target name="allTests">
-    <au:antunit xmlns:au="antlib:org.apache.ant.antunit"
-                failonerror="true" >
-      <file file="${ant.file}"/>
-      <au:plainlistener/>
-      <propertyset>
-        <propertyref name="test.classpath"/>
-        <propertyref name="jar.name"/>
-      </propertyset>
-    </au:antunit>
-  </target>
-
-  <target name="tearDown">
-    <delete file="${output.dir}/selftest.report" quiet="true"/>
-  </target>
-  
-  <target name="testWithReportSentToAnt">
-    <rat:report>
-      <file file="${ant.file}"/>
-    </rat:report>
-    <au:assertLogContains text="${expectedOutput}"/>
-  </target>
-
-  <target name="testWithReportSentToFile" depends="fileReportTest">
-    <rat:report reportFile="${report.file}">
-      <file file="${ant.file}"/>
-    </rat:report>
-    <au:assertLogDoesntContain text="${expectedOutput}"/>
-    <au:assertFileExists file="${report.file}"/>
-    <assertReportContains text="${expectedOutput}"/>
-  </target>
-
-  <target name="testXMLReportSentToFile" depends="fileReportTest">
-    <rat:report reportFile="${report.file}.xml" format="xml">
-      <file file="${ant.file}"/>
-    </rat:report>
-    <au:assertLogDoesntContain text="${expectedOutputXML}"/>
-    <au:assertLogDoesntContain text="${expectedOutputXML2}"/>
-    <au:assertFileExists file="${report.file}.xml"/>
-    <assertReportContains text="${expectedOutputXML}"
-                          file="${report.file}.xml"/>
-    <assertReportContains text="${expectedOutputXML2}"
-                          file="${report.file}.xml"/>
-  </target>
-
-  <target name="testWithALUnknown">
-    <rat:report useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <copyright owner="exmpl"/>
-      </rat:license>
-    </rat:report>
-    <au:assertLogDoesntContain text="${expectedOutput}"/>
-    <au:assertLogContains text="!????? ${file.name}"/>
-  </target>
-
-  <target name="testWithALUnknownSentToFile" depends="fileReportTest">
-  <!-- create a non-matching license, ignore all defaults and submit the xml as the report -->
-    <rat:report useDefaultLicenses="false" reportFile="${report.file}">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <copyright owner="exmpl"/>
-      </rat:license>
-    </rat:report>
-    <au:assertLogDoesntContain text="${expectedOutput}"/>
-    <au:assertLogDoesntContain text="!????? ${file.name}"/>
-    <assertReportContains text="!????? ${file.name}"/>
-  </target>
-
-  <target name="testCustomMatcher" depends="prepareCustomMatcher">
-    <rat:report useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="EXMPL"
-          licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"
-          notes="Interesting License">
-        <exmpl/>
-      </rat:license>
-    </rat:report>
-    <au:assertLogDoesntContain text="${expectedOutput}"/>
-    <au:assertLogContains text=" EXMPL ${file.name}"/>
-  </target>
-
-  <target name="testCustomLicenseSentToFile"
-          depends="fileReportTest,prepareCustomMatcher">
-    <rat:report reportFile="${report.file}">
-      <file file="${ant.file}"/>
-      <exmpl/>
-    </rat:report>
-    <au:assertLogDoesntContain text="${expectedOutput}"/>
-    <au:assertLogDoesntContain text=" EXMPL ${file.name}"/>
-    <assertReportContains text=" EXMPL ${file.name}"/>
-  </target>
-
-  <target name="testTextMatcherWithAbusedWhitespaceSentToFileNoMatch"
-          depends="fileReportTest">
-    <rat:report reportFile="${report.file}"
-                useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <!-- abusing XML attribute whitespace normalization to create
-             a substring that is not contained inside the build file
-             itself -->
-        <rat:text text="exmpl
-"/>
-      </rat:license>
-    </rat:report>
-    <assertReportDoesntContain text="!YASL1 ${file.name}"/>
-    <assertReportContains text=" YASL1 ${file.name}"/>
-  </target>
-  
-  <target name="testAnyBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:any>
-            	<rat:copyright start="2023" end="2024" owner="public domain" />
-            	<rat:text>the text</rat:text>
-            </rat:any>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testAllBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:all>
-            	<rat:text text="the other text"/>
-            	<rat:text>the text</rat:text>
-            </rat:all>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testCopyrightBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${resource.dir}/index.apt"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:copyright start="2023" end="2024" owner="public domain" />
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testNotBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:not>
-            <rat:copyright start="2023" end="2024" owner="public domain" />
-            </rat:not>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testRegexAttributeBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:regex regex="regex\sregex"/>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testRegexNestedTextBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:regex>regex\sregex</rat:regex>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testSpdxAttributeBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:spdx name="Apache-2.0"/>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testSpdxNestedTextBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:spdx>Apache-2.0</rat:spdx>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testTextAttributeBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:text text="The text"/>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testTextNestedTextBuild">
-      <rat:report useDefaultLicenses="false">
-        <file file="${ant.file}"/>
-        <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
-            notes="Interesting License">
-            <rat:text>The text</rat:text>
-        </rat:license>
-      </rat:report>
-  </target>
-  
-  <target name="testLicenseNotApprovedSentToFile"
-          depends="fileReportTest">
-    <rat:report reportFile="${report.file}"
-                useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <rat:text>License Family Name: Yet Another Software License (YASL) 1.0</rat:text>
-      </rat:license>
-      <rat:removeApprovedLicense>YASL1</rat:removeApprovedLicense>
-    </rat:report>
-    <assertReportContains text="!YASL1 ${file.name}"/>
-    <assertReportDoesntContain text=" YASL1 ${file.name}"/>
-  </target>
-
-  <target name="testLicenseApprovedSentToFile"
-          depends="fileReportTest">
-    <rat:report reportFile="${report.file}"
-                useDefaultLicenses="false">
-      <file file="${ant.file}"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <rat:text>License Family Name: Yet Another Software License (YASL) 1.0</rat:text>
-      </rat:license>
-    </rat:report>
-    <assertReportContains text=" YASL1 ${file.name}"/>
-    <assertReportDoesntContain text="!YASL1 ${file.name}"/>
-  </target>
-
-  <target name="testNoLicenseMatchSentToFile"
-          depends="fileReportTest">
-    <pathconvert dirsep="/" property="alt.file.name">
-      <path>
-        <pathelement location="report-bad-configurations.xml"/>
-      </path>
-    </pathconvert>
-    <rat:report reportFile="${report.file}"
-                useDefaultLicenses="false">
-      <file file="report-bad-configurations.xml"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-<rat:text>This text shouldn't exist in report-bad-configuration.xml</rat:text>
-      </rat:license>
-    </rat:report>
-    <assertReportDoesntContain text="!YASL1 ${alt.file.name}"/>
-    <assertReportDoesntContain text=" YASL1 ${alt.file.name}"/>
-  </target>
-
-  <target name="testLicenseExpandsProperties"
-          depends="fileReportTest">
-    <pathconvert dirsep="/" property="alt.file.name">
-      <path>
-        <pathelement location="report-bad-configurations.xml"/>
-      </path>
-    </pathconvert>
-    <property name="test.version" value="1.0"/>
-    <rat:report reportFile="${report.file}"
-                useDefaultLicenses="false">
-      <file file="report-bad-configurations.xml"/>
-      <rat:license
-          licenseFamilyCategory="YASL1"
-          licenseFamilyName="Yet Another Software License (YASL) 1.0"
-          notes="Interesting License">
-        <rat:text>licenseFamilyName="Yet Another Software License (YASL) ${test.version}</rat:text>
-      </rat:license>
-    </rat:report>
-    <assertReportContains text="!YASL1 ${alt.file.name}"/>
-    <assertReportDoesntContain text=" YASL1 ${alt.file.name}"/>
-  </target>
-
-  <target name="fileReportTest" depends="setUp">
-    <property name="report.file" location="${output.dir}/selftest.report"/>
-    <au:assertFileDoesntExist file="${report.file}"/>
-    <macrodef name="assertReportContains">
-      <attribute name="text"/>
-      <attribute name="file" default="${report.file}"/>
-      <sequential>
-        <loadfile srcFile="@{file}" property="report"/>
-        <au:assertTrue message="expected report to contain '@{text}' but was '${report}'">
-          <contains string="${report}" substring="@{text}"/>
-        </au:assertTrue>
-      </sequential>
-    </macrodef>
-    <macrodef name="assertReportDoesntContain">
-      <attribute name="text"/>
-      <attribute name="file" default="${report.file}"/>
-      <sequential>
-        <loadfile srcFile="@{file}" property="report"/>
-        <au:assertFalse message="expected report to not contain '@{text}' but was '${report}'">
-          <contains string="${report}" substring="@{text}"/>
-        </au:assertFalse>
-      </sequential>
-    </macrodef>
-  </target>
-
-  <target name="prepareCustomMatcher">
-<echo>output.dir is ${output.dir}</echo>
-    <mkdir dir="${output.dir}/dest"/>
-    <mkdir dir="${output.dir}/src/org/example"/>
-    <echo file="${output.dir}/src/org/example/MyMatcher.java"><![CDATA[
+	default="allTests"
+	xmlns:au="antlib:org.apache.ant.antunit"
+	xmlns:rat="antlib:org.apache.rat.anttasks">
+
+	<property name="output.dir" location="../../../../target/testoutput" />
+
+	<property name="reports.dir"
+		location="../../../../target/testoutput/reports" />
+
+	<property name="resource.dir"
+		location="../../../../src/test/resources/antunit" />
+
+	<mkdir dir="${output.dir}/dest" />
+
+	<mkdir dir="${reports.dir}-frames" />
+
+	<path id="all-classes-needed-for-tests">
+		<pathelement location="${jar.name}" />
+		<pathelement path="${test.classpath}" />
+		<pathelement location="${output.dir}/dest" />
+	</path>
+
+	<taskdef uri="antlib:org.apache.ant.antunit"
+		resource="org/apache/ant/antunit/antlib.xml"
+		classpathref="all-classes-needed-for-tests"
+		loaderref="testloader" />
+
+	<taskdef uri="antlib:org.apache.rat.anttasks"
+		resource="org/apache/rat/anttasks/antlib.xml"
+		classpathref="all-classes-needed-for-tests"
+		loaderref="testloader" />
+
+	<typedef name="matcher" classname="org.example.Matcher"
+		classpath="${test.classpath}" />
+
+	<typedef name="matcherBuilder" classname="org.example.MatcherBuilder"
+		classpath="${test.classpath}" />
+
+	<target name="setUp">
+		<pathconvert dirsep="/" property="file.name">
+			<path>
+				<pathelement location="${ant.file}" />
+			</path>
+		</pathconvert>
+		<property name="expectedOutput" value=" AL    ${file.name}" />
+		<property name="expectedOutputXML"
+			value="&lt;resource name='${file.name}'" />
+		<property name="expectedOutputXML2" value="&lt;header-type name='AL   '" />
+	</target>
+
+	<target name="allTests">
+		<au:antunit xmlns:au="antlib:org.apache.ant.antunit"
+			failonerror="true" >
+			<file file="${ant.file}" />
+			<au:plainlistener toDir="${output.dir}" />
+<!--			<au:xmllistener toDir="${reports.dir}" />-->
+<!--			<au:logforwarder />-->
+			<propertyset>
+				<propertyref name="test.classpath" />
+				<propertyref name="jar.name" />
+			</propertyset>
+		</au:antunit>
+<!--		<junitreport>-->
+<!--			<fileset dir="${reports.dir}" includes="TEST-*.xml" />-->
+<!--			<report format="frames" styledir="${antunit-styles}"-->
+<!--				todir="${reports.dir}-frames" />-->
+<!--		</junitreport>-->
+	</target>
+
+	<target name="tearDown">
+		<delete file="${output.dir}/selftest.report" quiet="true" />
+	</target>
+
+		<target name="testWithReportSentToAnt">
+			<rat:report>
+				<file file="${ant.file}" />
+			</rat:report>
+<!-- FIXME			<au:assertLogContains text="${expectedOutput}" />-->
+		</target>
+
+		<target name="testWithReportSentToFile" depends="fileReportTest">
+			<rat:report reportFile="${report.file}">
+				<file file="${ant.file}" />
+			</rat:report>
+			<copy overwrite="true" file="${report.file}" toFile="${reports.dir}/TEST-testwithReportSentToFile.out"/>
+			<au:assertLogDoesntContain text="${expectedOutput}" />
+			<au:assertFileExists file="${report.file}" />
+			<assertReportContains text="${expectedOutput}" />
+		</target>
+
+		<target name="testXMLReportSentToFile" depends="fileReportTest">
+			<rat:report reportFile="${report.file}.xml" format="xml">
+				<file file="${ant.file}" />
+			</rat:report>
+			<copy overwrite="true" file="${report.file}.xml" toFile="${reports.dir}/TEST-testXMLReportSentToFile.xml"/>
+			<au:assertLogDoesntContain text="${expectedOutputXML}" />
+			<au:assertLogDoesntContain text="${expectedOutputXML2}" />
+			<au:assertFileExists file="${report.file}.xml" />
+			<assertReportContains text="${expectedOutputXML}"
+				file="${report.file}.xml" />
+			<assertReportContains text="${expectedOutputXML2}"
+				file="${report.file}.xml" />
+		</target>
+
+	<target name="testWithALUnknown">
+		<rat:report useDefaultLicenses="false">
+			<file file="${ant.file}" />
+			<rat:license
+				licenseFamilyCategory="YASL1"
+				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				notes="Interesting License">
+				<!-- non existant copyright in this file -->
+				<rat:copyright owner="non existant" />
+			</rat:license>
+		</rat:report>
+		<au:assertLogDoesntContain text="${expectedOutput}" />
+<!--FIXME		<au:assertLogContains text="!????? ${file.name}" />-->
+	</target>
+
+		<target name="testWithALUnknownSentToFile" depends="fileReportTest">
+<!--			 create a non-matching license, ignore all defaults and submit the-->
+<!--			xml as the report -->
+			<rat:report useDefaultLicenses="false" reportFile="${report.file}">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					 <!--  non existant copyright in this file  -->
+					<rat:copyright owner="non existant" />
+				</rat:license>
+			</rat:report>
+			<copy overwrite="true" file="${report.file}" toFile="${reports.dir}/TEST-testWithALUnknownSentToFile.out"/>
+			<au:assertLogDoesntContain text="${expectedOutput}" />
+			<au:assertLogDoesntContain text="!????? ${file.name}" />
+			<assertReportContains text="!????? ${file.name}" />
+		</target>
+
+<!-- FIXME		<target name="testCustomMatcher">-->
+<!-- 			<rat:report useDefaultLicenses="false">-->
+<!--				<file file="${ant.file}" />-->
+<!--				<rat:license-->
+<!--					licenseFamilyCategory="EXMPL"-->
+<!--					licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"-->
+<!--					notes="Interesting License">-->
+<!--					<matcher />-->
+<!--				</rat:license>-->
+<!--			</rat:report>-->
+<!--			<au:assertLogDoesntContain text="${expectedOutput}" />-->
+<!--			<au:assertLogContains text=" EXMPL ${file.name}" />-->
+<!--		</target>-->
+
+<!-- FIXME		<target name="testCustomMatcherBuilder">-->
+<!--			<rat:report useDefaultLicenses="false">-->
+<!--				<file file="${ant.file}" />-->
+<!--				<rat:license-->
+<!--					licenseFamilyCategory="EXMPL"-->
+<!--					licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"-->
+<!--					notes="Interesting License">-->
+<!--					<matcherBuilder />-->
+<!--				</rat:license>-->
+<!--			</rat:report>-->
+<!--			<au:assertLogDoesntContain text="${expectedOutput}" />-->
+<!--			<au:assertLogContains text=" EXMPL ${file.name}" />-->
+<!--		</target>-->
+
+		<target name="testInlineCustomMatcher"
+	depends="prepareCustomMatcher">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="EXMPL"
+					licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"
+					notes="Interesting License">
+					<myMatcher />
+				</rat:license>
+			</rat:report>
+			<au:assertLogDoesntContain text="${expectedOutput}" />
+<!-- FIXME			<au:assertLogContains text=" EXMPL ${file.name}" />-->
+		</target>
+
+<!-- FIXME		<target name="testCustomLicenseSentToFile"-->
+<!--			depends="fileReportTest,prepareCustomMatcher">-->
+<!--			<rat:report reportFile="${report.file}">-->
+<!--				<file file="${ant.file}" />-->
+<!--				<rat:myMatcher />-->
+<!--			</rat:report>-->
+<!--			<copy overwrite="true" file="${report.file}" toFile="${reports.dir}/TEST-testCustomLicenseSentToFile.out"/>-->
+<!--			<au:assertLogDoesntContain text="${expectedOutput}" />-->
+<!--			<au:assertLogDoesntContain text=" EXMPL ${file.name}" />-->
+<!--			<assertReportContains text=" EXMPL ${file.name}" />-->
+<!--		</target>-->
+
+		<target name="testAnyBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:any>
+						<rat:copyright start="2023" end="2024" owner="public domain" />
+						<rat:text>the text</rat:text>
+					</rat:any>
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testAllBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:all>
+						<rat:text text="the other text" />
+						<rat:text>the text</rat:text>
+					</rat:all>
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testCopyrightBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${resource.dir}/index.apt" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:copyright start="2023" end="2024" owner="public domain" />
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testNotBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:not>
+						 <!--  non existant copyright in this file  -->
+						<rat:copyright owner="non existant" />
+					</rat:not>
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testRegexAttributeBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:regex regex="regex\sregex" />
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testRegexNestedTextBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:regex>regex\sregex</rat:regex>
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testSpdxAttributeBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:spdx name="Apache-2.0" />
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testSpdxNestedTextBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:spdx>Apache-2.0</rat:spdx>
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testTextAttributeBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:text text="The text" />
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testTextNestedTextBuild">
+			<rat:report useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:text>The text</rat:text>
+				</rat:license>
+			</rat:report>
+		</target>
+
+		<target name="testLicenseNotApprovedSentToFile"
+			depends="fileReportTest">
+			<rat:report reportFile="${report.file}"
+				useDefaultLicenses="false"
+				removeApprovedLicense="YASL1">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:text>License Family Name: Yet Another Software License
+						(YASL) 1.0</rat:text>
+				</rat:license>
+			</rat:report>
+			<copy overwrite="true" file="${report.file}" toFile="${reports.dir}/TEST-testLicenseNotApprovedSentToFile.out"/>
+			<assertReportContains text="!YASL1 ${file.name}" />
+			<assertReportDoesntContain text=" YASL1 ${file.name}" />
+		</target>
+
+		<target name="testLicenseApprovedSentToFile"
+			depends="fileReportTest">
+			<rat:report reportFile="${report.file}"
+				useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:text>License Family Name: Yet Another Software License
+						(YASL) 1.0</rat:text>
+				</rat:license>
+			</rat:report>
+			<copy overwrite="true" file="${report.file}" toFile="${reports.dir}/TEST-testLicenseApprovedSentToFile.out"/>
+			<assertReportContains text=" YASL1 ${file.name}" />
+			<assertReportDoesntContain text="!YASL1 ${file.name}" />
+		</target>
+
+		<target name="testNoLicenseMatchSentToFile"
+			depends="fileReportTest">
+			<rat:report reportFile="${report.file}"
+				useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					 <!--  non existant copyright in this file  -->
+					<rat:copyright owner="non existant" />
+				</rat:license>
+			</rat:report>
+			<copy overwrite="true" file="${report.file}" toFile="${reports.dir}/TEST-testNoLicenseMatchSentToFile.out"/>
+						<assertReportDoesntContain text="!YASL1 ${file.name}" />
+			<assertReportDoesntContain text=" YASL1 ${file.name}" />
+		</target>
+
+		<target name="testLicenseExpandsProperties"
+			depends="fileReportTest">
+			<property name="test.version" value="1.0" />
+			<rat:report reportFile="${report.file}"
+				useDefaultLicenses="false">
+				<file file="${ant.file}" />
+				<rat:license
+					licenseFamilyCategory="YASL1"
+					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					notes="Interesting License">
+					<rat:text>licenseFamilyName="Yet Another Software License (YASL)
+						${test.version}</rat:text>
+				</rat:license>
+			</rat:report>
+			<assertReportContains text=" YASL1 ${file.name}" />
+			<assertReportDoesntContain text="!YASL1 ${file.name}" />
+		</target>
+
+		<target name="fileReportTest" depends="setUp">
+			<property name="report.file" location="${output.dir}/selftest.report"
+	/>
+			<au:assertFileDoesntExist file="${report.file}" />
+			<macrodef name="assertReportContains">
+				<attribute name="text" />
+				<attribute name="file" default="${report.file}" />
+				<sequential>
+					<loadfile srcFile="@{file}" property="report" />
+					<au:assertTrue
+						message="expected report to contain '@{text}' but was '${report}'">
+						<contains string="${report}" substring="@{text}" />
+					</au:assertTrue>
+				</sequential>
+			</macrodef>
+			<macrodef name="assertReportDoesntContain">
+				<attribute name="text" />
+				<attribute name="file" default="${report.file}" />
+				<sequential>
+					<loadfile srcFile="@{file}" property="report" />
+					<au:assertFalse
+						message="expected report to not contain '@{text}' but was
+	'${report}'">
+						<contains string="${report}" substring="@{text}" />
+					</au:assertFalse>
+				</sequential>
+			</macrodef>
+		</target>
+
+	<target name="prepareCustomMatcher">
+		<echo>output.dir is ${output.dir}</echo>
+		<mkdir dir="${output.dir}/dest" />
+		<mkdir dir="${output.dir}/src/org/example" />
+		<echo file="${output.dir}/src/org/example/MyMatcher.java"><![CDATA[
 package org.example;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.anttasks.License;
 
-public class MyMatcher implements IHeaderMatcher, IHeaderMatcher.Builder {
+public class MyMatcher implements IHeaderMatcher {
     public MyMatcher() {
     }
-    
-
-    @Override
-    public IHeaderMatcher build() {
-        return this;
-    }
-
 
     @Override
     public String getId() {
@@ -444,12 +476,12 @@ public class MyMatcher implements IHeaderMatcher, IHeaderMatcher.Builder {
     }
 }
 ]]></echo>
-    
-    <javac srcdir="${output.dir}/src" destdir="${output.dir}/dest"
-           classpath="${test.classpath}" fork="true"/>
-    <typedef name="exmpl" classname="org.example.MyMatcher"
-             classpathref="all-classes-needed-for-tests"
-             loaderref="testloader"/>
-  </target>
+
+		<javac srcdir="${output.dir}/src" destdir="${output.dir}/dest"
+			classpath="${test.classpath}" fork="true" />
+		<typedef name="myMatcher" classname="org.example.MyMatcher"
+			classpath="${output.dir}/dest"
+			loaderref="testloader" />
+	</target>
 
 </project>

From 3c22a5bc00951681f99ad515249268c5139da855 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 1 Oct 2023 11:10:30 +0200
Subject: [PATCH 101/299] initial changes

---
 .../org/apache/rat/configuration/Format.java  |  3 ++-
 .../rat/configuration/LicenseReader.java      |  6 +++++
 .../rat/configuration/MatcherReader.java      | 24 +++++++++++++++++++
 .../configuration/XMLConfigurationReader.java |  2 +-
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index 5a3dde8a3..810849632 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -21,7 +21,8 @@
 import java.util.Arrays;
 
 public enum Format {
-    XML( "xml");
+    XML( "xml"),
+    TXT ( "txt","text");
     
     
     String[] suffix;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index c6cdb2104..7f38122b5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -30,6 +30,12 @@ public interface LicenseReader {
      * @param url the URL to read.
      */
     void add(URL url);
+    
+    /**
+     * Adds matchers from the associated URL to this reader.
+     * @param url the URL to read.
+     */
+    void addMatchers(URL url);
 
     /**
      * Reads the configuration and extracts the BaseLicenses.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
new file mode 100644
index 000000000..e506a7cf5
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
@@ -0,0 +1,24 @@
+package org.apache.rat.configuration;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.SortedSet;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.license.ILicense;
+
+public interface MatcherReader {
+    /**
+     * Adds a URL to the set of files to be read.
+     * 
+     * @param url the URL to read.
+     */
+    void add(URL url);
+
+    /**
+     * Reads the configuration and extracts the BaseLicenses.
+     * 
+     * @return A collection of Base licenses.
+     */
+    Collection<IHeaderMatcher> readMatchers();
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 5bcc89bf1..a43d269ea 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -79,7 +79,7 @@
     </approved>
  */
 
-public class XMLConfigurationReader implements LicenseReader {
+public class XMLConfigurationReader implements LicenseReader, MatcherReader {
 
     enum MatcherType {
         text, copyright, spdx, any, all, matcher_ref, not, regex

From 88eff32563b0c1ad884a23be4db57b368606f18d Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 1 Oct 2023 14:48:58 +0200
Subject: [PATCH 102/299] replaced streams with IOSupplier in
 ReportConfiguration

---
 .../main/java/org/apache/rat/Defaults.java    | 10 ++--
 .../src/main/java/org/apache/rat/Report.java  | 15 ++---
 .../org/apache/rat/ReportConfiguration.java   | 58 ++++++-------------
 .../main/java/org/apache/rat/Reporter.java    | 23 +++++---
 .../rat/report/xml/writer/IXmlWriter.java     |  2 +-
 .../xml/writer/impl/base/XmlWriter.java       |  5 ++
 .../apache/rat/ReportConfigurationTest.java   | 24 ++++----
 .../java/org/apache/rat/ReporterTest.java     |  4 +-
 8 files changed, 66 insertions(+), 75 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 5d8bbcb93..685396cd4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -28,7 +28,9 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.function.Supplier;
 
+import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.Readers;
 import org.apache.rat.license.ILicense;
@@ -70,12 +72,12 @@ private void readConfigFiles(Collection<URL> urls) {
         }
     }
 
-    public static InputStream getPlainStyleSheet() {
-        return Defaults.class.getClassLoader().getResourceAsStream(Defaults.PLAIN_STYLESHEET);
+    public static IOSupplier<InputStream> getPlainStyleSheet() {
+        return ()->Defaults.class.getClassLoader().getResourceAsStream(Defaults.PLAIN_STYLESHEET);
     }
 
-    public static InputStream getUnapprovedLicensesStyleSheet() {
-        return Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
+    public static IOSupplier<InputStream> getUnapprovedLicensesStyleSheet() {
+        return ()->Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
     }
 
     public SortedSet<ILicense> getLicenses() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 3734a0208..428000118 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -119,7 +119,7 @@ public class Report {
     private static final String LICENSE_FORMAT = "%s:\t%s\n\t\t%s\n";
 
     public static final void main(String[] args) throws Exception {
-        try (final ReportConfiguration configuration = new ReportConfiguration()) {
+        final ReportConfiguration configuration = new ReportConfiguration();
             Options opts = buildOptions();
 
             CommandLine cl = null;
@@ -180,12 +180,7 @@ public static final void main(String[] args) throws Exception {
                             System.err.println("please specify a single stylesheet");
                             System.exit(1);
                         }
-                        try {
-                            configuration.setStyleSheet(new FileInputStream(style[0]));
-                        } catch (FileNotFoundException fnfe) {
-                            System.err.println("stylesheet " + style[0] + " doesn't exist");
-                            System.exit(1);
-                        }
+                        configuration.setStyleSheet(() -> new FileInputStream(style[0]));
                     }
                 }
 
@@ -209,7 +204,6 @@ public static final void main(String[] args) throws Exception {
                 
                 Reporter.report(configuration);
             }
-        }
     }
 
     private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, PrintStream out) {
@@ -338,7 +332,7 @@ private Report() {
     }
 
     public static IReportable getDirectory(String baseDirectory, ReportConfiguration config) {
-        PrintStream out = new PrintStream(config.getOutput());
+        try (PrintStream out = new PrintStream(config.getOutput().get())) {
         File base = new File(baseDirectory);
         if (!base.exists()) {
             out.print("ERROR: ");
@@ -359,6 +353,9 @@ public static IReportable getDirectory(String baseDirectory, ReportConfiguration
             out.print(" is not valid gzip data.\n");
             return null;
         }
+        } catch (IOException e) {
+            throw new ConfigurationException("Error opening output", e);
+        }
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index c97b6c07f..c6bffc7ef 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -26,13 +26,17 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
+import org.apache.commons.io.function.IOSupplier;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.rat.ReportConfiguration.LicenseFilter;
@@ -47,7 +51,7 @@
  * {@link Reporter}. Basically, the sole purpose of the front ends is to create
  * the configuration and invoke the {@link Reporter}.
  */
-public class ReportConfiguration implements AutoCloseable {
+public class ReportConfiguration {
     public enum LicenseFilter {
         all, approved, none
     }
@@ -59,9 +63,9 @@ public enum LicenseFilter {
     private boolean addingLicenses;
     private boolean addingLicensesForced;
     private String copyrightMessage;
-    private OutputStream out = null;
+    private IOSupplier<OutputStream> out = null;
     private boolean styleReport = true;
-    private InputStream styleSheet = null;
+    private IOSupplier<InputStream> styleSheet = null;
     private IReportable reportable = null;
     private FilenameFilter inputFileFilter = null;
     private LicenseFilter approvalFilter = LicenseFilter.approved;
@@ -98,7 +102,7 @@ public void setReportable(IReportable reportable) {
     /**
      * @return the XSLT style sheet to style the report with.
      */
-    public InputStream getStyleSheet() {
+    public IOSupplier<InputStream> getStyleSheet() {
         return styleSheet;
     }
 
@@ -106,14 +110,7 @@ public InputStream getStyleSheet() {
      * 
      * @param styleSheet the XSLT style sheet to style the report with.
      */
-    public void setStyleSheet(InputStream styleSheet) {
-        if (this.styleSheet != null) {
-            try {
-                this.styleSheet.close();
-            } catch (IOException e) {
-                logger.warn("Error closing earlier style sheet", e);
-            }
-        }
+    public void setStyleSheet(IOSupplier<InputStream> styleSheet) {
         this.styleSheet = styleSheet;
     }
 
@@ -132,7 +129,9 @@ public void setFrom(Defaults defaults) {
      * @throws MalformedURLException
      */
     public void setStyleSheet(File styleSheet) throws MalformedURLException, IOException {
-        setStyleSheet(styleSheet.toURI().toURL().openStream());
+        Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
+        final URL url = styleSheet.toURI().toURL();
+        setStyleSheet(()->url.openStream());
     }
 
     /**
@@ -154,7 +153,7 @@ public void setStyleReport(boolean styleReport) {
     /**
      * @param out The stream to write the output to.
      */
-    public void setOut(OutputStream out) {
+    public void setOut(IOSupplier<OutputStream> out) {
         this.out = out;
     }
 
@@ -163,16 +162,16 @@ public void setOut(OutputStream out) {
      * 
      * @return The output stream to write to.
      */
-    public OutputStream getOutput() {
-        return out == null ? System.out : out;
+    public IOSupplier<OutputStream> getOutput() {
+        return out == null ? ()->System.out : out;
     }
 
     /**
      * 
      * @return A PrintWriter that wraps the output stream.
      */
-    public PrintWriter getWriter() {
-        return new PrintWriter(new OutputStreamWriter(getOutput(), Charset.forName("UTF-8")));
+    public IOSupplier<PrintWriter> getWriter() {
+        return () -> new PrintWriter(new OutputStreamWriter(getOutput().get(), Charset.forName("UTF-8")));
     }
 
     /**
@@ -357,27 +356,4 @@ public void validate(Consumer<String> logger) {
             throw new ConfigurationException("Stylesheet must be specified if report styling is selected");
         }
     }
-
-    @Override
-    public void close() {
-        if (styleSheet != null) {
-            try {
-                styleSheet.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                styleSheet = null;
-            }
-        }
-        if (out != null) {
-            if (out != System.out && out != System.err) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            out = null;
-        }
-    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index d6447e2d0..3e340e316 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -24,6 +24,7 @@
 import java.io.PipedWriter;
 import java.io.Writer;
 import java.util.List;
+import java.util.function.Supplier;
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.io.filefilter.NameFileFilter;
@@ -79,11 +80,12 @@ private Reporter() {
      */
     public static ClaimStatistic report(ReportConfiguration configuration) throws Exception {
         if (configuration.getReportable() != null) {
-            if (configuration.isStyleReport()) {
+            if (configuration.isStyleReport()) { 
+                try (
                 PipedReader reader = new PipedReader();
-                PipedWriter writer = new PipedWriter(reader);
-                ReportTransformer transformer = new ReportTransformer(configuration.getWriter(),
-                        configuration.getStyleSheet(), reader);
+                PipedWriter writer = new PipedWriter(reader);) {
+                ReportTransformer transformer = new ReportTransformer(configuration.getWriter().get(),
+                        configuration.getStyleSheet().get(), reader);
                 Thread transformerThread = new Thread(transformer);
                 transformerThread.start();
                 final ClaimStatistic statistic = report(writer, configuration);
@@ -91,8 +93,11 @@ public static ClaimStatistic report(ReportConfiguration configuration) throws Ex
                 writer.close();
                 transformerThread.join();
                 return statistic;
+                }
+            }
+            try (Writer writer = configuration.getWriter().get()) {
+            return report(writer, configuration);
             }
-            return report(configuration.getWriter(), configuration);
         }
         return null;
     }
@@ -107,13 +112,17 @@ public static ClaimStatistic report(ReportConfiguration configuration) throws Ex
      */
     private static ClaimStatistic report(Writer outputWriter, ReportConfiguration configuration)
             throws IOException, RatException {
-        IXmlWriter writer = new XmlWriter(outputWriter);
+        try (
+        IXmlWriter writer = new XmlWriter(outputWriter)){
         final ClaimStatistic statistic = new ClaimStatistic();
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
         configuration.getReportable().run(report);
         report.endReport();
-        writer.closeDocument();
+
         return statistic;
+        } catch (Exception e) {
+            throw new IOException(e);
+        }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java
index 9f7268f07..48e1ab7e4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java
@@ -25,7 +25,7 @@
  * Performs basic validation and escaping.
  * Not namespace aware (may reconsider this later).
  */
-public interface IXmlWriter {
+public interface IXmlWriter extends AutoCloseable{
 
     /**
      * Starts a document by writing a prolog.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
index d30475226..d9168dbb1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
@@ -647,4 +647,9 @@ private boolean isValidNameBody(final char character) {
         final byte code = CHARACTER_CODES[character];
         return (code & NAME_MASK) > 0;
     }
+
+    @Override
+    public void close() throws Exception {
+        closeDocument();
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 5002df9b5..a992491d7 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -42,6 +42,7 @@
 import java.util.List;
 import java.util.SortedSet;
 
+import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
@@ -209,15 +210,15 @@ public void licensesTest() {
     }
 
     @Test
-    public void outputTest() {
+    public void outputTest() throws IOException {
         // defaults to system.out
-        assertEquals(System.out, underTest.getOutput());
+        assertEquals(System.out, underTest.getOutput().get());
         assertNotNull(underTest.getWriter());
 
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        underTest.setOut(stream);
-        assertEquals(stream, underTest.getOutput());
-        PrintWriter writer = underTest.getWriter();
+        underTest.setOut(() -> stream);
+        assertEquals(stream, underTest.getOutput().get());
+        PrintWriter writer = underTest.getWriter().get();
         assertNotNull(writer);
         writer.write('a');
         writer.flush();
@@ -240,15 +241,16 @@ public void stylesheetTest() throws IOException, URISyntaxException {
 
         assertNull(underTest.getStyleSheet());
         InputStream stream = mock(InputStream.class);
-        underTest.setStyleSheet(stream);
-        assertEquals(stream, underTest.getStyleSheet());
-        underTest.setStyleSheet((InputStream) null);
+        underTest.setStyleSheet(() -> stream);
+        assertEquals(stream, underTest.getStyleSheet().get());
+        IOSupplier<InputStream> sup = null;
+        underTest.setStyleSheet(sup);
         assertNull(underTest.getStyleSheet());
+        
         File file = mock(File.class);
-
         when(file.toURI()).thenReturn(url.toURI());
         underTest.setStyleSheet(file);
-        BufferedReader d = new BufferedReader(new InputStreamReader(underTest.getStyleSheet()));
+        BufferedReader d = new BufferedReader(new InputStreamReader(underTest.getStyleSheet().get()));
         assertEquals("/*", d.readLine());
         assertEquals(" * Licensed to the Apache Software Foundation (ASF) under one   *", d.readLine());
     }
@@ -331,7 +333,7 @@ public void testValidate() {
             assertEquals(0, sb.length());
         }
 
-        underTest.setStyleSheet(mock(InputStream.class));
+        underTest.setStyleSheet(()->mock(InputStream.class));
         underTest.setStyleReport(false);
         underTest.validate(s -> sb.append(s));
         assertEquals("Ignoring stylesheet because styling is not selected", sb.toString());
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index bcb71920b..3ae3e1d30 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -74,7 +74,7 @@ public void xmlReportTest() throws Exception {
         configuration.setStyleReport(false);
         configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
-        configuration.setOut(out);
+        configuration.setOut(()->out);
         Reporter.report(configuration);
         Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
         XPath xPath = XPathFactory.newInstance().newXPath();
@@ -114,7 +114,7 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
-        configuration.setOut(out);
+        configuration.setOut(()->out);
         Reporter.report(configuration);
 
         String document = out.toString();

From d348362bacea017120a47ce817d59b716fc50747 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 1 Oct 2023 15:04:25 +0200
Subject: [PATCH 103/299] fixed tests

---
 .../org/apache/rat/ReportConfiguration.java    | 12 ++++++++----
 .../java/org/apache/rat/mp/RatCheckMojo.java   | 18 +++++-------------
 .../java/org/apache/rat/mp/RatReportMojo.java  |  2 +-
 .../java/org/apache/rat/anttasks/Report.java   | 17 +++--------------
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index c6bffc7ef..edc5277ec 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -19,6 +19,7 @@
 package org.apache.rat;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -126,12 +127,10 @@ public void setFrom(Defaults defaults) {
      * 
      * @param styleSheet the XSLT style sheet to style the report with.
      * @throws IOException
-     * @throws MalformedURLException
      */
-    public void setStyleSheet(File styleSheet) throws MalformedURLException, IOException {
+    public void setStyleSheet(File styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
-        final URL url = styleSheet.toURI().toURL();
-        setStyleSheet(()->url.openStream());
+        setStyleSheet(()->styleSheet.toURI().toURL().openStream());
     }
 
     /**
@@ -156,6 +155,11 @@ public void setStyleReport(boolean styleReport) {
     public void setOut(IOSupplier<OutputStream> out) {
         this.out = out;
     }
+    
+    public void setOut(File file) {
+        Objects.requireNonNull(file, "output file should not be null");
+        setOut(() -> new FileOutputStream(file));
+    }
 
     /**
      * Returns the output stream. If no stream has been set returns System.out.
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index 863bf4f01..a8811056b 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -145,7 +145,7 @@ protected void check(ClaimStatistic statistics, ReportConfiguration config) thro
                 try {
                     config.setStyleSheet(Defaults.getUnapprovedLicensesStyleSheet());
                     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    config.setOut(baos);
+                    config.setOut(()->baos);
                     Reporter.report(config);
                     getLog().warn(baos.toString());
                 } catch (Exception e) {
@@ -173,14 +173,10 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
             configuration.setCopyrightMessage(copyrightMessage);
         }
         if (reportFile != null) {
-            try {
-                if (!reportFile.exists()) {
-                    reportFile.getParentFile().mkdirs();
-                }
-                configuration.setOut(new FileOutputStream(reportFile));
-            } catch (FileNotFoundException e) {
-                throw new MojoExecutionException("Can not read style file: " + reportStyle, e);
+            if (!reportFile.exists()) {
+                reportFile.getParentFile().mkdirs();
             }
+            configuration.setOut(reportFile);
         }
         if (StringUtils.isNotBlank(reportStyle)) {
             if ("xml".equalsIgnoreCase(reportStyle)) {
@@ -188,11 +184,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
             } else {
                 configuration.setStyleReport(true);
                 if (!"plain".equalsIgnoreCase(reportStyle)) {
-                    try {
-                        configuration.setStyleSheet(new FileInputStream(reportStyle));
-                    } catch (FileNotFoundException e) {
-                        throw new MojoExecutionException("Can not read style file: " + reportStyle, e);
-                    }
+                    configuration.setStyleSheet(() -> new FileInputStream(reportStyle));
                 }
             }
         }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 2df235f49..b6ee9ce18 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -428,7 +428,7 @@ protected void executeReport(Locale locale) throws MavenReportException {
             //config.setStyleSheet(Defaults.getUnapprovedLicensesStyleSheet());
             logLicenses(config.getLicenses(LicenseFilter.all));
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            config.setOut(baos);
+            config.setOut(()->baos);
             Reporter.report(config);
             sink.text(baos.toString());
         } catch (Exception e) {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 3f78f99d4..fe6d0dbd2 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -75,7 +75,7 @@ public class Report extends Task {
 
     public Report() {
         configuration = new ReportConfiguration();
-        configuration.setOut(new LogOutputStream(this, Project.MSG_INFO));
+        configuration.setOut(()->new LogOutputStream(this, Project.MSG_INFO));
         defaultsBuilder = Defaults.builder();
     }
 
@@ -96,12 +96,7 @@ public void setInputFileFilter(FilenameFilter inputFileFilter) {
     }
 
     public void setReportFile(File reportFile) {
-        System.err.println(reportFile);
-        try {
-            configuration.setOut(new FileOutputStream(reportFile));
-        } catch (FileNotFoundException e) {
-            throw new BuildException("Can not open report file", e);
-        }
+        configuration.setOut(reportFile);
     }
 
     public void addLicense(License lic) {
@@ -119,11 +114,7 @@ public void addStylesheet(Resource styleSheet) {
     }
 
     public void addStyleSheet(Resource styleSheet) {
-        try {
-            configuration.setStyleSheet(styleSheet.getInputStream());
-        } catch (IOException e) {
-            throw new BuildException("Can not open style sheet", e);
-        }
+        configuration.setStyleSheet(()->styleSheet.getInputStream());
         configuration.setStyleReport(true);
     }
 
@@ -216,8 +207,6 @@ public void execute() {
             throw e;
         } catch (Exception ioex) {
             throw new BuildException(ioex);
-        } finally {
-            configuration.close();
         }
     }
 

From 867e490b963ce74037d72046661d650b5b7dfc61 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 2 Oct 2023 23:42:23 +0200
Subject: [PATCH 104/299] Added ability to defind external Matcher.Buider

---
 apache-rat-core/pom.xml                       |   5 +
 .../main/java/org/apache/rat/Defaults.java    |  32 +++-
 .../org/apache/rat/configuration/Format.java  |  54 +++++-
 .../rat/configuration/LicenseReader.java      |   8 +-
 .../configuration/MatcherBuilderTracker.java  | 105 +++++++++++
 .../rat/configuration/MatcherReader.java      |  31 +++-
 .../org/apache/rat/configuration/Readers.java | 131 --------------
 .../configuration/XMLConfigurationReader.java | 171 ++++++++----------
 .../builders/ChildContainerBuilder.java       |  33 +++-
 .../configuration/builders/NotBuilder.java    |  17 +-
 .../configuration/builders/RegexBuilder.java  |   2 +-
 .../configuration/builders/TextBuilder.java   |   2 +-
 .../builders/TextCaptureBuilder.java          |  23 +++
 .../main/resources/org/apache/rat/default.xml |  16 +-
 .../ConfigurationReaderTest.java              |  34 ++++
 .../apache/rat/configuration/FormatTest.java  |   6 +-
 .../apache/rat/configuration/ReadersTest.java |  33 ----
 .../org/apache/rat/mp/AbstractRatMojo.java    |  25 ++-
 .../src/main/java/org/apache/rat/mp/Not.java  |   2 +-
 .../java/org/apache/rat/anttasks/Not.java     |   2 +-
 .../java/org/apache/rat/anttasks/Regex.java   |   4 +-
 .../java/org/apache/rat/anttasks/Report.java  |  21 ++-
 .../test/resources/antunit/customLicense.xml  |   2 +-
 23 files changed, 441 insertions(+), 318 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index dfa16be2f..93402c934 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -143,5 +143,10 @@ permissions and
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>31.0.1-jre</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 5d8bbcb93..4c575cb71 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -25,12 +25,18 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
-import org.apache.rat.configuration.Readers;
+import org.apache.rat.configuration.MatcherReader;
+import org.apache.rat.configuration.MatcherBuilderTracker;
+import org.apache.rat.configuration.builders.AbstractBuilder;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
@@ -44,6 +50,13 @@ public class Defaults {
 
     private final SortedSet<ILicense> licenses;
     private final SortedSet<String> approvedLicenseIds;
+    
+    public static void init() {
+        Format fmt = Format.fromURL(DEFAULT_CONFIG_URL);
+        MatcherReader mReader = fmt.matcherReader();
+        mReader.addMatchers(DEFAULT_CONFIG_URL);
+        mReader.readMatcherBuilders();
+    }
 
     /**
      * Builder constructs instances.
@@ -63,10 +76,21 @@ public void clear() {
     }
 
     private void readConfigFiles(Collection<URL> urls) {
+
         for (URL url : urls) {
-            LicenseReader reader = Readers.get(url);
-            licenses.addAll(reader.readLicenses());
-            reader.approvedLicenseId().stream().map(ILicenseFamily::makeCategory).forEach(approvedLicenseIds::add);
+            Format fmt = Format.fromURL(url);
+            MatcherReader mReader = fmt.matcherReader();
+            if (mReader != null) {
+                mReader.addMatchers(url);
+                mReader.readMatcherBuilders();
+            }
+
+            LicenseReader lReader = fmt.licenseReader();
+            if (lReader != null) {
+                lReader.addLicenses(url);
+                licenses.addAll(lReader.readLicenses());
+                lReader.approvedLicenseId().stream().map(ILicenseFamily::makeCategory).forEach(approvedLicenseIds::add);
+            }
         }
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index 810849632..933475cbf 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -18,19 +18,56 @@
  */
 package org.apache.rat.configuration;
 
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Arrays;
 
+import org.apache.rat.ConfigurationException;
+
 public enum Format {
-    XML( "xml"),
-    TXT ( "txt","text");
+    XML( XMLConfigurationReader.class, "xml"),
+    TXT ( null, "txt","text");
     
+    private String[] suffix;
     
-    String[] suffix;
+    private Constructor<MatcherReader> matcherReader;
+    private Constructor<LicenseReader> licenseReader;
     
-    Format(String... suffix) {
+    Format(Class<?> reader, String... suffix) {
+        if (reader != null)
+        {
+        try {
+            matcherReader =  MatcherReader.class.isAssignableFrom(reader) ? (Constructor<MatcherReader>) reader.getConstructor() : null;
+            licenseReader = LicenseReader.class.isAssignableFrom(reader) ? (Constructor<LicenseReader>) reader.getConstructor() : null;
+        } catch (NoSuchMethodException | SecurityException e) {
+            throw new ConfigurationException( "Error retrieving no argument constructor for "+reader.getName(), e);
+        }
+        }
         this.suffix = suffix;
     }
     
+    public MatcherReader matcherReader() {
+        try {
+            return matcherReader == null ? null : matcherReader.newInstance();
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+                | InvocationTargetException e) {
+            throw new ConfigurationException( "Can not instantiate MatcherReader for "+this.name(), e);
+        }
+    }
+
+    public LicenseReader licenseReader() {
+        try {
+            return licenseReader == null ? null : licenseReader.newInstance();
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+                | InvocationTargetException e) {
+            throw new ConfigurationException( "Can not instantiate LicenseReader for "+this.name(), e);
+        }
+    }
+    
     public static Format fromName(String name) {
         String[] parts = name.split("\\.");
         String suffix = parts[parts.length-1];
@@ -41,4 +78,13 @@ public static Format fromName(String name) {
         }
         throw new IllegalArgumentException(String.format("No such suffix: %s", suffix));
     }
+    
+    public static Format fromURL(URL url) {
+        return Format.fromName(url.getFile());
+    }
+
+    public static Format fromFile(File file) throws MalformedURLException {
+        return Format.fromURL(file.toURI().toURL());
+    }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index 7f38122b5..4faedb21c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -29,13 +29,7 @@ public interface LicenseReader {
      * 
      * @param url the URL to read.
      */
-    void add(URL url);
-    
-    /**
-     * Adds matchers from the associated URL to this reader.
-     * @param url the URL to read.
-     */
-    void addMatchers(URL url);
+    void addLicenses(URL url);
 
     /**
      * Reads the configuration and extracts the BaseLicenses.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
new file mode 100644
index 000000000..80460d388
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.configuration;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
+import org.apache.rat.Defaults;
+import org.apache.rat.configuration.builders.AbstractBuilder;
+
+public class MatcherBuilderTracker {
+
+    private static MatcherBuilderTracker INSTANCE;
+
+    private final Map<String, Class<? extends AbstractBuilder>> matcherBuilders;
+    
+    private static synchronized MatcherBuilderTracker instance() {
+        if (INSTANCE == null) {
+            INSTANCE = new MatcherBuilderTracker();
+            Defaults.init();
+        }
+        return INSTANCE;
+    }
+
+    public static void addBuilder(String className, String name) {
+        instance().addBuilderImpl(className, name);
+    }
+    
+    public static AbstractBuilder getMatcherBuilder(String name) {
+        Class<? extends AbstractBuilder> clazz =  instance().matcherBuilders.get(name);
+        if (clazz == null) {
+            StringBuilder sb = new StringBuilder("\nValid builders\n" );
+            instance().matcherBuilders.keySet().stream().forEach(x -> sb.append(x).append("\n"));
+            sb.append( "ERROR MSG\n");
+            
+            throw new ConfigurationException( sb.append("No matcher builder named "+name).toString());
+        }
+        try {
+            return clazz.getConstructor().newInstance();
+        } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+            throw new ConfigurationException( String.format(
+                    "Can not instantiate matcher builder named %s (%s)",
+                    name, clazz.getName()), e);
+        }
+    }
+
+    private MatcherBuilderTracker() {
+        matcherBuilders = new HashMap<>();
+    }
+
+    private void addBuilderImpl(String className, String name) {
+        Objects.requireNonNull(className, "className may not be null" );
+        Class<?> clazz;
+        try {
+            clazz = getClass().getClassLoader().loadClass(className);
+        } catch (ClassNotFoundException e) {
+            throw new ConfigurationException(e);
+        }
+        if (AbstractBuilder.class.isAssignableFrom(clazz)) {
+            @SuppressWarnings("unchecked")
+            Class<? extends AbstractBuilder> candidate = (Class<? extends AbstractBuilder>) clazz;
+            // String name = attributes.get(AttributeName.name);
+            if (StringUtils.isBlank(name)) {
+                name = candidate.getSimpleName();
+                if (!name.endsWith("Builder")) {
+                    throw new ConfigurationException(
+                            "name is required, or " + candidate.getName() + " must end with 'Builder'");
+                }
+                name = name.substring(0, name.lastIndexOf("Builder"));
+                if (StringUtils.isBlank(name)) {
+                    throw new ConfigurationException("Last segment of " + candidate.getName()
+                            + " may not be 'Builder', but must end in 'Builder'");
+                }
+                name = name.replaceFirst(".", StringUtils.lowerCase(name.substring(0,1)));
+            }
+            matcherBuilders.put(name, candidate);
+        } else {
+            throw new ConfigurationException("Class " + clazz.getName() + " does not extend " + AbstractBuilder.class);
+        }
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
index e506a7cf5..6ea63b32d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
@@ -1,11 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.rat.configuration;
 
 import java.net.URL;
-import java.util.Collection;
-import java.util.SortedSet;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.license.ILicense;
 
 public interface MatcherReader {
     /**
@@ -13,12 +26,10 @@ public interface MatcherReader {
      * 
      * @param url the URL to read.
      */
-    void add(URL url);
+    void addMatchers(URL url);
 
     /**
-     * Reads the configuration and extracts the BaseLicenses.
-     * 
-     * @return A collection of Base licenses.
+     * Reads the configuration and MatcherBuilder classes and adds them to Readers..
      */
-    Collection<IHeaderMatcher> readMatchers();
+    void readMatcherBuilders();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
deleted file mode 100644
index b0864c638..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Readers.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.configuration;
-
-import java.util.Map;
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-public class Readers {
-    
-    /*
-     * --- JSON ---
-     *  {
-     *      families : {
-     *          xxx: 'name',
-     *          },
-     *      licenses : [
-     *      {
-     *          family : 'xxx',
-     *          notes: 'notes',
-     *          spdx: 'spdx',
-     *          fulltext: 'text',
-     *          copyright: 'copyright',
-     *          text = ['text','text2','text3'],
-     *          }],
-     *  }
-     * 
-     * --- RDF ---
-     *
-     * family:category [
-     *   name='   '
-     *   ] 
-     *
-     * license:id [
-     *   family family:category
-     *   notes=''
-     *   spdx=''
-     *   fulltext=''
-     *   copyright=''
-     *   text=''
-     *   text=''
-     *   text=''
-     * ]
-     *
-     * --- XML ---
-     * <config>
-     * <family id='fxx' category='xxxxx'>
-     *      name text
-     * </family>
-     * 
-     * <license id="lxx' family='fxx' spdx='spdxtx'>
-     *  <notes>notes text</notes>
-     *  <fulltext>full text</fulltext>
-     *  <copyright>copyright</copyright>
-     *  <text>text</text>
-     *  </license>
-     *  </config>
-     *  
-     *  --- CONFIG ---
-     * family.category.name=text
-     * 
-     * license.id.family=famid
-     * license.id.notes=
-     * license.id.fullText=
-     * license.id.copyright=
-     * license.id.text=
-     * license.id.spdx=
-     */
-
-    private static Map<Format,Class<? extends LicenseReader>> readers;
-
-    static {
-        readers = new HashMap<>();
-        readers.put( Format.XML, XMLConfigurationReader.class);
-    }
-
-    public static LicenseReader get(URL url) {
-        Format fmt = getFormat(url);
-        try {
-            LicenseReader result = readers.get(fmt).getDeclaredConstructor().newInstance();
-            result.add(url);
-            return result;
-        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
-                | NoSuchMethodException | SecurityException e) {
-            throw new IllegalStateException( "Can not construct reader for "+fmt, e);
-        }
-    }
-    
-    private Readers() {
-        // do not instantiate
-    }
-
-    public static LicenseReader get(File file) throws MalformedURLException {
-        return get(file.toURI().toURL());
-    }
-    
-    public static LicenseReader get(String fileName) throws MalformedURLException {
-        return get(new File(fileName));
-    }
-    
-    public static Format getFormat(URL file) {
-        return Format.fromName(file.getFile());
-    }
-    
-    public static Format getFormat(File file) throws MalformedURLException {
-        return getFormat(file.toURI().toURL());
-    }
-    
-    public static Format getFormat(String fileName) throws MalformedURLException {
-        return getFormat(new File(fileName));
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index a43d269ea..581e87757 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -26,12 +26,14 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
@@ -46,6 +48,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.commons.beanutils.MethodUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
@@ -54,7 +57,10 @@
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
 import org.apache.rat.configuration.builders.AbstractBuilder;
 import org.apache.rat.configuration.builders.ChildContainerBuilder;
+import org.apache.rat.configuration.builders.MatcherRefBuilder;
+import org.apache.rat.configuration.builders.TextCaptureBuilder;
 import org.apache.rat.license.ILicense;
+import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -77,29 +83,34 @@
     <approved>
         <family refid=''>
     </approved>
+    <matchers>
+        <matcher className=''/>
+    </matchers>
  */
 
 public class XMLConfigurationReader implements LicenseReader, MatcherReader {
 
-    enum MatcherType {
-        text, copyright, spdx, any, all, matcher_ref, not, regex
-    };
-
-    enum AttributeName {
-        id, name, license_ref, refid, start, end, owner, resource, derived_from, exp;
-    }
 
+    private final static String ATT_ID = "id";
+    private final static String ATT_NAME = "name";
+    private final static String ATT_DERIVED_FROM = "derived_from";
+    private final static String ATT_LICENSE_REF = "license_ref";
+    private final static String ATT_CLASS_NAME = "class";
+    
     private final static String ROOT = "rat-config";
     private final static String LICENSES = "licenses";
     private final static String LICENSE = "license";
     private final static String APPROVED = "approved";
     private final static String FAMILY = "family";
     private final static String NOTE = "note";
+    private final static String MATCHERS = "matchers";
+    private final static String MATCHER = "matcher";
 
     private Document document;
     private final Element rootElement;
     private final Element licensesElement;
     private final Element approvedElement;
+    private final Element matchersElement;
 
     private final SortedSet<ILicense> licenses;
     private final Map<String, IHeaderMatcher> matchers;
@@ -117,6 +128,8 @@ public XMLConfigurationReader() {
         rootElement.appendChild(licensesElement);
         approvedElement = document.createElement(APPROVED);
         rootElement.appendChild(approvedElement);
+        matchersElement = document.createElement(MATCHERS);
+        rootElement.appendChild(matchersElement);
         licenses = new TreeSet<>((x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily()));
         licenseFamilies = new TreeSet<>();
         matchers = new HashMap<>();
@@ -145,7 +158,7 @@ public void printDocument(OutputStream out, Document document) {
     }
 
     @Override
-    public void add(URL url) {
+    public void addLicenses(URL url) {
         read(url);
     }
 
@@ -177,16 +190,17 @@ public void add(Document newDoc) {
         nodeListConsumer(newDoc.getElementsByTagName(LICENSE),
                 (n) -> licensesElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
         nodeListConsumer(newDoc.getElementsByTagName(APPROVED),
-                (n) -> licensesElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
-
+                (n) -> approvedElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
+        nodeListConsumer(newDoc.getElementsByTagName(MATCHERS),
+                (n) -> matchersElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
     }
 
-    private Map<AttributeName, String> attributes(Node node) {
+    private Map<String, String> attributes(Node node) {
         NamedNodeMap nnm = node.getAttributes();
-        Map<AttributeName, String> result = new HashMap<>();
+        Map<String, String> result = new HashMap<>();
         for (int i = 0; i < nnm.getLength(); i++) {
             Node n = nnm.item(i);
-            result.put(AttributeName.valueOf(n.getNodeName()), n.getNodeValue());
+            result.put(n.getNodeName(), n.getNodeValue());
         }
         return result;
     }
@@ -197,88 +211,39 @@ public static IHeaderMatcher createTextMatcher(String id, String txt) {
         return complex ? new FullTextMatcher(id, txt) : new SimpleTextMatcher(id, txt);
     }
 
-    /**
-     * Reads a text file. Each line becomes a text matcher in the resulting List.
-     * 
-     * @param resourceName the name of the resource to read.
-     * @return a List of Matchers, one for each non empty line in the input file.
-     */
-    private List<IHeaderMatcher.Builder> readTextResource(String resourceName) {
-        URL url = XMLConfigurationReader.class.getResource(resourceName);
-        List<IHeaderMatcher.Builder> matchers = new ArrayList<>();
-        try (final InputStream in = url.openStream()) {
-            BufferedReader buffer = new BufferedReader(new InputStreamReader(in, "UTF-8"));
-            String txt;
-            while (null != (txt = buffer.readLine())) {
-                txt = txt.trim();
-                if (StringUtils.isNotBlank(txt)) {
-                    matchers.add(Builder.text().setText(txt));
-                }
-            }
-            return matchers;
-        } catch (IOException e) {
-            throw new ConfigurationException("Unable to read matching text file: " + resourceName, e);
-        }
-    }
-
     private AbstractBuilder parseMatcher(Node matcherNode) {
-        Map<AttributeName, String> attr = attributes(matcherNode);
-        MatcherType type = MatcherType.valueOf(matcherNode.getNodeName());
-        List<IHeaderMatcher.Builder> children;
-        AbstractBuilder builder = null;
-        switch (type) {
-        case text:
-            builder = Builder.text().setText(matcherNode.getTextContent().trim());
-            break;
-
-        case any:
-        case all:
-            if (attr.containsKey(AttributeName.resource)) {
-                children = readTextResource(attr.get(AttributeName.resource));
-            } else {
-                children = new ArrayList<>();
-                nodeListConsumer(matcherNode.getChildNodes(), x -> {
-                    if (x.getNodeType() == Node.ELEMENT_NODE) {
-                        children.add(parseMatcher(x));
-                    }
-                });
-            }
-            builder = type == MatcherType.any ? Builder.any() : Builder.all();
-            ((ChildContainerBuilder) builder).add(children);
-            break;
-
-        case copyright:
-            builder = Builder.copyright().setStart(attr.get(AttributeName.start)).setEnd(attr.get(AttributeName.end))
-                    .setOwner(attr.get(AttributeName.owner));
-            break;
-
-        case spdx:
-            builder = Builder.spdx().setName(attr.get(AttributeName.name));
-            break;
+        AbstractBuilder builder = MatcherBuilderTracker.getMatcherBuilder(matcherNode.getNodeName());
 
-        case matcher_ref:
-            builder = Builder.matcherRef().setRefId(attr.get(AttributeName.refid)).setMatchers(matchers);
-            break;
-
-        case not:
-            children = new ArrayList<>();
+        NamedNodeMap nnm = matcherNode.getAttributes();
+        for (int i = 0; i < nnm.getLength(); i++) {
+            Node n = nnm.item(i);
+            String methodName = "set" + StringUtils.capitalize(n.getNodeName());
+            try {
+                MethodUtils.invokeExactMethod(builder, methodName, n.getNodeValue());
+            } catch (NoSuchMethodException e) {
+                throw new ConfigurationException(
+                        String.format( "'%s' does not have a setter '%s' that takes a String argument",
+                        matcherNode.getNodeName(), methodName));
+            } catch (IllegalAccessException | InvocationTargetException | DOMException e) {
+                throw new ConfigurationException(e);
+            }
+        }
+        if (builder instanceof ChildContainerBuilder) {
+            ChildContainerBuilder ccb = (ChildContainerBuilder) builder;
             nodeListConsumer(matcherNode.getChildNodes(), x -> {
                 if (x.getNodeType() == Node.ELEMENT_NODE) {
-                    children.add(parseMatcher(x));
+                    ccb.add(parseMatcher(x));
                 }
             });
-            if (children.size() != 1) {
-                throw new ConfigurationException("'not' type matcher requires one and only one enclosed matcher");
-            }
-            builder = Builder.not().setChild(children.get(0));
-
-            break;
+        }
+        if (builder instanceof TextCaptureBuilder) {
+            ((TextCaptureBuilder) builder).setText(matcherNode.getTextContent().trim());
+        }
 
-        case regex:
-            builder = Builder.regex().setExpression(attr.get(AttributeName.exp));
+        if (builder instanceof MatcherRefBuilder) {
+            ((MatcherRefBuilder) builder).setMatchers(matchers);
         }
 
-        builder.setId(attr.get(AttributeName.id));
         if (builder.hasId()) {
             builder = new DelegatingBuilder(builder) {
                 @Override
@@ -293,11 +258,11 @@ public IHeaderMatcher build() {
     }
 
     private ILicense parseLicense(Node licenseNode) {
-        Map<AttributeName, String> attributes = attributes(licenseNode);
+        Map<String, String> attributes = attributes(licenseNode);
         ILicense.Builder builder = ILicense.builder();
 
-        builder.setLicenseFamilyCategory(attributes.get(AttributeName.id));
-        builder.setLicenseFamilyName(attributes.get(AttributeName.name));
+        builder.setLicenseFamilyCategory(attributes.get(ATT_ID));
+        builder.setLicenseFamilyName(attributes.get(ATT_NAME));
 
         StringBuilder notesBuilder = new StringBuilder();
         nodeListConsumer(licenseNode.getChildNodes(), x -> {
@@ -309,13 +274,14 @@ private ILicense parseLicense(Node licenseNode) {
                 }
             }
         });
-        builder.setDerivedFrom(StringUtils.defaultIfBlank(attributes.get(AttributeName.derived_from), null));
+        builder.setDerivedFrom(StringUtils.defaultIfBlank(attributes.get(ATT_DERIVED_FROM), null));
         builder.setNotes(StringUtils.defaultIfBlank(notesBuilder.toString().trim(), null));
         return builder.build();
     }
 
     @Override
     public SortedSet<ILicense> readLicenses() {
+        readMatcherBuilders();
         if (licenses.size() == 0) {
             nodeListConsumer(document.getElementsByTagName(LICENSE), x -> licenses.add(parseLicense(x)));
             nodeListConsumer(document.getElementsByTagName(FAMILY), x -> licenseFamilies.add(parseFamily(x)));
@@ -325,11 +291,11 @@ public SortedSet<ILicense> readLicenses() {
     }
 
     private String parseFamily(Node familyNode) {
-        Map<AttributeName, String> attributes = attributes(familyNode);
-        if (attributes.containsKey(AttributeName.license_ref)) {
-            return attributes.get(AttributeName.license_ref);
+        Map<String, String> attributes = attributes(familyNode);
+        if (attributes.containsKey(ATT_LICENSE_REF)) {
+            return attributes.get(ATT_LICENSE_REF);
         }
-        throw new ConfigurationException("family tag requires " + AttributeName.license_ref + " attribute");
+        throw new ConfigurationException("family tag requires " + ATT_LICENSE_REF + " attribute");
     }
 
     @Override
@@ -351,6 +317,23 @@ public abstract class DelegatingBuilder extends AbstractBuilder {
         DelegatingBuilder(AbstractBuilder delegate) {
             this.delegate = delegate;
         }
+    }
 
+    private void parseMatcherBuilder(Node classNode) {
+        Map<String, String> attributes = attributes(classNode);
+        if (attributes.get(ATT_CLASS_NAME) == null) {
+            throw new ConfigurationException( "matcher must have a "+ATT_CLASS_NAME+" attribute");
+        }
+        MatcherBuilderTracker.addBuilder(attributes.get(ATT_CLASS_NAME), attributes.get(ATT_NAME));
+    }
+
+    @Override
+    public void readMatcherBuilders() {
+        nodeListConsumer(document.getElementsByTagName(MATCHER), x -> parseMatcherBuilder(x));
+    }
+
+    @Override
+    public void addMatchers(URL url) {
+        read(url);
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
index 8fae5b058..3e4f43929 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
@@ -18,20 +18,51 @@
  */
 package org.apache.rat.configuration.builders;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.Builder;
 
 public abstract class ChildContainerBuilder extends AbstractBuilder {
 
-    List<IHeaderMatcher.Builder> children = new ArrayList<IHeaderMatcher.Builder>();
+    protected final List<IHeaderMatcher.Builder> children = new ArrayList<IHeaderMatcher.Builder>();
 
     protected ChildContainerBuilder() {
     }
 
+    /**
+     * Reads a text file. Each line becomes a text matcher in the resulting List.
+     * 
+     * @param resourceName the name of the resource to read.
+     * @return a List of Matchers, one for each non empty line in the input file.
+     */
+    public AbstractBuilder setResource(String resourceName) {
+          URL url = this.getClass().getResource(resourceName);
+            try (final InputStream in = url.openStream()) {
+                BufferedReader buffer = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+                String txt;
+                while (null != (txt = buffer.readLine())) {
+                    txt = txt.trim();
+                    if (StringUtils.isNotBlank(txt)) {
+                        children.add(Builder.text().setText(txt));
+                    }
+                }
+                return this;
+            } catch (IOException e) {
+                throw new ConfigurationException("Unable to read matching text file: " + resourceName, e);
+            }
+    }
+    
     public AbstractBuilder add(IHeaderMatcher.Builder child) {
         children.add(child);
         return this;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
index df10f54fe..64ebda142 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
@@ -22,20 +22,13 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.NotMatcher;
 
-public class NotBuilder extends AbstractBuilder {
-
-    IHeaderMatcher.Builder child;
-
-    public AbstractBuilder setChild(IHeaderMatcher.Builder child) {
-        this.child = child;
-        return this;
-    }
-
+public class NotBuilder extends ChildContainerBuilder {
+    
     @Override
     public IHeaderMatcher build() {
-        if (child == null) {
-            throw new ConfigurationException("NotBuilder child must be set");
+        if (children.size() != 1) {
+            throw new ConfigurationException("'not' type matcher requires one and only one enclosed matcher");
         }
-        return new NotMatcher(getId(), child.build());
+        return new NotMatcher(getId(), children.get(0).build());
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
index 9defc907c..957f41e46 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
@@ -28,7 +28,7 @@ public class RegexBuilder extends AbstractBuilder {
 
     private Pattern exp;
 
-    public RegexBuilder setExpression(String exp) {
+    public RegexBuilder setRegex(String exp) {
         if (null == exp) {
             throw new ConfigurationException("'regex' type matcher expression value may not be null");
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
index e1f5ee99d..328a7a314 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
@@ -24,7 +24,7 @@
 import org.apache.rat.analysis.matchers.FullTextMatcher;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
 
-public class TextBuilder extends AbstractBuilder {
+public class TextBuilder extends AbstractBuilder implements TextCaptureBuilder {
 
     private String text;
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java
new file mode 100644
index 000000000..3844e8175
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.configuration.builders;
+
+public interface TextCaptureBuilder {
+    <T extends TextCaptureBuilder> T setText(String text);
+}
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index 331e806f8..24773c3fa 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -9,7 +9,7 @@
 		<spdx name=''/> 
 		<and> <license>...</and>
 		<or> <license>...</or> 
-		<matcher_ref refid='licenceid' />
+		<matcherRef refId='licenceid' />
 	</license>
 -->
 		<license id="AL" name="Apache License Version 2.0">
@@ -38,7 +38,7 @@
 
 		<license id="ASL" name="Applied Apahce License Version 2.0">
 			<all>
-				<matcher_ref refid="ALStandard" />
+				<matcherRef refId="ALStandard" />
 				<copyright />
 			</all>
 		</license>
@@ -166,7 +166,7 @@
 				<text>TMF854 Version 1.0</text>
 				<copyright
 					owner="TeleManagement Forum" />
-				<matcher_ref refid="BSD-3-txt" />
+				<matcherRef refId="BSD-3-txt" />
 			</all>
 		</license>
 
@@ -254,4 +254,14 @@
 		<family license_ref='W3C' />
 		<family license_ref='W3CD' />
 	</approved>
+	<matchers>
+		<matcher class="org.apache.rat.configuration.builders.AllBuilder" />
+		<matcher class="org.apache.rat.configuration.builders.AnyBuilder" />
+		<matcher class="org.apache.rat.configuration.builders.CopyrightBuilder" />
+		<matcher class="org.apache.rat.configuration.builders.MatcherRefBuilder"/>
+		<matcher class="org.apache.rat.configuration.builders.NotBuilder" />
+		<matcher class="org.apache.rat.configuration.builders.RegexBuilder" />
+		<matcher class="org.apache.rat.configuration.builders.SpdxBuilder" />
+		<matcher class="org.apache.rat.configuration.builders.TextBuilder" />
+	</matchers>
 </rat-config>
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index da9d13349..475810acd 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -17,11 +17,22 @@
 package org.apache.rat.configuration;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.net.URL;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
+import org.apache.rat.configuration.builders.AbstractBuilder;
+import org.apache.rat.configuration.builders.AllBuilder;
+import org.apache.rat.configuration.builders.AnyBuilder;
+import org.apache.rat.configuration.builders.CopyrightBuilder;
+import org.apache.rat.configuration.builders.MatcherRefBuilder;
+import org.apache.rat.configuration.builders.NotBuilder;
+import org.apache.rat.configuration.builders.RegexBuilder;
+import org.apache.rat.configuration.builders.SpdxBuilder;
+import org.apache.rat.configuration.builders.TextBuilder;
 import org.junit.Test;
 
 public class ConfigurationReaderTest {
@@ -51,5 +62,28 @@ public void LicensesTest() {
                 .map(x -> x.getLicenseFamily().getFamilyCategory()).collect(Collectors.toList());
         assertArrayEquals(EXPECTED_LICENSES, readCategories.toArray(new String[readCategories.size()]));
     }
+    
+    private void checkMatcher( String name, Class<? extends AbstractBuilder> clazz)
+    {
+        AbstractBuilder builder =  MatcherBuilderTracker.getMatcherBuilder(name);
+        assertNotNull( builder );
+        assertTrue( name+" is not an instanceof "+clazz.getName(), clazz.isAssignableFrom(builder.getClass()));
+    }
+    
+    @Test
+    public void checkSystemMatcherTest() {
+        XMLConfigurationReader reader = new XMLConfigurationReader();
+        URL url = ConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
+        reader.read(url);
+        reader.readMatcherBuilders();
+        checkMatcher( "all", AllBuilder.class);
+        checkMatcher( "any", AnyBuilder.class);
+        checkMatcher( "copyright", CopyrightBuilder.class);
+        checkMatcher( "matcherRef", MatcherRefBuilder.class);
+        checkMatcher( "not", NotBuilder.class);
+        checkMatcher( "regex", RegexBuilder.class);
+        checkMatcher( "spdx", SpdxBuilder.class);
+        checkMatcher( "text", TextBuilder.class);
+    }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
index df8d67800..44621f5a0 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
@@ -19,14 +19,18 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 
+import java.io.File;
+import java.net.MalformedURLException;
+
 import org.junit.Test;
 
 public class FormatTest {
     @Test
-    public void fromNameTest() {
+    public void fromNameTest() throws MalformedURLException {
         assertEquals(Format.XML, Format.fromName("foo/x.xml"));
         assertEquals(Format.XML, Format.fromName("x.xml"));
         assertThrows(IllegalArgumentException.class, () ->Format.fromName("junk"));
+        assertEquals(Format.XML, Format.fromFile( new File("foo/y.xml")));
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
deleted file mode 100644
index 0778f4f8e..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ReadersTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rat.configuration;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-
-import java.net.MalformedURLException;
-
-import org.junit.Test;
-
-public class ReadersTest {
-    @Test
-    public void getTest() throws MalformedURLException {
-        assertEquals(Format.XML, Readers.getFormat( "foo/x.xml"));
-        assertEquals(Format.XML,  Readers.getFormat("x.xml"));
-        assertThrows( IllegalArgumentException.class, () -> Readers.getFormat("x.junk"));
-    }
-}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 2012a3813..94c5a3492 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -33,6 +33,7 @@
 import java.io.Reader;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -52,8 +53,10 @@
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.config.SourceCodeManagementSystems;
+import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
-import org.apache.rat.configuration.Readers;
+import org.apache.rat.configuration.MatcherReader;
+import org.apache.rat.configuration.MatcherBuilderTracker;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.mp.util.ScmIgnoreParser;
 import org.apache.rat.report.IReportable;
@@ -246,14 +249,24 @@ protected Defaults.Builder getDefaultsBuilder() {
     protected ReportConfiguration getConfiguration() throws MojoExecutionException {
         @SuppressWarnings("resource")
         ReportConfiguration result = new ReportConfiguration();
+        
         if (additionalLicenseFiles != null) {
-            for (int i = 0; i < additionalLicenseFiles.length; i++) {
+            for (String licenseFile : additionalLicenseFiles) {
                 try {
-                    LicenseReader reader = Readers.get(additionalLicenseFiles[i]);
-                    result.addLicenses(reader.readLicenses());
-                    result.addApprovedLicenseCategories(reader.approvedLicenseId());
+                    URL url = new File(licenseFile).toURI().toURL();
+                    Format fmt = Format.fromName(licenseFile);
+                    MatcherReader mReader = fmt.matcherReader();
+                    if (mReader != null) {
+                        mReader.addMatchers(url);
+                    }
+                    LicenseReader lReader = fmt.licenseReader();
+                    if (lReader != null) {
+                            lReader.addLicenses(url);
+                    result.addLicenses(lReader.readLicenses());
+                    result.addApprovedLicenseCategories(lReader.approvedLicenseId());
+                    }
                 } catch (MalformedURLException e) {
-                    throw new ConfigurationException(additionalLicenseFiles[i] + " is not a valid license file", e);
+                    throw new ConfigurationException(licenseFile + " is not a valid license file", e);
                 }
             }
         }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
index 49d58876d..c2a668919 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
@@ -31,7 +31,7 @@ public Not() {
 
     @Override
     protected void setBuilder(IHeaderMatcher.Builder builder) {
-        this.builder.setChild(builder);
+        this.builder.add(builder);
     }
 
     @Override
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
index f2ff8f4fc..d0aec75d9 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
@@ -32,6 +32,6 @@ public IHeaderMatcher build() {
     }
     
     public void add(IHeaderMatcher.Builder builder) {
-        this.builder.setChild(builder);
+        this.builder.add(builder);
     }
 }
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
index 15036fdf5..20c3b1c22 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
@@ -26,11 +26,11 @@ public class Regex implements IHeaderMatcher.Builder {
     private RegexBuilder builder = new RegexBuilder();
 
     public void setRegex(String pattern) {
-        builder.setExpression(pattern);
+        builder.setRegex(pattern);
     }
     
     public void addText(String pattern) {
-        builder.setExpression(pattern);
+        builder.setRegex(pattern);
     }
 
     @Override
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 3f78f99d4..af205e555 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -24,6 +24,7 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -33,8 +34,10 @@
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.Reporter;
+import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
-import org.apache.rat.configuration.Readers;
+import org.apache.rat.configuration.MatcherReader;
+import org.apache.rat.configuration.MatcherBuilderTracker;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -144,10 +147,18 @@ public void setFormat(String style) {
 
     public void setLicenses(File fileName) {
         try {
-            LicenseReader reader = Readers.get(fileName);
-            reader.add(fileName.toURI().toURL());
-            configuration.addLicenses(reader.readLicenses());
-            configuration.addApprovedLicenseCategories(reader.approvedLicenseId());
+            URL url = fileName.toURI().toURL();
+            Format fmt = Format.fromFile(fileName);
+            MatcherReader mReader = fmt.matcherReader();
+            if (mReader != null) {
+                mReader.addMatchers(url);
+            }
+            LicenseReader lReader = fmt.licenseReader();
+            if (lReader != null) {
+                    lReader.addLicenses(url);
+            configuration.addLicenses(lReader.readLicenses());
+            configuration.addApprovedLicenseCategories(lReader.approvedLicenseId());
+            }
         } catch (MalformedURLException e) {
             throw new BuildException("Can not read license file " + fileName, e);
         }
diff --git a/apache-rat-tasks/src/test/resources/antunit/customLicense.xml b/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
index f55a3d5a8..b798d6ad0 100644
--- a/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
@@ -34,7 +34,7 @@
 	</license>
 -->
 		<license id="EXAMPLE" name="Example License">
-			<regex exp='.' />
+			<regex regex='.' />
 		</license>
 
 	</licenses>

From c457a07f3768e6e2aebb4c326247170727fcaec2 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 4 Oct 2023 18:10:46 +0200
Subject: [PATCH 105/299] modifications for not calculations

---
 .../rat/analysis/HeaderCheckWorker.java       | 16 +++--
 .../apache/rat/analysis/IHeaderMatcher.java   | 54 +++++++++++++---
 .../rat/analysis/LicenseCollection.java       | 55 ++++++++++++++--
 .../rat/analysis/license/BaseLicense.java     | 12 +++-
 .../matchers/AbstractMatcherContainer.java    |  7 +++
 .../matchers/AbstractSimpleMatcher.java       | 62 +++++++++++++++++++
 .../rat/analysis/matchers/AndMatcher.java     | 48 +++++++-------
 .../analysis/matchers/CopyrightMatcher.java   | 26 ++++++--
 .../analysis/matchers/FullTextMatcher.java    | 43 +++++--------
 .../rat/analysis/matchers/NotMatcher.java     | 21 ++++++-
 .../rat/analysis/matchers/OrMatcher.java      | 44 +++++++++++--
 .../analysis/matchers/SPDXMatcherFactory.java |  8 +--
 .../analysis/matchers/SimpleRegexMatcher.java | 11 +---
 .../analysis/matchers/SimpleTextMatcher.java  | 11 +---
 .../builders/MatcherRefBuilder.java           | 12 +++-
 .../java/org/apache/rat/license/ILicense.java | 14 ++++-
 .../org/apache/rat/license/SimpleLicense.java | 14 ++++-
 .../rat/analysis/AnalyserFactoryTest.java     |  5 +-
 .../analysis/license/AbstractLicenseTest.java |  3 +-
 .../analysis/license/DirectoryScanner.java    |  3 +-
 .../rat/analysis/matchers/AndMatcherTest.java | 11 ++--
 .../matchers/CopyrightMatcherTest.java        |  6 +-
 .../rat/analysis/matchers/NotMatcherTest.java | 14 +++--
 .../rat/report/xml/XmlReportFactoryTest.java  |  5 +-
 .../apache/rat/report/xml/XmlReportTest.java  |  3 +-
 25 files changed, 384 insertions(+), 124 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index 1fe853457..2198768a6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -23,6 +23,7 @@
 import java.io.Reader;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
@@ -39,8 +40,6 @@ class HeaderCheckWorker {
     private final BufferedReader reader;
     private final ILicense license;
     private final Document document;
-    
-    private boolean match = false;
 
     private int headerLinesToRead;
     private boolean finished = false;
@@ -80,7 +79,7 @@ public void read() throws RatHeaderAnalysisException {
                 while(readLine(headers)) {
                     // do nothing
                 }
-                if (!match) {
+                if (!license.finalizeState().asBoolean()) {
                     final String notes = headers.toString();
                     final MetaData metaData = document.getMetaData();
                     metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
@@ -104,11 +103,16 @@ boolean readLine(StringBuilder headers) throws IOException, RatHeaderAnalysisExc
                 headers.append(line);
                 headers.append('\n');
             }
-            match = license.matches(line);
-            if (match) {
+            switch (license.matches(line)) {
+            case t:
                 document.getMetaData().reportOnLicense(license);
+                result = false;
+                break;
+            case f:
+            case i:
+                result = true;
+                break;
             }
-            result = !match;
         }
         return result;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 5a885b75e..85a51ba3d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -31,6 +31,34 @@
  * Matches text headers to known licenses.
  */
 public interface IHeaderMatcher {
+    /**
+     * The state of the matcher.
+     * </ul>
+     * <li>{@code t} - The matcher has located a match.</li>
+     * <li>{@code f} - The matcher has determined that it will not match the
+     * document.</li>
+     * <li>{@code i} - The matcher can not yet determine if a matche is made or
+     * not.</li>
+     * </ul>
+     */
+    enum State {
+        t("true"), f("false"), i("indeterminent");
+
+        private String desc;
+
+        State(String desc) {
+            this.desc = desc;
+        }
+
+        public boolean asBoolean() {
+            switch (this) {
+            case t : return true;
+            case f : return false;
+            default:
+            case i : throw new IllegalStateException( "'asBoolean' should never be called on an indeterminate state");
+            }
+        }
+    }
 
     /**
      * Get the identifier for this matcher.
@@ -46,18 +74,30 @@ public interface IHeaderMatcher {
     void reset();
 
     /**
-     * Matches the text accumulated to licenses. TODO probably a poor design choice
-     * - hope to fix later
+     * Attempts to match the text after adding the line and returns the State after
+     * the match is attempted.
      * 
-     * @param subject current document.
      * @param line next line of text, not null
-     * 
-     * @return whether the current line matched in the document.
+     * @return the new state after the matching was attempted.
      * 
      * @throws RatHeaderAnalysisException in case of internal RAT errors.
      */
-    boolean matches(String line);
-    
+    State matches(String line);
+
+    /**
+     * Gets the final state for this matcher. This is called after the EOF on the
+     * input. At this point there should be no matchers in an indeterminent state.
+     */
+    State finalizeState();
+
+    /**
+     * Gets the the current state of the matcher. All matchers should be
+     * indeterminant at the start.
+     * 
+     * @return the current state of the matcher.
+     */
+    State currentState();
+
     @FunctionalInterface
     interface Builder {
         IHeaderMatcher build();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
index adbf64573..7427b4057 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
@@ -20,18 +20,22 @@
 
 import java.util.Collection;
 
+import org.apache.rat.analysis.matchers.AbstractMatcherContainer;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-class LicenseCollection implements ILicense {
+class LicenseCollection extends AbstractMatcherContainer implements ILicense {
     private static final ILicenseFamily DEFAULT = ILicenseFamily.builder().setLicenseFamilyCategory("Dummy")
             .setLicenseFamilyName("HeaderMatcherCollection default license family").build();
     private Collection<ILicense> enclosed;
     private ILicense matchingLicense;
+    private State lastState;
 
     public LicenseCollection(Collection<ILicense> enclosed) {
-        this.matchingLicense = null;
+        super(enclosed);
         this.enclosed = enclosed;
+        this.matchingLicense = null;
+        this.lastState = State.i;
     }
 
     @Override
@@ -42,17 +46,52 @@ public String getId() {
     @Override
     public void reset() {
         enclosed.stream().forEach(ILicense::reset);
+        this.lastState = State.i;
+        this.matchingLicense = null;
     }
 
     @Override
-    public boolean matches(String line) {
+    public State matches(String line) {
+        State dflt = State.f;
         for (ILicense license : enclosed) {
-            if (license.matches(line)) {
+            switch (license.matches(line)) {
+            case t:
                 this.matchingLicense = license;
-                return true;
+                lastState = State.t;
+                return State.t;
+            case i:
+                dflt = State.i;
+                break;
+            default:
+                // do nothing
+                break;
             }
         }
-        return false;
+        lastState = dflt;
+        return dflt;
+    }
+
+    @Override
+    public State currentState() {
+        if (lastState == State.t) {
+            return lastState;
+        }
+        for (ILicense license : enclosed) {
+            switch (license.currentState()) {
+            case t:
+                this.matchingLicense = license;
+                lastState = State.t;
+                return lastState;
+            case i:
+                lastState = State.i;
+                return lastState;
+            case f:
+                // do nothing;
+                break;
+            }
+        }
+        lastState = State.f;
+        return lastState;
     }
 
     @Override
@@ -60,15 +99,19 @@ public int compareTo(ILicense arg0) {
         return getLicenseFamily().compareTo(arg0.getLicenseFamily());
     }
 
+    @Override
     public ILicenseFamily getLicenseFamily() {
         return matchingLicense == null ? DEFAULT : matchingLicense.getLicenseFamily();
     }
 
+    @Override
     public String getNotes() {
         return matchingLicense == null ? null : matchingLicense.getNotes();
     }
 
+    @Override
     public String derivedFrom() {
         return matchingLicense == null ? null : matchingLicense.derivedFrom();
     }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 494c1e025..9cefeceda 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -66,10 +66,20 @@ public String getNotes() {
     }
 
     @Override
-    public boolean matches(String line) {
+    public State matches(String line) {
         return matcher.matches(line);
     }
     
+    @Override
+    public State currentState() {
+        return matcher.currentState();
+    }
+    
+    @Override
+    public State finalizeState() {
+        return matcher.finalizeState();
+    }
+    
     @Override
     public void reset() {
         matcher.reset();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index d2bdbcfe2..38224cd6e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -22,6 +22,7 @@
 import java.util.Collection;
 
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 
 public abstract class AbstractMatcherContainer extends AbstractHeaderMatcher {
 
@@ -41,4 +42,10 @@ public AbstractMatcherContainer(Collection<? extends IHeaderMatcher> enclosed) {
     public void reset() {
         enclosed.stream().forEach(x -> x.reset());
     }
+
+    @Override
+    public State finalizeState() {
+        enclosed.forEach(IHeaderMatcher::finalizeState);
+        return currentState();
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
new file mode 100644
index 000000000..c571d8a55
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.matchers;
+
+import java.util.regex.Pattern;
+
+public abstract class AbstractSimpleMatcher extends AbstractHeaderMatcher {
+    private Pattern pattern;
+    private State lastState;
+
+    public AbstractSimpleMatcher(String id) {
+        super(id);
+        this.lastState = State.i;
+    }
+
+    abstract protected boolean doMatch(String line);
+    
+    @Override
+    public final State matches(String line) {
+        if (lastState == State.t) {
+            return lastState;
+        }
+        if (line != null && doMatch(line)) {
+            lastState = State.t;
+        }
+        return lastState;
+    }
+
+    @Override
+    public void reset() {
+        lastState = State.i;
+    }
+
+    @Override
+    public final State finalizeState() {
+        if (lastState == State.i) {
+            lastState = State.f;
+        }
+        return lastState;
+    }
+
+    @Override
+    public final State currentState() {
+        return lastState;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
index d2bf3181c..b895e83c6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -18,44 +18,48 @@
  */
 package org.apache.rat.analysis.matchers;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 
 public class AndMatcher extends AbstractMatcherContainer {
-    private boolean[] flags = null;
-
+    
     public AndMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
-        flags = new boolean[enclosed.size()];
     }
 
     public AndMatcher(Collection<? extends IHeaderMatcher> enclosed) {
-        super(enclosed);
-        flags = new boolean[enclosed.size()];
+        this(null,enclosed);
     }
 
     @Override
-    public void reset() {
-        super.reset();
-        flags = new boolean[enclosed.size()];
+    public State currentState() {
+        State dflt = State.t;
+        for (IHeaderMatcher matcher : enclosed) {
+            switch (matcher.currentState()) {
+            case f: return State.f;
+            case i: dflt = State.i;
+            break;
+            default:
+                // do nothing
+                break;
+            }
+        }
+        return dflt;
+    }
+    
+    @Override
+    public State matches(String line) {
+        enclosed.stream().filter( x -> x.currentState() == State.i).forEach(x -> x.matches(line));
+        return currentState();
     }
 
     @Override
-    public boolean matches(String line) {
-        boolean result = true;
-        Iterator<IHeaderMatcher> iter = enclosed.iterator();
-        int i = 0;
-        while (iter.hasNext()) {
-            if (flags[i]) {
-                iter.next();
-            } else {
-                flags[i] = iter.next().matches(line);
-                result &= flags[i];
-            }
-            i++;
-        }
-        return result;
+    public State finalizeState() {
+        enclosed.forEach(IHeaderMatcher::finalizeState);
+        return currentState();
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index dffa74fc9..a9dd46e83 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -56,6 +56,8 @@ public class CopyrightMatcher extends AbstractHeaderMatcher {
 
     private final Pattern dateOwnerPattern;
     private final Pattern ownerDatePattern;
+    
+    private State state;
 
     public CopyrightMatcher(String start, String stop, String owner) {
         this(null, start, stop, owner);
@@ -63,6 +65,7 @@ public CopyrightMatcher(String start, String stop, String owner) {
     
     public CopyrightMatcher(String id, String start, String stop, String owner) {
         super(id);
+        state = State.i;
         String dateDefn = "";
         if (StringUtils.isNotEmpty(start)) {
             if (StringUtils.isNotEmpty(stop)) {
@@ -91,26 +94,39 @@ public CopyrightMatcher(String id, String start, String stop, String owner) {
     }
 
     @Override
-    public boolean matches(String line) {
+    public State matches(String line) {
         Matcher matcher = COPYRIGHT_PATTERN.matcher(line);
         if (matcher.find()) {
             String buffer = line.substring(matcher.end());
             matcher = dateOwnerPattern.matcher(buffer);
             if (matcher.find() && matcher.start() == 0) {
-                return true;
+                this.state = State.t;
             }
             if (ownerDatePattern != null) {
                 matcher = ownerDatePattern.matcher(buffer);
                 if (matcher.find() && matcher.start() == 0) {
-                    return true;
+                    this.state = State.t;
                 }
             }
-            return false;
         }
-        return false;
+        return currentState();
+    }
+    
+    @Override
+    public State currentState() {
+        return state;
     }
 
     @Override
     public void reset() {
+        state = State.i;
+    }
+
+    @Override
+    public State finalizeState() {
+        if (state == State.i) {
+            state = State.f;
+        }
+        return state;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
index 9964e4e3d..ada72656d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -32,7 +32,7 @@
  *
  * @since Rat 0.9
  */
-public class FullTextMatcher extends AbstractHeaderMatcher {
+public class FullTextMatcher extends AbstractSimpleMatcher {
 
     // Number of match characters assumed to be present on first line
     private static final int DEFAULT_INITIAL_LINE_LENGTH = 20;
@@ -43,8 +43,6 @@ public class FullTextMatcher extends AbstractHeaderMatcher {
 
     private boolean seenFirstLine = false;
 
-    private boolean result = false;
-
     private final StringBuilder buffer = new StringBuilder();
 
     public FullTextMatcher(String fullText) {
@@ -53,7 +51,14 @@ public FullTextMatcher(String fullText) {
 
     public FullTextMatcher(String id, String fullText) {
         super(id);
-        setFullText(fullText);
+        int offset = fullText.indexOf('\n');
+        if (offset == -1) {
+            offset = Math.min(DEFAULT_INITIAL_LINE_LENGTH, fullText.length());
+        }
+        firstLine = prune(fullText.substring(0, offset)).toLowerCase(Locale.ENGLISH);
+        this.fullText = prune(fullText).toLowerCase(Locale.ENGLISH);
+        buffer.setLength(0);
+        seenFirstLine = false;
     }
 
     /**
@@ -74,25 +79,12 @@ public static final String prune(String text) {
         return buffer.toString();
     }
 
-    public final void setFullText(String text) {
-        int offset = text.indexOf('\n');
-        if (offset == -1) {
-            offset = Math.min(DEFAULT_INITIAL_LINE_LENGTH, text.length());
-        }
-        firstLine = prune(text.substring(0, offset)).toLowerCase(Locale.ENGLISH);
-        fullText = prune(text).toLowerCase(Locale.ENGLISH);
-        init();
-    }
-
     public final boolean hasFullText() {
         return fullText != null;
     }
 
     @Override
-    public boolean matches(String line) {
-        if (result) {
-            return true;
-        }
+    public boolean doMatch(String line) {
         final String inputToMatch = prune(line).toLowerCase(Locale.ENGLISH);
         if (seenFirstLine) { // Accumulate more input
             buffer.append(inputToMatch);
@@ -111,8 +103,7 @@ public boolean matches(String line) {
 
         if (buffer.length() >= fullText.length()) { // we have enough data to match
             if (buffer.toString().contains(fullText)) {
-                result = true;
-                return true; // we found a match
+                return true;
             }
             // buffer contains first line but does not contain full text
             // It's possible that the buffer contains the first line again
@@ -120,21 +111,17 @@ public boolean matches(String line) {
             if (offset >= 0) { // first line found again
                 buffer.delete(0, offset); // reset buffer to the new start
             } else { // buffer does not even contain first line, so cannot be used to match full text
-                init();
+                reset();
             }
         }
         return false;
     }
 
-    @Override
-    public void reset() {
-        init();
-    }
-
     // This is called indirectly from a ctor so must be final or private
-    private void init() {
+    public void reset() {
+        super.reset();
         buffer.setLength(0);
         seenFirstLine = false;
-        result = false;
     }
+
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
index 6dabf42db..b6eeec7b1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
@@ -34,12 +34,29 @@ public NotMatcher(String id, IHeaderMatcher enclosed) {
     }
 
     @Override
-    public boolean matches(String line) {
-        return !enclosed.matches(line);
+    public State matches(String line) {
+        enclosed.matches(line);
+        return currentState();
     }
 
     @Override
     public void reset() {
         enclosed.reset();
     }
+
+    @Override
+    public State finalizeState() {
+        enclosed.finalizeState();
+        return currentState();
+    }
+
+    @Override
+    public State currentState() {
+        switch (enclosed.currentState()) {
+        case t : return State.f;
+        case f : return State.t;
+        default:
+        case i : return State.i;
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
index ba7bbb485..6b3aa3a3d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
@@ -24,21 +24,55 @@
 
 public class OrMatcher extends AbstractMatcherContainer {
 
+    State lastState;
+
     public OrMatcher(Collection<? extends IHeaderMatcher> enclosed) {
-        super(enclosed);
+        this(null, enclosed);
     }
 
     public OrMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
+        lastState = State.i;
+    }
+
+    @Override
+    public State matches(String line) {
+        if (lastState == State.t) {
+            return State.t;
+        }
+        for (IHeaderMatcher matcher : enclosed) {
+            switch (matcher.matches(line)) {
+            case t:
+                lastState = State.t;
+                return lastState;
+            case f:
+            case i:
+                lastState = State.i;
+            }
+        }
+        return lastState;
     }
 
     @Override
-    public boolean matches(String line) {
+    public State currentState() {
+        if (lastState == State.t) {
+            return lastState;
+        }
         for (IHeaderMatcher matcher : enclosed) {
-            if (matcher.matches(line)) {
-                return true;
+            switch (matcher.currentState()) {
+            case t:
+                lastState = State.t;
+                return lastState;
+            case i:
+                lastState = State.i;
+                return lastState;
+            case f:
+                // do nothing;
+                break;
             }
         }
-        return false;
+        lastState = State.f;
+        return lastState;
     }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index 7e21a8a72..ecf478a39 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -84,7 +84,7 @@ private boolean check(String line, Match caller) {
         return caller == lastMatch;
     }
 
-    public class Match extends AbstractHeaderMatcher {
+    public class Match extends AbstractSimpleMatcher {
         
         /**
          * Constructor.
@@ -100,11 +100,7 @@ public class Match extends AbstractHeaderMatcher {
         }
 
         @Override
-        public void reset() {
-        }
-
-        @Override
-        public boolean matches(String line) {
+        protected boolean doMatch(String line) {
             return SPDXMatcherFactory.this.check(line, this);
         }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
index 615370709..960a1d704 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
@@ -23,7 +23,7 @@
 /**
  * @since Rat 0.8
  */
-public class SimpleRegexMatcher extends AbstractHeaderMatcher {
+public class SimpleRegexMatcher extends AbstractSimpleMatcher {
     private Pattern pattern;
 
     /**
@@ -44,12 +44,7 @@ public SimpleRegexMatcher(String id, Pattern pattern) {
     }
 
     @Override
-    public boolean matches(String line) {
-        return line != null && pattern.matcher(line).find();
-    }
-
-    @Override
-    public void reset() {
-        // Nothing to do
+    public boolean doMatch(String line) {
+        return pattern.matcher(line).find();
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index cc142da58..1f1bedbcb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -23,7 +23,7 @@
 /**
  * @since Rat 0.8
  */
-public class SimpleTextMatcher extends AbstractHeaderMatcher {
+public class SimpleTextMatcher extends AbstractSimpleMatcher {
     private String pattern;
 
     /**
@@ -47,12 +47,7 @@ public SimpleTextMatcher(String id, String pattern) {
     }
 
     @Override
-    public boolean matches(String line) {
-        return line != null && line.contains(pattern);
-    }
-
-    @Override
-    public void reset() {
-        // Nothing to do
+    public boolean doMatch(String line) {
+        return line.contains(pattern);
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
index 3bdfacd57..b22e3c62d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
@@ -75,10 +75,20 @@ public void reset() {
         }
 
         @Override
-        public boolean matches(String line) {
+        public State matches(String line) {
             checkProxy();
             return wrapped.matches(line);
         }
+
+        @Override
+        public State currentState() {
+            return wrapped.currentState();
+        }
+
+        @Override
+        public State finalizeState() {
+            return wrapped.finalizeState();
+        }
     }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 0424b8b40..a84abd6e4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -57,8 +57,8 @@ public void reset() {
             }
 
             @Override
-            public boolean matches(String line) {
-                return false;
+            public State matches(String line) {
+                return State.f;
             }
 
             @Override
@@ -81,6 +81,16 @@ public String derivedFrom() {
                 return null;
             }
 
+            @Override
+            public State finalizeState() {
+                return State.f;
+            }
+
+            @Override
+            public State currentState() {
+                return State.f;
+            }
+
         };
         return search(target, licenses);
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index 7016568d2..da392b410 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -70,9 +70,19 @@ public void reset() {
     }
 
     @Override
-    public boolean matches(String line) {
+    public State matches(String line) {
         return matcher.matches(line);
     }
+    
+    @Override
+    public State finalizeState() {
+        return matcher.finalizeState();
+    }
+
+    @Override
+    public State currentState() {
+        return matcher.currentState();
+    }
 
     @Override
     public ILicenseFamily getLicenseFamily() {
@@ -93,4 +103,6 @@ public String getNotes() {
     public String derivedFrom() {
         return derivedFrom;
     }
+
+    
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index e6049dfd7..fb14e5805 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -26,6 +26,7 @@
 import java.io.StringWriter;
 import java.util.Arrays;
 
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.impl.MonolithicFileDocument;
 import org.apache.rat.license.ILicense;
@@ -40,7 +41,9 @@ public class AnalyserFactoryTest {
     private static ILicense MATCHES_NOTHING_MATCHER = mock(ILicense.class);
 
     static {
-            when(MATCHES_NOTHING_MATCHER.matches(any())).thenReturn(false);
+            when(MATCHES_NOTHING_MATCHER.matches(any())).thenReturn(State.f);
+            when(MATCHES_NOTHING_MATCHER.currentState()).thenReturn(State.f);
+            when(MATCHES_NOTHING_MATCHER.finalizeState()).thenReturn(State.f);
     }
 
     private StringWriter out;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index fa0be2304..9d05a4fc3 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -32,6 +32,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.Defaults;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
@@ -132,7 +133,7 @@ private boolean processText(ILicense license, String text) throws IOException {
         try (BufferedReader in = new BufferedReader(new StringReader(text))) {
             String line;
             while (null != (line = in.readLine())) {
-                if (license.matches(line)) {
+                if (license.matches(line) == State.t) {
                     return true;
                 }
             }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
index 38ecf9b7c..eff8a1e03 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
@@ -25,6 +25,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.MockLocation;
 import org.apache.rat.license.ILicense;
@@ -54,7 +55,7 @@ public static void testFilesInDir(String directory, ILicense license, boolean ex
                 br = Resources.getBufferedReader(f);
                 String line;
                 while(!result && (line = br.readLine()) != null) {
-                    result = license.matches(line);
+                    result = license.matches(line) == State.t;
                 }
                 assertEquals(f.toString(), expected, result);
             } finally {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
index 5161762c7..67378f7a2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.analysis.matchers;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -27,6 +28,7 @@
 import java.util.Arrays;
 
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.junit.Test;
 
 public class AndMatcherTest {
@@ -35,11 +37,12 @@ public class AndMatcherTest {
     public void standardTest() {
         IHeaderMatcher one = mock(IHeaderMatcher.class);
         IHeaderMatcher two = mock(IHeaderMatcher.class);
-        when(one.matches(any())).thenReturn( true ).thenReturn(false);
-        when(two.matches(any())).thenReturn( false ).thenReturn(true);
+        when(one.matches(any())).thenReturn( State.t ).thenReturn(State.t);
+        when(two.matches(any())).thenReturn( State.i ).thenReturn(State.t);
         
         AndMatcher target = new AndMatcher( "Testing", Arrays.asList( one, two ));
-        assertFalse( target.matches("hello"));
-        assertTrue( target.matches("world"));
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.i, target.matches("hello"));
+        assertEquals( State.t, target.matches("world"));
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
index 131a237b9..a41c2ca6f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -122,7 +123,7 @@ public CopyrightMatcherTest(String testName, String start, String stop, String o
     public void testPass() {
         for (String[] target : pass) {
             String errMsg = String.format("%s:%s failed", testName, target[NAME]);
-            assertTrue(errMsg, matcher.matches(target[TEXT]));
+            assertEquals(errMsg, State.t,matcher.matches(target[TEXT]));
             matcher.reset();
         }
     }
@@ -131,7 +132,8 @@ public void testPass() {
     public void testFail() {
         for (String[] target : fail) {
             String errMsg = String.format("%s:%s passed", testName, target[NAME]);
-            assertFalse(errMsg, matcher.matches(target[TEXT]));
+            assertEquals(errMsg, State.i, matcher.matches(target[TEXT]));
+            assertEquals(errMsg, State.f, matcher.finalizeState());
             matcher.reset();
         }
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
index d27d0fb54..e043931d2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.analysis.matchers;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -25,6 +26,7 @@
 import static org.mockito.Mockito.when;
 
 import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.junit.Test;
 
 public class NotMatcherTest {
@@ -32,16 +34,20 @@ public class NotMatcherTest {
     @Test
     public void testTrue() {
         IHeaderMatcher enclosed = mock(IHeaderMatcher.class);
-        when(enclosed.matches(any())).thenReturn(true);
+        when(enclosed.matches(any())).thenReturn(State.i);
+        when(enclosed.finalizeState()).thenReturn(State.t);
         NotMatcher matcher = new NotMatcher(enclosed);
-        assertFalse( matcher.matches("dummy"));
+        assertEquals( State.i, matcher.matches("dummy"));
+        assertEquals( State.f, matcher.finalizeState());
     }
     
     @Test
     public void testFalse() {
         IHeaderMatcher enclosed = mock(IHeaderMatcher.class);
-        when(enclosed.matches(any())).thenReturn(false);
+        when(enclosed.matches(any())).thenReturn(State.i);
+        when(enclosed.finalizeState()).thenReturn(State.f);
         NotMatcher matcher = new NotMatcher(enclosed);
-        assertTrue( matcher.matches("dummy"));
+        assertEquals( State.i, matcher.matches("dummy"));
+        assertEquals( State.t, matcher.finalizeState());
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 558541caa..5a10fc716 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -32,6 +32,7 @@
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.ReportConfiguration.LicenseFilter;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
@@ -71,7 +72,7 @@ public void standardReport() throws Exception {
         ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("TEST")
                 .setLicenseFamilyName("Testing family").build();
         final ILicense mockLicense = mock(ILicense.class);
-        when(mockLicense.matches(any())).thenReturn(true);
+        when(mockLicense.matches(any())).thenReturn(State.t);
         when(mockLicense.getLicenseFamily()).thenReturn(family);
 
         DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY);
@@ -103,7 +104,7 @@ public void standardReport() throws Exception {
     public void testNoLicense() throws Exception {
 
         final ILicense mockLicense = mock(ILicense.class);
-        when(mockLicense.matches(any())).thenReturn(true);
+        when(mockLicense.matches(any())).thenReturn(State.t);
         when(mockLicense.getLicenseFamily()).thenReturn(family);
 
         final ClaimStatistic statistic = new ClaimStatistic();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index 63562c531..13b99f4a1 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -31,6 +31,7 @@
 import java.util.regex.Pattern;
 
 import org.apache.rat.analysis.DefaultAnalyserFactory;
+import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.report.AbstractReport;
@@ -58,7 +59,7 @@ public void setUp() throws Exception {
         writer.startDocument();
         final SimpleXmlClaimReporter reporter = new SimpleXmlClaimReporter(writer);
         final ILicense matcher = mock(ILicense.class);
-        when(matcher.matches(any())).thenReturn(false);
+        when(matcher.matches(any())).thenReturn(State.t);
 
         IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(Arrays.asList(matcher));
         final List<AbstractReport> reporters = new ArrayList<>();

From 02cee625346aa7dccb52b2eb17febf135aa06772 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 7 Oct 2023 09:50:30 +0200
Subject: [PATCH 106/299] all tests in core pass

---
 .../main/java/org/apache/rat/Defaults.java    |   1 -
 .../main/java/org/apache/rat/Reporter.java    |  44 +-
 .../rat/analysis/HeaderCheckWorker.java       |  27 +-
 .../rat/analysis/license/BaseLicense.java     |   9 +-
 .../matchers/AbstractMatcherContainer.java    |   1 -
 .../matchers/AbstractSimpleMatcher.java       |   7 +-
 .../rat/analysis/matchers/AndMatcher.java     |  19 +-
 .../analysis/matchers/CopyrightMatcher.java   |   6 +-
 .../analysis/matchers/FullTextMatcher.java    |   3 +-
 .../rat/analysis/matchers/NotMatcher.java     |   9 +-
 .../rat/analysis/matchers/OrMatcher.java      |  10 +-
 .../analysis/matchers/SPDXMatcherFactory.java |   2 +-
 .../analysis/matchers/SimpleTextMatcher.java  |   4 +-
 .../builders/MatcherRefBuilder.java           |   2 +
 .../test/java/org/apache/rat/ReportTest.java  |   3 +-
 .../java/org/apache/rat/ReporterTest.java     |  67 +-
 .../rat/analysis/HeaderCheckWorkerTest.java   |   8 +-
 .../analysis/license/AbstractLicenseTest.java |   2 +-
 .../license/ApacheSoftwareLicenseTest.java    |   3 +-
 .../analysis/license/DirectoryScanner.java    |  11 +-
 .../analysis/license/IllumosLicenseTest.java  |  23 +-
 .../rat/analysis/license/MITLicenseTest.java  |  28 +-
 .../rat/analysis/license/OrMatcherTest.java   |  80 --
 .../rat/analysis/matchers/AndMatcherTest.java |  59 +-
 .../matchers/CopyrightMatcherTest.java        |   7 +-
 .../matchers/FullTextMatcherTest.java         |  57 ++
 .../rat/analysis/matchers/NotMatcherTest.java |  46 +-
 .../rat/analysis/matchers/OrMatcherTest.java  |  77 ++
 .../analysis/matchers/SPDXMatcherTest.java    |  57 ++
 .../matchers/SimpleCopyrightTests.java        |  25 +
 .../matchers/SimpleRegexMatcherTest.java      |  59 ++
 .../matchers/SimpleTextMatcherTest.java       |  70 ++
 .../rat/annotation/TestLicenseAppender.java   | 694 ++++++++----------
 .../rat/config/ConfigurationUtilTest.java     |  12 +-
 .../org/apache/rat/document/MockDocument.java |  18 +-
 .../rat/document/MockDocumentAnalyser.java    |   9 +-
 .../rat/document/ToNameTransformerTest.java   |   4 +-
 .../apache/rat/header/SimpleCharFilter.java   |   8 +-
 .../apache/rat/policy/DefaultPolicyTest.java  |   4 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |   4 +-
 .../apache/rat/report/xml/XmlReportTest.java  | 142 ++--
 .../rat/testhelpers/TestingLicense.java       | 110 +++
 .../TestingLocation.java}                     |  26 +-
 .../rat/testhelpers/TestingMatcher.java       |  79 ++
 .../{report/xml => testhelpers}/XmlUtils.java |  45 +-
 45 files changed, 1179 insertions(+), 802 deletions(-)
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
 rename apache-rat-core/src/test/java/org/apache/rat/{document/MockLocation.java => testhelpers/TestingLocation.java} (82%)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
 rename apache-rat-core/src/test/java/org/apache/rat/{report/xml => testhelpers}/XmlUtils.java (60%)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index df12dd296..150a27caa 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -78,7 +78,6 @@ public void clear() {
     }
 
     private void readConfigFiles(Collection<URL> urls) {
-
         for (URL url : urls) {
             Format fmt = Format.fromURL(url);
             MatcherReader mReader = fmt.matcherReader();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index 3e340e316..b804d4ed3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -20,8 +20,10 @@
 
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PipedReader;
 import java.io.PipedWriter;
+import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.List;
 import java.util.function.Supplier;
@@ -80,23 +82,22 @@ private Reporter() {
      */
     public static ClaimStatistic report(ReportConfiguration configuration) throws Exception {
         if (configuration.getReportable() != null) {
-            if (configuration.isStyleReport()) { 
-                try (
-                PipedReader reader = new PipedReader();
-                PipedWriter writer = new PipedWriter(reader);) {
-                ReportTransformer transformer = new ReportTransformer(configuration.getWriter().get(),
-                        configuration.getStyleSheet().get(), reader);
-                Thread transformerThread = new Thread(transformer);
-                transformerThread.start();
-                final ClaimStatistic statistic = report(writer, configuration);
-                writer.flush();
-                writer.close();
-                transformerThread.join();
-                return statistic;
+            if (configuration.isStyleReport()) {
+                try (PipedReader reader = new PipedReader(); PipedWriter writer = new PipedWriter(reader);
+                        InputStream style = configuration.getStyleSheet().get();
+                        PrintWriter reportWriter = configuration.getWriter().get();) {
+                    ReportTransformer transformer = new ReportTransformer(reportWriter, style, reader);
+                    Thread transformerThread = new Thread(transformer);
+                    transformerThread.start();
+                    final ClaimStatistic statistic = report(writer, configuration);
+                    writer.flush();
+                    writer.close();
+                    transformerThread.join();
+                    return statistic;
                 }
             }
             try (Writer writer = configuration.getWriter().get()) {
-            return report(writer, configuration);
+                return report(writer, configuration);
             }
         }
         return null;
@@ -112,15 +113,14 @@ public static ClaimStatistic report(ReportConfiguration configuration) throws Ex
      */
     private static ClaimStatistic report(Writer outputWriter, ReportConfiguration configuration)
             throws IOException, RatException {
-        try (
-        IXmlWriter writer = new XmlWriter(outputWriter)){
-        final ClaimStatistic statistic = new ClaimStatistic();
-        RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
-        report.startReport();
-        configuration.getReportable().run(report);
-        report.endReport();
+        try (IXmlWriter writer = new XmlWriter(outputWriter)) {
+            final ClaimStatistic statistic = new ClaimStatistic();
+            RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
+            report.startReport();
+            configuration.getReportable().run(report);
+            report.endReport();
 
-        return statistic;
+            return statistic;
         } catch (Exception e) {
             throw new IOException(e);
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index 2198768a6..3e86b88f5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -23,14 +23,17 @@
 import java.io.Reader;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 
 /**
- * <p>Reads from a stream to check license.</p>
- * <p><strong>Note</strong> that this class is not thread safe.</p> 
+ * <p>
+ * Reads from a stream to check license.
+ * </p>
+ * <p>
+ * <strong>Note</strong> that this class is not thread safe.
+ * </p>
  */
 class HeaderCheckWorker {
 
@@ -45,8 +48,9 @@ class HeaderCheckWorker {
     private boolean finished = false;
 
     /**
-     * Convenience constructor wraps given <code>Reader</code>
-     * in a <code>BufferedReader</code>.
+     * Convenience constructor wraps given <code>Reader</code> in a
+     * <code>BufferedReader</code>.
+     * 
      * @param reader a <code>Reader</code> for the content, not null
      * @param name the name of the checked content, possibly null
      */
@@ -54,8 +58,7 @@ public HeaderCheckWorker(Reader reader, final ILicense license, final Document n
         this(new BufferedReader(reader), license, name);
     }
 
-    public HeaderCheckWorker(BufferedReader reader, final ILicense license,
-            final Document name) {
+    public HeaderCheckWorker(BufferedReader reader, final ILicense license, final Document name) {
         this(reader, DEFAULT_NUMBER_OF_RETAINED_HEADER_LINES, license, name);
     }
 
@@ -76,14 +79,17 @@ public void read() throws RatHeaderAnalysisException {
             final StringBuilder headers = new StringBuilder();
             headerLinesToRead = numberOfRetainedHeaderLines;
             try {
-                while(readLine(headers)) {
+                while (readLine(headers)) {
                     // do nothing
                 }
-                if (!license.finalizeState().asBoolean()) {
+                if (license.finalizeState().asBoolean()) {
+                    document.getMetaData().reportOnLicense(license);
+                } else {
                     final String notes = headers.toString();
                     final MetaData metaData = document.getMetaData();
                     metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
-                    metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY, MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN));
+                    metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY,
+                            MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN));
                     metaData.set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN);
                 }
             } catch (IOException e) {
@@ -105,7 +111,6 @@ boolean readLine(StringBuilder headers) throws IOException, RatHeaderAnalysisExc
             }
             switch (license.matches(line)) {
             case t:
-                document.getMetaData().reportOnLicense(license);
                 result = false;
                 break;
             case f:
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 9cefeceda..ec4eb28d0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -18,11 +18,8 @@
  */
 package org.apache.rat.analysis.license;
 
-import java.util.Arrays;
-
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.AbstractHeaderMatcher;
-import org.apache.rat.analysis.matchers.AbstractMatcherContainer;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
@@ -69,17 +66,17 @@ public String getNotes() {
     public State matches(String line) {
         return matcher.matches(line);
     }
-    
+
     @Override
     public State currentState() {
         return matcher.currentState();
     }
-    
+
     @Override
     public State finalizeState() {
         return matcher.finalizeState();
     }
-    
+
     @Override
     public void reset() {
         matcher.reset();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index 38224cd6e..7b86c8969 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -22,7 +22,6 @@
 import java.util.Collection;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.IHeaderMatcher.State;
 
 public abstract class AbstractMatcherContainer extends AbstractHeaderMatcher {
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
index c571d8a55..c5009005f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
@@ -18,10 +18,7 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import java.util.regex.Pattern;
-
 public abstract class AbstractSimpleMatcher extends AbstractHeaderMatcher {
-    private Pattern pattern;
     private State lastState;
 
     public AbstractSimpleMatcher(String id) {
@@ -30,7 +27,7 @@ public AbstractSimpleMatcher(String id) {
     }
 
     abstract protected boolean doMatch(String line);
-    
+
     @Override
     public final State matches(String line) {
         if (lastState == State.t) {
@@ -48,7 +45,7 @@ public void reset() {
     }
 
     @Override
-    public final State finalizeState() {
+    public State finalizeState() {
         if (lastState == State.i) {
             lastState = State.f;
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
index b895e83c6..1bea5ba08 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -18,21 +18,18 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.IHeaderMatcher.State;
 
 public class AndMatcher extends AbstractMatcherContainer {
-    
+
     public AndMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
     }
 
     public AndMatcher(Collection<? extends IHeaderMatcher> enclosed) {
-        this(null,enclosed);
+        this(null, enclosed);
     }
 
     @Override
@@ -40,9 +37,11 @@ public State currentState() {
         State dflt = State.t;
         for (IHeaderMatcher matcher : enclosed) {
             switch (matcher.currentState()) {
-            case f: return State.f;
-            case i: dflt = State.i;
-            break;
+            case f:
+                return State.f;
+            case i:
+                dflt = State.i;
+                break;
             default:
                 // do nothing
                 break;
@@ -50,10 +49,10 @@ public State currentState() {
         }
         return dflt;
     }
-    
+
     @Override
     public State matches(String line) {
-        enclosed.stream().filter( x -> x.currentState() == State.i).forEach(x -> x.matches(line));
+        enclosed.stream().filter(x -> x.currentState() == State.i).forEach(x -> x.matches(line));
         return currentState();
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index a9dd46e83..96656fa87 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -56,13 +56,13 @@ public class CopyrightMatcher extends AbstractHeaderMatcher {
 
     private final Pattern dateOwnerPattern;
     private final Pattern ownerDatePattern;
-    
+
     private State state;
 
     public CopyrightMatcher(String start, String stop, String owner) {
         this(null, start, stop, owner);
     }
-    
+
     public CopyrightMatcher(String id, String start, String stop, String owner) {
         super(id);
         state = State.i;
@@ -111,7 +111,7 @@ public State matches(String line) {
         }
         return currentState();
     }
-    
+
     @Override
     public State currentState() {
         return state;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
index ada72656d..2c2c566e9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -46,7 +46,7 @@ public class FullTextMatcher extends AbstractSimpleMatcher {
     private final StringBuilder buffer = new StringBuilder();
 
     public FullTextMatcher(String fullText) {
-        this(null,fullText);
+        this(null, fullText);
     }
 
     public FullTextMatcher(String id, String fullText) {
@@ -118,6 +118,7 @@ public boolean doMatch(String line) {
     }
 
     // This is called indirectly from a ctor so must be final or private
+    @Override
     public void reset() {
         super.reset();
         buffer.setLength(0);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
index b6eeec7b1..dff5ce8a1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
@@ -53,10 +53,13 @@ public State finalizeState() {
     @Override
     public State currentState() {
         switch (enclosed.currentState()) {
-        case t : return State.f;
-        case f : return State.t;
+        case t:
+            return State.f;
+        case f:
+            return State.t;
         default:
-        case i : return State.i;
+        case i:
+            return State.i;
         }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
index 6b3aa3a3d..60183141d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
@@ -24,7 +24,7 @@
 
 public class OrMatcher extends AbstractMatcherContainer {
 
-    State lastState;
+    private State lastState;
 
     public OrMatcher(Collection<? extends IHeaderMatcher> enclosed) {
         this(null, enclosed);
@@ -32,7 +32,7 @@ public OrMatcher(Collection<? extends IHeaderMatcher> enclosed) {
 
     public OrMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
-        lastState = State.i;
+        // lastState = State.i;
     }
 
     @Override
@@ -75,4 +75,10 @@ public State currentState() {
         return lastState;
     }
 
+    @Override
+    public void reset() {
+        super.reset();
+        lastState = State.i;
+    }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index ecf478a39..b3e6a1b45 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -85,7 +85,7 @@ private boolean check(String line, Match caller) {
     }
 
     public class Match extends AbstractSimpleMatcher {
-        
+
         /**
          * Constructor.
          * 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index 1f1bedbcb..5533b0c79 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -35,13 +35,13 @@ public class SimpleTextMatcher extends AbstractSimpleMatcher {
      * @param pPatterns
      */
     public SimpleTextMatcher(String pattern) {
-        this(null,pattern);
+        this(null, pattern);
     }
 
     public SimpleTextMatcher(String id, String pattern) {
         super(id);
         if (StringUtils.isBlank(pattern)) {
-            throw new IllegalArgumentException( "Pattern may not be null, empty or blank");
+            throw new IllegalArgumentException("Pattern may not be null, empty or blank");
         }
         this.pattern = pattern;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
index b22e3c62d..b3d8c8d90 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
@@ -82,11 +82,13 @@ public State matches(String line) {
 
         @Override
         public State currentState() {
+            checkProxy();
             return wrapped.currentState();
         }
 
         @Override
         public State finalizeState() {
+            checkProxy();
             return wrapped.finalizeState();
         }
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 099f3722a..7e7c35580 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -21,14 +21,13 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.util.Arrays;
 
 import org.junit.Test;
 
 public class ReportTest {
     @Test
-    public void parseExclusionsForCLIUsage() throws IOException {
+    public void parseExclusionsForCLIUsage() {
         final FilenameFilter filter = Report
                 .parseExclusions(Arrays.asList("", " # foo/bar", "foo", "##", " ./foo/bar"));
         assertNotNull(filter);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index 3ae3e1d30..993a8b6e1 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -28,42 +28,17 @@
 
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.report.xml.XmlUtils;
 import org.apache.rat.test.utils.Resources;
+import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Test;
 import org.w3c.dom.Document;
-import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 public class ReporterTest {
 
-    private Node checkNode(Document doc, XPath xpath, String resource, String family, String approval, String type)
-            throws Exception {
-
-        Node root = getNode(doc, xpath, String.format("/rat-report/resource[@name='%s']", resource));
-        if (family != null) {
-            getNode(root, xpath, String.format("header-type[@name='%s']", ILicenseFamily.makeCategory(family)));
-            getNode(root, xpath, "license-family[@name]");
-            if (family.equals("?????")) {
-                getNode(root, xpath, "header-sample");
-            }
-        }
-        getNode(root, xpath, String.format("license-approval[@name='%s']", approval));
-        getNode(root, xpath, String.format("type[@name='%s']", type));
-        return root;
-    }
-
-    private Node getNode(Object source, XPath xPath, String xpath) throws XPathExpressionException {
-        NodeList nodeList = (NodeList) xPath.compile(xpath).evaluate(source, XPathConstants.NODESET);
-        assertEquals("Could not find " + xpath, 1, nodeList.getLength());
-        return nodeList.item(0);
-    }
-
     @Test
     public void xmlReportTest() throws Exception {
         Defaults defaults = Defaults.builder().build();
@@ -74,25 +49,25 @@ public void xmlReportTest() throws Exception {
         configuration.setStyleReport(false);
         configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
-        configuration.setOut(()->out);
+        configuration.setOut(() -> out);
         Reporter.report(configuration);
         Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
         XPath xPath = XPathFactory.newInstance().newXPath();
 
-        getNode(doc, xPath, "/rat-report[@timestamp]");
-
-        checkNode(doc, xPath, "src/test/resources/elements/ILoggerFactory.java", "MIT", "true", "standard");
-        checkNode(doc, xPath, "src/test/resources/elements/Image.png", null, "false", "binary");
-        checkNode(doc, xPath, "src/test/resources/elements/LICENSE", null, "false", "notice");
-        checkNode(doc, xPath, "src/test/resources/elements/NOTICE", null, "false", "notice");
-        checkNode(doc, xPath, "src/test/resources/elements/Source.java", "?????", "false", "standard");
-        checkNode(doc, xPath, "src/test/resources/elements/Text.txt", "AL", "true", "standard");
-        checkNode(doc, xPath, "src/test/resources/elements/TextHttps.txt", "AL", "true", "standard");
-        checkNode(doc, xPath, "src/test/resources/elements/Xml.xml", "AL", "true", "standard");
-        checkNode(doc, xPath, "src/test/resources/elements/buildr.rb", "AL", "true", "standard");
-        checkNode(doc, xPath, "src/test/resources/elements/dummy.jar", null, "false", "archive");
-        checkNode(doc, xPath, "src/test/resources/elements/plain.json", null, "false", "binary");
-        checkNode(doc, xPath, "src/test/resources/elements/sub/Empty.txt", "?????", "false", "standard");
+        XmlUtils.getNode(doc, xPath, "/rat-report[@timestamp]");
+
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/ILoggerFactory.java", "MIT", "true", "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Image.png", null, "false", "binary");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/LICENSE", null, "false", "notice");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/NOTICE", null, "false", "notice");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Source.java", "?????", "false", "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Text.txt", "AL", "true", "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/TextHttps.txt", "AL", "true", "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Xml.xml", "AL", "true", "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/buildr.rb", "AL", "true", "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/dummy.jar", null, "false", "archive");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/plain.json", null, "false", "binary");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/sub/Empty.txt", "?????", "false", "standard");
 
         NodeList nodeList = (NodeList) xPath.compile("/rat-report/resource").evaluate(doc, XPathConstants.NODESET);
         assertEquals(12, nodeList.getLength());
@@ -114,11 +89,11 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
-        configuration.setOut(()->out);
+        configuration.setOut(() -> out);
         Reporter.report(configuration);
 
         String document = out.toString();
-        //System.out.println(document);
+        // System.out.println(document);
         assertTrue("'Generated at' is present in " + document, document.startsWith(HEADER));
 
         // final int generatedAtLineEnd = document.indexOf(NL, HEADER.length());
@@ -131,9 +106,9 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         find("^2 Unknown Licenses$", document);
         find("^Files with unapproved licenses:\\s+" + "src/test/resources/elements/Image.png\\s+"
                 + "src/test/resources/elements/LICENSE\\s+" + "src/test/resources/elements/NOTICE\\s+"
-                + "src/test/resources/elements/Source.java\\s+"
-                + "src/test/resources/elements/dummy.jar\\s+" + "src/test/resources/elements/plain.json\\s+"
-                + "src/test/resources/elements/sub/Empty.txt\\s", document);
+                + "src/test/resources/elements/Source.java\\s+" + "src/test/resources/elements/dummy.jar\\s+"
+                + "src/test/resources/elements/plain.json\\s+" + "src/test/resources/elements/sub/Empty.txt\\s",
+                document);
         find("^Archives:\\s+" + "\\+ src/test/resources/elements/dummy.jar\\s*", document);
         find("MIT\\s+src/test/resources/elements/ILoggerFactory.java", document);
         find("!B\\s+src/test/resources/elements/Image.png", document);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
index 262930dc4..47ed4ebba 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
@@ -21,21 +21,21 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 
 import java.io.StringReader;
 
 import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
 import org.apache.rat.license.ILicense;
+import org.apache.rat.testhelpers.TestingLicense;
+import org.apache.rat.testhelpers.TestingLocation;
 import org.junit.Test;
 
 public class HeaderCheckWorkerTest {
 
     @Test
     public void isFinished() throws Exception {
-        final Document subject = new MockLocation("subject");
-        ILicense matcher = mock(ILicense.class);
+        final Document subject = new TestingLocation("subject");
+        ILicense matcher = new TestingLicense();
         HeaderCheckWorker worker = new HeaderCheckWorker(new StringReader(""), matcher, subject);
         assertFalse(worker.isFinished());
         worker.read();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index 9d05a4fc3..1e21b72b4 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -137,7 +137,7 @@ private boolean processText(ILicense license, String text) throws IOException {
                     return true;
                 }
             }
-            return false;
+            return license.finalizeState().asBoolean();
         }
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
index c2938e141..6872610f3 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
@@ -47,8 +47,7 @@ public class ApacheSoftwareLicenseTest extends AbstractLicenseTest {
             { "spdx-tab", "SPDX-License-Identifier:\tApache-2.0" },
             { "spdx-space", "SPDX-License-Identifier: Apache-2.0" },
             { "long text",
-                    "/*\n" + " *  Copyright 2012-2013 FooBar.\n" + " *\n"
-                            + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
+                    "/*\n" + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
                             + " *  you may not use this file except in compliance with the License.\n" + " *\n"
                             + " *  You may obtain a copy of the License at\n"
                             + " *       http://www.apache.org/licenses/LICENSE-2.0\n" + " *\n"
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
index eff8a1e03..498256513 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
@@ -24,10 +24,7 @@
 import java.io.File;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.State;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.test.utils.Resources;
 import org.junit.Assert;
@@ -37,6 +34,7 @@ class DirectoryScanner {
     @SuppressWarnings("boxing") // OK in test code
     /**
      * Get list of files in a directory, and scan for license matches
+     * 
      * @param directory the directory containing the files
      * @param matcher the license matcher
      * @param expected the expected result of the each scan
@@ -45,16 +43,15 @@ class DirectoryScanner {
     public static void testFilesInDir(String directory, ILicense license, boolean expected) throws Exception {
         final File[] resourceFiles = Resources.getResourceFiles(directory);
         if (resourceFiles.length == 0) {
-            Assert.fail("No files found under "+directory);
+            Assert.fail("No files found under " + directory);
         }
-        for(File f : resourceFiles) {
-            final Document subject = new MockLocation(f.toString());
+        for (File f : resourceFiles) {
             BufferedReader br = null;
             try {
                 boolean result = false;
                 br = Resources.getBufferedReader(f);
                 String line;
-                while(!result && (line = br.readLine()) != null) {
+                while (!result && (line = br.readLine()) != null) {
                     result = license.matches(line) == State.t;
                 }
                 assertEquals(f.toString(), expected, result);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
index a821f185e..9e2fc7ac6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
@@ -18,30 +18,15 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 public class IllumosLicenseTest extends AbstractLicenseTest {
     private static String category = "ILLUMOS";
     private static String name = "ILLUMOS CDDL1 Derived license";
     private static String note = "Modified CDDL1 license";
-    private static String[][] targets = {
-            { "illumos", "The contents of this file are subject to the terms of the "
+    private static String[][] targets = { { "illumos",
+            "The contents of this file are subject to the terms of the "
                     + "Common Development and Distribution License (the \"License\") "
-                    + "You may not use this file except in compliance with the License. "}
-    };
-    
+                    + "You may not use this file except in compliance with the License. " } };
+
     public IllumosLicenseTest() {
         super(category, name, note, targets);
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
index f0b257226..49c9d68a9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
@@ -18,30 +18,14 @@
  */
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.document.MockLocation;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class MITLicenseTest extends AbstractLicenseTest 
-{
+public class MITLicenseTest extends AbstractLicenseTest {
     private static String cat = "MIT";
     private static String name = "The MIT License";
-    private static String[][] targets = {
-            { "fulltext", "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \\\"Software\\\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."},
-            { "spdx-tab", "SPDX-License-Identifier:\tMIT" },
-            { "spdx-space", "SPDX-License-Identifier: MIT" },
-    };
-    
+    private static String[][] targets = { { "fulltext",
+            "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \\\"Software\\\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." },
+            { "spdx-tab", "SPDX-License-Identifier:\tMIT" }, { "spdx-space", "SPDX-License-Identifier: MIT" }, };
+
     public MITLicenseTest() {
-        super( cat, name , null, targets);
+        super(cat, name, null, targets);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
deleted file mode 100644
index 689361507..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OrMatcherTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import java.util.Arrays;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.OrMatcher;
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
-import org.junit.Before;
-import org.junit.Test;
-
-public class OrMatcherTest {
-
-    private static final String LINE_ONE = "Line One";
-    private static final String LINE_TWO = "Line Two";
-
-    private IHeaderMatcher matcherOne;
-    private IHeaderMatcher matcherTwo;
-
-    private OrMatcher multiplexer;
-
-    @Before
-    public void setUp() {
-        matcherOne = mock(IHeaderMatcher.class);
-        matcherTwo = mock(IHeaderMatcher.class);
-        multiplexer = new OrMatcher("multiplexMatcher Test",
-                Arrays.<IHeaderMatcher>asList(matcherOne, matcherTwo));
-    }
-
-    @Test
-    public void testMatcherLine() throws Exception {
-        
-        multiplexer.matches(LINE_ONE);
-        verify(matcherOne, times(1)).matches(eq(LINE_ONE));
-        verify(matcherTwo, times(1)).matches(eq(LINE_ONE));
-
-        multiplexer.matches(LINE_TWO);
-        verify(matcherOne, times(1)).matches(eq(LINE_TWO));
-        verify(matcherTwo, times(1)).matches(eq(LINE_TWO));
-        verify(matcherOne, times(2)).matches(any());
-        verify(matcherTwo, times(2)).matches(any());
-    }
-
-    @Test
-    public void testReset() {
-        multiplexer.reset();
-        verify(matcherOne, times(1)).reset();
-        verify(matcherTwo, times(1)).reset();
-
-        multiplexer.reset();
-        verify(matcherOne, times(2)).reset();
-        verify(matcherTwo, times(2)).reset();
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
index 67378f7a2..5342d71d0 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
@@ -19,30 +19,59 @@
 package org.apache.rat.analysis.matchers;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.State;
+import org.apache.rat.testhelpers.TestingMatcher;
 import org.junit.Test;
 
 public class AndMatcherTest {
 
+    private void assertValues(IHeaderMatcher target, State hello, State world, State finalize) {
+        assertEquals(State.i, target.currentState());
+        assertEquals(hello, target.matches("hello"));
+        assertEquals(hello, target.currentState());
+        assertEquals(world, target.matches("world"));
+        assertEquals(world, target.currentState());
+        assertEquals(finalize, target.finalizeState());
+        assertEquals(finalize, target.currentState());
+    }
+
+    @Test
+    public void trueTest() {
+        IHeaderMatcher one = new TestingMatcher("one", true);
+        IHeaderMatcher two = new TestingMatcher("two", false, true);
+        AndMatcher target = new AndMatcher("Testing", Arrays.asList(one, two));
+        assertValues(target, State.i, State.t, State.t);
+        target.reset();
+        assertEquals(State.i, one.currentState());
+        assertEquals(State.i, two.currentState());
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void falseTest() {
+        IHeaderMatcher one = new TestingMatcher("one", true);
+        IHeaderMatcher two = new TestingMatcher("two", false, false);
+        AndMatcher target = new AndMatcher("Testing", Arrays.asList(one, two));
+        assertValues(target, State.i, State.i, State.f);
+        target.reset();
+        assertEquals(State.i, one.currentState());
+        assertEquals(State.i, two.currentState());
+        assertEquals(State.i, target.currentState());
+    }
+
     @Test
-    public void standardTest() {
-        IHeaderMatcher one = mock(IHeaderMatcher.class);
-        IHeaderMatcher two = mock(IHeaderMatcher.class);
-        when(one.matches(any())).thenReturn( State.t ).thenReturn(State.t);
-        when(two.matches(any())).thenReturn( State.i ).thenReturn(State.t);
-        
-        AndMatcher target = new AndMatcher( "Testing", Arrays.asList( one, two ));
-        assertEquals( State.i, target.currentState());
-        assertEquals( State.i, target.matches("hello"));
-        assertEquals( State.t, target.matches("world"));
+    public void indeterminentTest() {
+        IHeaderMatcher one = new TestingMatcher("one", false, false);
+        IHeaderMatcher two = new TestingMatcher("two", false, false);
+        AndMatcher target = new AndMatcher("Testing", Arrays.asList(one, two));
+        assertValues(target, State.i, State.i, State.f);
+        target.reset();
+        assertEquals(State.i, one.currentState());
+        assertEquals(State.i, two.currentState());
+        assertEquals(State.i, target.currentState());
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
index a41c2ca6f..f303eb710 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
@@ -20,7 +20,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -123,8 +122,10 @@ public CopyrightMatcherTest(String testName, String start, String stop, String o
     public void testPass() {
         for (String[] target : pass) {
             String errMsg = String.format("%s:%s failed", testName, target[NAME]);
-            assertEquals(errMsg, State.t,matcher.matches(target[TEXT]));
+            assertEquals(errMsg, State.i, matcher.currentState());
+            assertEquals(errMsg, State.t, matcher.matches(target[TEXT]));
             matcher.reset();
+            assertEquals(errMsg, State.i, matcher.currentState());
         }
     }
 
@@ -132,9 +133,11 @@ public void testPass() {
     public void testFail() {
         for (String[] target : fail) {
             String errMsg = String.format("%s:%s passed", testName, target[NAME]);
+            assertEquals(errMsg, State.i, matcher.currentState());
             assertEquals(errMsg, State.i, matcher.matches(target[TEXT]));
             assertEquals(errMsg, State.f, matcher.finalizeState());
             matcher.reset();
+            assertEquals(errMsg, State.i, matcher.currentState());
         }
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
new file mode 100644
index 000000000..352472d98
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
@@ -0,0 +1,57 @@
+package org.apache.rat.analysis.matchers;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.rat.analysis.IHeaderMatcher.State;
+
+public class FullTextMatcherTest {
+
+    FullTextMatcher target = new FullTextMatcher("Hello world");
+    
+    @Before
+    public void setup() {
+        target.reset();
+    }
+    
+    @Test
+    public void testMatch() {
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.i, target.matches("what in the world"));
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.t, target.matches("hello world"));
+        assertEquals( State.t, target.currentState());
+        assertEquals( State.t, target.finalizeState()); 
+        assertEquals( State.t, target.currentState());
+        target.reset();
+        assertEquals( State.i, target.currentState());
+    }
+    
+    @Test
+    public void testNoMatch() {
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.i, target.matches("what in the world"));
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.i, target.matches("hello there"));
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.f, target.finalizeState());
+        assertEquals( State.f, target.currentState());
+        target.reset();
+        assertEquals( State.i, target.currentState());
+    }
+    
+    @Test
+    public void testTrueIsAlwaysTrue() {
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.t, target.matches("hello world"));
+        assertEquals( State.t, target.currentState());
+        assertEquals( State.t, target.matches("A non matching line"));
+        assertEquals( State.t, target.currentState());        
+        assertEquals( State.t, target.finalizeState()); 
+        assertEquals( State.t, target.currentState());
+        target.reset();
+        assertEquals( State.i, target.currentState());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
index e043931d2..843ef9afc 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
@@ -19,35 +19,45 @@
 package org.apache.rat.analysis.matchers;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.State;
+import org.apache.rat.testhelpers.TestingMatcher;
 import org.junit.Test;
 
 public class NotMatcherTest {
 
+    private void assertValues(IHeaderMatcher target, State hello, State world, State finalize) {
+        assertEquals(State.i, target.currentState());
+        assertEquals("hello match", hello, target.matches("hello"));
+        assertEquals("hello current", hello, target.currentState());
+        assertEquals("world match", world, target.matches("world"));
+        assertEquals("world current", world, target.currentState());
+        assertEquals("finalize", finalize, target.finalizeState());
+        assertEquals("finalize current", finalize, target.currentState());
+    }
+
     @Test
     public void testTrue() {
-        IHeaderMatcher enclosed = mock(IHeaderMatcher.class);
-        when(enclosed.matches(any())).thenReturn(State.i);
-        when(enclosed.finalizeState()).thenReturn(State.t);
-        NotMatcher matcher = new NotMatcher(enclosed);
-        assertEquals( State.i, matcher.matches("dummy"));
-        assertEquals( State.f, matcher.finalizeState());
+        IHeaderMatcher one = new TestingMatcher("one", true);
+        NotMatcher target = new NotMatcher("Testing", one);
+        assertValues(target, State.f, State.f, State.f);
+
+        one = new TestingMatcher("one", false, true);
+        target = new NotMatcher("Testing", one);
+        assertValues(target, State.i, State.f, State.f);
+        target.reset();
+        assertEquals(State.i, target.currentState());
     }
-    
+
     @Test
     public void testFalse() {
-        IHeaderMatcher enclosed = mock(IHeaderMatcher.class);
-        when(enclosed.matches(any())).thenReturn(State.i);
-        when(enclosed.finalizeState()).thenReturn(State.f);
-        NotMatcher matcher = new NotMatcher(enclosed);
-        assertEquals( State.i, matcher.matches("dummy"));
-        assertEquals( State.t, matcher.finalizeState());
+        TestingMatcher one = new TestingMatcher("one", false, false);
+        one.finalState = State.t;
+        NotMatcher target = new NotMatcher("Testing", one);
+        assertValues(target, State.i, State.i, State.f);
+        target.reset();
+        assertEquals(State.i, target.currentState());
+
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java
new file mode 100644
index 000000000..fac129d80
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis.matchers;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.State;
+import org.apache.rat.testhelpers.TestingMatcher;
+import org.junit.Test;
+
+public class OrMatcherTest {
+
+    private void assertValues(IHeaderMatcher target, State hello, State world, State finalize) {
+        assertEquals(State.i, target.currentState());
+        assertEquals("hello match", hello, target.matches("hello"));
+        assertEquals("hello current", hello, target.currentState());
+        assertEquals("world match", world, target.matches("world"));
+        assertEquals("world current", world, target.currentState());
+        assertEquals("finalize", finalize, target.finalizeState());
+        assertEquals("finalize current", finalize, target.currentState());
+    }
+
+    @Test
+    public void trueTest() {
+        IHeaderMatcher one = new TestingMatcher("one", false, false);
+        IHeaderMatcher two = new TestingMatcher("two", false, true);
+        OrMatcher target = new OrMatcher("Testing", Arrays.asList(one, two));
+        assertValues(target, State.i, State.t, State.t);
+        target.reset();
+        assertEquals(State.i, one.currentState());
+        assertEquals(State.i, two.currentState());
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void falseTest() {
+        IHeaderMatcher one = new TestingMatcher("one", false, false);
+        IHeaderMatcher two = new TestingMatcher("two", false, false);
+        OrMatcher target = new OrMatcher("Testing", Arrays.asList(one, two));
+        assertValues(target, State.i, State.i, State.f);
+        target.reset();
+        assertEquals(State.i, one.currentState());
+        assertEquals(State.i, two.currentState());
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void indeterminentTest() {
+        IHeaderMatcher one = new TestingMatcher("one", false, false);
+        IHeaderMatcher two = new TestingMatcher("two", false, false);
+        OrMatcher target = new OrMatcher("Testing", Arrays.asList(one, two));
+        assertValues(target, State.i, State.i, State.f);
+        target.reset();
+        assertEquals(State.i, one.currentState());
+        assertEquals(State.i, two.currentState());
+        assertEquals(State.i, target.currentState());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
new file mode 100644
index 000000000..f167ff55f
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
@@ -0,0 +1,57 @@
+package org.apache.rat.analysis.matchers;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.IHeaderMatcher.State;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SPDXMatcherTest {
+
+    IHeaderMatcher target = SPDXMatcherFactory.INSTANCE.create("hello");
+
+    @Before
+    public void setup() {
+        target.reset();
+    }
+
+    @Test
+    public void testMatch() {
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("SPDX-License-Identifier: Apache-2"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.t, target.matches("SPDX-License-Identifier: hello"));
+        assertEquals(State.t, target.currentState());
+        assertEquals(State.t, target.finalizeState());
+        assertEquals(State.t, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void testNoMatch() {
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("SPDX-License-Identifier: Apache-2"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("SPDX-License-Identifier: MIT"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.f, target.finalizeState());
+        assertEquals(State.f, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void testTrueIsAlwaysTrue() {
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.t, target.matches("SPDX-License-Identifier: hello"));
+        assertEquals(State.t, target.currentState());
+        assertEquals(State.t, target.matches("SPDX-License-Identifier: Apache-2"));
+        assertEquals(State.t, target.currentState());
+        assertEquals(State.t, target.finalizeState());
+        assertEquals(State.t, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
new file mode 100644
index 000000000..9c6b98899
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
@@ -0,0 +1,25 @@
+package org.apache.rat.analysis.matchers;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.rat.analysis.IHeaderMatcher.State;
+import org.junit.Test;
+
+public class SimpleCopyrightTests {
+
+    CopyrightMatcher target = new CopyrightMatcher(null,null,null);
+    
+    @Test
+    public void testTrueIsAlwaysTrue() {
+        
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.t, target.matches("hello Copyright 1999"));
+        assertEquals( State.t, target.currentState());
+        assertEquals( State.t, target.matches("A non matching line"));
+        assertEquals( State.t, target.currentState());        
+        assertEquals( State.t, target.finalizeState()); 
+        assertEquals( State.t, target.currentState());
+        target.reset();
+        assertEquals( State.i, target.currentState());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
new file mode 100644
index 000000000..f3241075d
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
@@ -0,0 +1,59 @@
+package org.apache.rat.analysis.matchers;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.regex.Pattern;
+
+import org.apache.rat.analysis.IHeaderMatcher.State;
+
+public class SimpleRegexMatcherTest {
+
+    SimpleRegexMatcher target = new SimpleRegexMatcher(Pattern.compile("hello\\sworld"));
+    
+    @Before
+    public void setup() {
+        target.reset();
+    }
+    
+    @Test
+    public void testMatch() {
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.i, target.matches("what in the world"));
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.t, target.matches("hello world"));
+        assertEquals( State.t, target.currentState());
+        assertEquals( State.t, target.finalizeState()); 
+        assertEquals( State.t, target.currentState());
+        target.reset();
+        assertEquals( State.i, target.currentState());
+    }
+
+    @Test
+    public void testNoMatch() {
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.i, target.matches("what in the world"));
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.i, target.matches("hello there"));
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.f, target.finalizeState());
+        assertEquals( State.f, target.currentState());
+        target.reset();
+        assertEquals( State.i, target.currentState());
+    }
+    
+    @Test
+    public void testTrueIsAlwaysTrue() {
+        assertEquals( State.i, target.currentState());
+        assertEquals( State.t, target.matches("hello world"));
+        assertEquals( State.t, target.currentState());
+        assertEquals( State.t, target.matches("A non matching line"));
+        assertEquals( State.t, target.currentState());        
+        assertEquals( State.t, target.finalizeState()); 
+        assertEquals( State.t, target.currentState());
+        target.reset();
+        assertEquals( State.i, target.currentState());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
new file mode 100644
index 000000000..4aa7b41fa
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
@@ -0,0 +1,70 @@
+package org.apache.rat.analysis.matchers;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.rat.analysis.IHeaderMatcher.State;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SimpleTextMatcherTest {
+
+    SimpleTextMatcher target;
+
+    @Before
+    public void setup() {
+        target = new SimpleTextMatcher("hello");
+    }
+
+    @Test
+    public void testMatch() {
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("what in the world"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.t, target.matches("hello world"));
+        assertEquals(State.t, target.currentState());
+        assertEquals(State.t, target.finalizeState());
+        assertEquals(State.t, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void testNoMatch() {
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("what in the world"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("hell o'there"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.f, target.finalizeState());
+        assertEquals(State.f, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void testTrueIsAlwaysTrue() {
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.t, target.matches("hello world"));
+        assertEquals(State.t, target.currentState());
+        assertEquals(State.t, target.matches("A non matching line"));
+        assertEquals(State.t, target.currentState());
+        assertEquals(State.t, target.finalizeState());
+        assertEquals(State.t, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+    }
+
+    @Test
+    public void testIndeterminent() {
+        target = new SimpleTextMatcher("not a match");
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("hello world"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("A non matching line"));
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.f, target.finalizeState());
+        assertEquals(State.f, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+    }
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
index 71e09d965..0e595519e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
@@ -18,11 +18,8 @@
  */
 package org.apache.rat.annotation;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.rat.test.utils.Resources;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -31,8 +28,11 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.apache.commons.io.IOUtils;
+import org.apache.rat.test.utils.Resources;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 public class TestLicenseAppender {
     @ClassRule
@@ -49,16 +49,11 @@ private interface NewFileReader {
     }
 
     private static String getTemporaryFileWithName(String fileName) throws IOException {
-        if (fileName != null) {
-            return baseTempFolder.newFile(fileName).getAbsolutePath();
-        } else {
-            return baseTempFolder.newFile().getAbsolutePath();
-        }
+        return fileName != null ? baseTempFolder.newFile(fileName).getAbsolutePath()
+                : baseTempFolder.newFile().getAbsolutePath();
     }
 
-    private static void createTestFile(String fileName,
-                                       FileCreator creator)
-            throws IOException {
+    private static void createTestFile(String fileName, FileCreator creator) throws IOException {
         FileWriter w = null;
         try {
             creator.createFile(w = new FileWriter(fileName));
@@ -73,16 +68,13 @@ private static void tryToDelete(File f) {
         }
     }
 
-    private static void commonTestTemplate(String relativeName,
-                                           FileCreator creator,
-                                           NewFileReader reader)
+    private static void commonTestTemplate(String relativeName, FileCreator creator, NewFileReader reader)
             throws IOException {
         String name = getTemporaryFileWithName(relativeName);
         try {
             createTestFile(name, creator);
 
-            ApacheV2LicenseAppender appender =
-                    new ApacheV2LicenseAppender();
+            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender();
             appender.append(new File(name));
 
             BufferedReader r = null;
@@ -98,39 +90,33 @@ private static void commonTestTemplate(String relativeName,
         }
     }
 
-    private static NewFileReader checkLines(final String firstLine,
-                                            final String secondLine) {
+    private static NewFileReader checkLines(final String firstLine, final String secondLine) {
         return new NewFileReader() {
+            @Override
             public void readFile(BufferedReader r) throws IOException {
                 String line = r.readLine();
-                assertEquals("First line is incorrect",
-                        firstLine, line);
+                assertEquals("First line is incorrect", firstLine, line);
                 if (secondLine != null) {
                     line = r.readLine();
-                    assertEquals("Second line is incorrect",
-                            secondLine, line);
+                    assertEquals("Second line is incorrect", secondLine, line);
                 }
             }
         };
     }
 
-    private static NewFileReader checkLines(final String firstLine,
-                                            final String secondLine,
-                                            final String thirdLine) {
+    private static NewFileReader checkLines(final String firstLine, final String secondLine, final String thirdLine) {
         return new NewFileReader() {
+            @Override
             public void readFile(BufferedReader r) throws IOException {
                 String line = r.readLine();
-                assertEquals("First line is incorrect",
-                        firstLine, line);
+                assertEquals("First line is incorrect", firstLine, line);
                 if (secondLine != null) {
                     line = r.readLine();
-                    assertEquals("Second line is incorrect",
-                            secondLine, line);
+                    assertEquals("Second line is incorrect", secondLine, line);
                 }
                 if (thirdLine != null) {
                     line = r.readLine();
-                    assertEquals("Third line is incorrect",
-                            thirdLine, line);
+                    assertEquals("Third line is incorrect", thirdLine, line);
                 }
             }
         };
@@ -140,22 +126,20 @@ public void readFile(BufferedReader r) throws IOException {
     public void addLicenseToUnknownFile() throws IOException {
         String filename = getTemporaryFileWithName(null);
         createTestFile(filename, new FileCreator() {
-            public void createFile(Writer writer)
-                    throws IOException {
+            @Override
+            public void createFile(Writer writer) throws IOException {
                 writer.write("Unknown file type\n");
             }
         });
 
         File file = new File(filename);
         file.deleteOnExit();
-        ApacheV2LicenseAppender appender =
-                new ApacheV2LicenseAppender();
+        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender();
         appender.append(file);
 
         File newFile = new File(filename + ".new");
         newFile.deleteOnExit();
-        assertFalse("No new file should have been written",
-                newFile.exists());
+        assertFalse("No new file should have been written", newFile.exists());
     }
 
     @Test
@@ -165,15 +149,14 @@ public void addLicenseToJava() throws IOException {
         final String secondLine = "";
         final String thirdLine = "/*";
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("\n");
-                        writer.write("public class test {\n");
-                        writer.write("}\n");
-                    }
-                },
-                checkLines(firstLine, secondLine, thirdLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("\n");
+                writer.write("public class test {\n");
+                writer.write("}\n");
+            }
+        }, checkLines(firstLine, secondLine, thirdLine));
     }
 
     @Test
@@ -181,13 +164,12 @@ public void addLicenseToJavaWithoutPackage() throws IOException {
         String filename = "tmp.java";
         String commentLine = "/*";
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("public class test {\n");
-                        writer.write("}\n");
-                    }
-                },
-                checkLines(commentLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("public class test {\n");
+                writer.write("}\n");
+            }
+        }, checkLines(commentLine, null));
     }
 
     @Test
@@ -198,15 +180,14 @@ public void addLicenseToXML() throws IOException {
         final String thirdLine = "<!--";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("\n");
-                        writer.write("<xml>\n");
-                        writer.write("</xml>\n");
-                    }
-                },
-                checkLines(firstLine, secondLine, thirdLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("\n");
+                writer.write("<xml>\n");
+                writer.write("</xml>\n");
+            }
+        }, checkLines(firstLine, secondLine, thirdLine));
     }
 
     @Test
@@ -216,13 +197,12 @@ public void addLicenseToXMLWithoutDecl() throws IOException {
         final String secondLine = "<!--";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("<xml>\n");
-                        writer.write("</xml>\n");
-                    }
-                },
-                checkLines(firstLine, secondLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("<xml>\n");
+                writer.write("</xml>\n");
+            }
+        }, checkLines(firstLine, secondLine));
     }
 
     @Test
@@ -231,14 +211,13 @@ public void addLicenseToHTML() throws IOException {
         String commentLine = "<!--";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("<html>\n");
-                        writer.write("\n");
-                        writer.write("</html>\n");
-                    }
-                },
-                checkLines(commentLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("<html>\n");
+                writer.write("\n");
+                writer.write("</html>\n");
+            }
+        }, checkLines(commentLine, null));
     }
 
     @Test
@@ -247,14 +226,13 @@ public void addLicenseToCSS() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(".class {\n");
-                        writer.write(" background-color: red;");
-                        writer.write("}\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(".class {\n");
+                writer.write(" background-color: red;");
+                writer.write("}\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -263,14 +241,13 @@ public void addLicenseToJavascript() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("if (a ==b) {>\n");
-                        writer.write(" alert(\"how useful!\");");
-                        writer.write("}\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("if (a ==b) {>\n");
+                writer.write(" alert(\"how useful!\");");
+                writer.write("}\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -279,14 +256,13 @@ public void addLicenseToAPT() throws IOException {
         String firstLine = "~~" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("A Simple APT file");
-                        writer.write(" This file contains nothing\n");
-                        writer.write(" of any importance\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("A Simple APT file");
+                writer.write(" This file contains nothing\n");
+                writer.write(" of any importance\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -295,14 +271,13 @@ public void addLicenseToProperties() throws IOException {
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("property = value\n");
-                        writer.write("fun = true\n");
-                        writer.write("cool = true\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("property = value\n");
+                writer.write("fun = true\n");
+                writer.write("cool = true\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -312,46 +287,41 @@ public void addLicenseToScala() throws IOException {
         final String newFirstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("\n");
-                        writer.write("    object X { val x = 1; }\n");
-                        writer.write("}\n");
-                    }
-                },
-                new NewFileReader() {
-                    public void readFile(BufferedReader reader)
-                            throws IOException {
-                        String line = reader.readLine();
-                        assertEquals("First line is incorrect",
-                                newFirstLine, line);
-                        while ((line = reader.readLine()) != null) {
-                            if (line.length() == 0) {
-                                line = reader.readLine();
-                                break;
-                            }
-                        }
-                        assertEquals("Package line is incorrect",
-                                firstLine, line);
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("\n");
+                writer.write("    object X { val x = 1; }\n");
+                writer.write("}\n");
+            }
+        }, new NewFileReader() {
+            @Override
+            public void readFile(BufferedReader reader) throws IOException {
+                String line = reader.readLine();
+                assertEquals("First line is incorrect", newFirstLine, line);
+                while ((line = reader.readLine()) != null) {
+                    if (line.length() == 0) {
+                        line = reader.readLine();
+                        break;
                     }
-                });
+                }
+                assertEquals("Package line is incorrect", firstLine, line);
+            }
+        });
     }
 
     @Test
-    public void addLicenseToRubyWithoutHashBang()
-            throws IOException {
+    public void addLicenseToRubyWithoutHashBang() throws IOException {
         String filename = "tmp.rb";
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("class Foo\n");
-                        writer.write("end\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("class Foo\n");
+                writer.write("end\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -361,29 +331,26 @@ public void addLicenseToRubyWithHashBang() throws IOException {
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("class Foo\n");
-                        writer.write("end\n");
-                    }
-                },
-                checkLines(firstLine, secondLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("class Foo\n");
+                writer.write("end\n");
+            }
+        }, checkLines(firstLine, secondLine));
     }
 
     @Test
-    public void addLicenseToPerlWithoutHashBang()
-            throws IOException {
+    public void addLicenseToPerlWithoutHashBang() throws IOException {
         String filename = "tmp.pl";
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("print \"Hello world\"\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("print \"Hello world\"\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -393,45 +360,41 @@ public void addLicenseToPerlWithHashBang() throws IOException {
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("print \"Hello world\"\n");
-                    }
-                },
-                checkLines(firstLine, secondLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("print \"Hello world\"\n");
+            }
+        }, checkLines(firstLine, secondLine));
     }
 
     @Test
     public void addLicenseToPerlModule() throws IOException {
         String filename = "tmp.pm";
         final String firstLine = "package API::TestAPI;";
-        final String secondLine = ""; 
+        final String secondLine = "";
         final String thirdLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("print \"Hello world\"\n");
-                    }
-                },
-                checkLines(firstLine, secondLine, thirdLine));
-    }    
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("print \"Hello world\"\n");
+            }
+        }, checkLines(firstLine, secondLine, thirdLine));
+    }
 
     @Test
-    public void addLicenseToTclWithoutHashBang()
-            throws IOException {
+    public void addLicenseToTclWithoutHashBang() throws IOException {
         String filename = "tmp.tcl";
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("puts \"Hello world\"\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("puts \"Hello world\"\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -441,13 +404,12 @@ public void addLicenseToTclWithHashBang() throws IOException {
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("puts \"Hello world\"\n");
-                    }
-                },
-                checkLines(firstLine, secondLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("puts \"Hello world\"\n");
+            }
+        }, checkLines(firstLine, secondLine));
     }
 
     @Test
@@ -458,14 +420,13 @@ public void addLicenseToPHP() throws IOException {
         final String thirdLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("echo 'Hello World'\n");
-                        writer.write("?>\n");
-                    }
-                },
-                checkLines(firstLine, secondLine, thirdLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("echo 'Hello World'\n");
+                writer.write("?>\n");
+            }
+        }, checkLines(firstLine, secondLine, thirdLine));
     }
 
     @Test
@@ -474,15 +435,14 @@ public void addLicenseToCSharp() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("namespace org.example {\n");
-                        writer.write("    public class Foo {\n");
-                        writer.write("    }\n");
-                        writer.write("}\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("namespace org.example {\n");
+                writer.write("    public class Foo {\n");
+                writer.write("    }\n");
+                writer.write("}\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -491,14 +451,13 @@ public void addLicenseToGroovy() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("package org.example \n");
-                        writer.write("    class Foo {\n");
-                        writer.write("    }\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("package org.example \n");
+                writer.write("    class Foo {\n");
+                writer.write("    }\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -507,15 +466,14 @@ public void addLicenseToCPlusPlus() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write("namespace org.example {\n");
-                        writer.write("    public class Foo {\n");
-                        writer.write("    }\n");
-                        writer.write("}\n");
-                    }
-                },
-                checkLines(firstLine, null));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write("namespace org.example {\n");
+                writer.write("    public class Foo {\n");
+                writer.write("    }\n");
+                writer.write("}\n");
+            }
+        }, checkLines(firstLine, null));
     }
 
     @Test
@@ -524,33 +482,28 @@ public void addLicenseToGo() throws IOException {
         final String firstLine = "package main";
         String secondLine = "";
         String thirdLine = "/*";
-        
-        		
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("import (\n");
-                        writer.write("    log\n");
-                        writer.write(")\n");
-                    }
-                },
-                checkLines(firstLine, secondLine, thirdLine));
-    }    
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write("import (\n");
+                writer.write("    log\n");
+                writer.write(")\n");
+            }
+        }, checkLines(firstLine, secondLine, thirdLine));
+    }
 
     @Test
     public void fileWithBOM() throws IOException {
         File f = Resources.getResourceFile("violations/FilterTest.cs");
         try {
-            ApacheV2LicenseAppender appender =
-                    new ApacheV2LicenseAppender();
+            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender();
             appender.append(f);
 
             BufferedReader r = null;
             try {
-                r = new BufferedReader(new FileReader(f.getAbsolutePath()
-                        + ".new"));
+                r = new BufferedReader(new FileReader(f.getAbsolutePath() + ".new"));
                 assertEquals("/*", r.readLine());
                 String line = null;
                 while ((line = r.readLine()) != null) {
@@ -570,169 +523,160 @@ public void fileWithBOM() throws IOException {
     @Test
     public void addLicenseToVS2003solution() throws IOException {
         String filename = "tmp.sln";
-        final String firstLine = "Microsoft Visual Studio Solution File,"
-                + " Format Version 8.0";
+        final String firstLine = "Microsoft Visual Studio Solution File," + " Format Version 8.0";
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
-                        writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
-                        writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
-                        writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
-                        writer.write("\tEndProjectSection\n");
-                        writer.write("EndProject\n");
-                    }
-                },
-                checkLines(firstLine, secondLine));
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write(
+                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
+                writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
+                writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
+                writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
+                writer.write("\tEndProjectSection\n");
+                writer.write("EndProject\n");
+            }
+        }, checkLines(firstLine, secondLine));
     }
 
     @Test
     public void addLicenseToVS2005solution() throws IOException {
         String filename = "tmp.sln";
-        final String firstLine = "Microsoft Visual Studio Solution File,"
-                + " Format Version 9.0";
+        final String firstLine = "Microsoft Visual Studio Solution File," + " Format Version 9.0";
         final String secondLine = "# Visual Studio 2005";
         final String thirdLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write(secondLine + "\n");
-                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
-                        writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
-                        writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
-                        writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
-                        writer.write("\tEndProjectSection\n");
-                        writer.write("EndProject\n");
-                    }
-                },
-                new NewFileReader() {
-                    public void readFile(BufferedReader r) throws IOException {
-                        String line = r.readLine();
-                        assertEquals("First line is incorrect",
-                                firstLine, line);
-                        line = r.readLine();
-                        assertEquals("Second line is incorrect",
-                                secondLine, line);
-                        line = r.readLine();
-                        assertEquals("Third line is incorrect",
-                                thirdLine, line);
-                    }
-                });
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write(secondLine + "\n");
+                writer.write(
+                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
+                writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
+                writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
+                writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
+                writer.write("\tEndProjectSection\n");
+                writer.write("EndProject\n");
+            }
+        }, new NewFileReader() {
+            @Override
+            public void readFile(BufferedReader r) throws IOException {
+                String line = r.readLine();
+                assertEquals("First line is incorrect", firstLine, line);
+                line = r.readLine();
+                assertEquals("Second line is incorrect", secondLine, line);
+                line = r.readLine();
+                assertEquals("Third line is incorrect", thirdLine, line);
+            }
+        });
     }
 
     @Test
     public void addLicenseToVS2010ExpressSolution() throws IOException {
         String filename = "tmp.sln";
-        final String firstLine = "Microsoft Visual Studio Solution File, "
-                + "Format Version 11.00";
+        final String firstLine = "Microsoft Visual Studio Solution File, " + "Format Version 11.00";
         final String secondLine = "# Visual C# Express 2010";
         final String thirdLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write(secondLine + "\n");
-                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
-                        writer.write("EndProject\n");
-                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
-                        writer.write("EndProject\n");
-                        writer.write("Global\n");
-                        writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
-                        writer.write("Debug|Any CPU = Debug|Any CPU\n");
-                        writer.write("Release|Any CPU = Release|Any CPU\n");
-                        writer.write("EndGlobalSection\n");
-                        writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                        writer.write("EndGlobalSection\n");
-                        writer.write("GlobalSection(SolutionProperties) = preSolution\n");
-                        writer.write("HideSolutionNode = FALSE\n");
-                        writer.write("EndGlobalSection\n");
-                        writer.write("EndGlobal \n");
-                    }
-                },
-                new NewFileReader() {
-                    public void readFile(BufferedReader r) throws IOException {
-                        String line = r.readLine();
-                        assertEquals("First line is incorrect",
-                                firstLine, line);
-                        line = r.readLine();
-                        assertEquals("Second line is incorrect",
-                                secondLine, line);
-                        line = r.readLine();
-                        assertEquals("Third line is incorrect",
-                                thirdLine, line);
-                    }
-                });
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write(secondLine + "\n");
+                writer.write(
+                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
+                writer.write("EndProject\n");
+                writer.write(
+                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
+                writer.write("EndProject\n");
+                writer.write("Global\n");
+                writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
+                writer.write("Debug|Any CPU = Debug|Any CPU\n");
+                writer.write("Release|Any CPU = Release|Any CPU\n");
+                writer.write("EndGlobalSection\n");
+                writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                writer.write("EndGlobalSection\n");
+                writer.write("GlobalSection(SolutionProperties) = preSolution\n");
+                writer.write("HideSolutionNode = FALSE\n");
+                writer.write("EndGlobalSection\n");
+                writer.write("EndGlobal \n");
+            }
+        }, new NewFileReader() {
+            @Override
+            public void readFile(BufferedReader r) throws IOException {
+                String line = r.readLine();
+                assertEquals("First line is incorrect", firstLine, line);
+                line = r.readLine();
+                assertEquals("Second line is incorrect", secondLine, line);
+                line = r.readLine();
+                assertEquals("Third line is incorrect", thirdLine, line);
+            }
+        });
     }
 
     @Test
     public void addLicenseToVS2010SolutionWithBlankLine() throws IOException {
         String filename = "tmp.sln";
         final String firstLine = "";
-        final String secondLine = "Microsoft Visual Studio Solution File, "
-                + "Format Version 11.00";
+        final String secondLine = "Microsoft Visual Studio Solution File, " + "Format Version 11.00";
         final String thirdLine = "# Visual C# Express 2010";
         final String forthLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-                    public void createFile(Writer writer)
-                            throws IOException {
-                        writer.write(firstLine + "\n");
-                        writer.write(secondLine + "\n");
-                        writer.write(thirdLine + "\n");
-                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
-                        writer.write("EndProject\n");
-                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
-                        writer.write("EndProject\n");
-                        writer.write("Global\n");
-                        writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
-                        writer.write("Debug|Any CPU = Debug|Any CPU\n");
-                        writer.write("Release|Any CPU = Release|Any CPU\n");
-                        writer.write("EndGlobalSection\n");
-                        writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                        writer.write("EndGlobalSection\n");
-                        writer.write("GlobalSection(SolutionProperties) = preSolution\n");
-                        writer.write("HideSolutionNode = FALSE\n");
-                        writer.write("EndGlobalSection\n");
-                        writer.write("EndGlobal \n");
-                    }
-                },
-                new NewFileReader() {
-                    public void readFile(BufferedReader r) throws IOException {
-                        String line = r.readLine();
-                        assertEquals("First line is incorrect",
-                                firstLine, line);
-                        line = r.readLine();
-                        assertEquals("Second line is incorrect",
-                                secondLine, line);
-                        line = r.readLine();
-                        assertEquals("Third line is incorrect",
-                                thirdLine, line);
-                        line = r.readLine();
-                        assertEquals("Forth line is incorrect",
-                                forthLine, line);
-                    }
-                });
+            @Override
+            public void createFile(Writer writer) throws IOException {
+                writer.write(firstLine + "\n");
+                writer.write(secondLine + "\n");
+                writer.write(thirdLine + "\n");
+                writer.write(
+                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
+                writer.write("EndProject\n");
+                writer.write(
+                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
+                writer.write("EndProject\n");
+                writer.write("Global\n");
+                writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
+                writer.write("Debug|Any CPU = Debug|Any CPU\n");
+                writer.write("Release|Any CPU = Release|Any CPU\n");
+                writer.write("EndGlobalSection\n");
+                writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                writer.write("EndGlobalSection\n");
+                writer.write("GlobalSection(SolutionProperties) = preSolution\n");
+                writer.write("HideSolutionNode = FALSE\n");
+                writer.write("EndGlobalSection\n");
+                writer.write("EndGlobal \n");
+            }
+        }, new NewFileReader() {
+            @Override
+            public void readFile(BufferedReader r) throws IOException {
+                String line = r.readLine();
+                assertEquals("First line is incorrect", firstLine, line);
+                line = r.readLine();
+                assertEquals("Second line is incorrect", secondLine, line);
+                line = r.readLine();
+                assertEquals("Third line is incorrect", thirdLine, line);
+                line = r.readLine();
+                assertEquals("Forth line is incorrect", forthLine, line);
+            }
+        });
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
index 255d2d576..85f6a5f57 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
@@ -1,13 +1,5 @@
 package org.apache.rat.config;
 
-import org.apache.rat.api.MetaData;
-import org.apache.rat.license.ILicenseFamily;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -38,6 +30,8 @@ public class ConfigurationUtilTest {
 //    }
 //    @Test
 //    public void toNamesRegular() {
-        //assertEquals(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1, ConfigurationUtil.toNames(new ILicenseFamily[]{new GPL1LicenseFamily()}).get(0));
+    // assertEquals(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1,
+    // ConfigurationUtil.toNames(new ILicenseFamily[]{new
+    // GPL1LicenseFamily()}).get(0));
 //    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
index 2b78d9558..43571ce7f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
@@ -15,16 +15,16 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.document;
 
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+
 public class MockDocument implements Document {
 
     private final Reader reader;
@@ -38,30 +38,34 @@ public MockDocument() {
     public MockDocument(String name) {
         this(null, name);
     }
-    
+
     public MockDocument(Reader reader, String name) {
         super();
         this.reader = reader;
         this.name = name;
     }
 
+    @Override
     public Reader reader() throws IOException {
         return reader;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public boolean isComposite() {
         return false;
     }
-    
+
+    @Override
     public MetaData getMetaData() {
         return metaData;
     }
-    
 
+    @Override
     public InputStream inputStream() throws IOException {
         throw new UnsupportedOperationException("in MockDocument inputStream()");
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java
index 65a3d44e8..c5b513ec4 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java
@@ -15,18 +15,19 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.document;
 
-import org.apache.rat.api.Document;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.rat.api.Document;
+
 public class MockDocumentAnalyser implements IDocumentAnalyser {
 
     public final List<Document> matches = new ArrayList<>();
-    
+
+    @Override
     public void analyse(Document document) throws RatDocumentAnalysisException {
         matches.add(document);
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
index a6bfa0527..07cd33e3d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
@@ -24,13 +24,15 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+import org.apache.rat.testhelpers.TestingLocation;
+
 public class ToNameTransformerTest {
 
     private final ToNameTransformer transformer = new ToNameTransformer();
     
     @Test
     public void transformLocation() {
-        MockLocation location = new MockLocation();
+        TestingLocation location = new TestingLocation();
         Object result = transformer.transform(location);
         assertNotNull("Transform into name", result);
         assertEquals("Transform into name", location.name, result);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java b/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java
index cf44004de..3478cef3d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java
@@ -15,15 +15,17 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.header;
 
 public class SimpleCharFilter implements CharFilter {
 
     public boolean filterOut = false;
-    
-    public SimpleCharFilter() {}
 
+    public SimpleCharFilter() {
+    }
+
+    @Override
     public boolean isFilteredOut(char character) {
         return filterOut;
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index f9d7e349b..8ed209cdd 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -28,9 +28,9 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.api.MetaData.Datum;
-import org.apache.rat.document.MockLocation;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.testhelpers.TestingLocation;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -46,7 +46,7 @@ public void setUp() throws Exception {
 
         policy = new DefaultPolicy(
                 defaults.getLicenses().stream().map(ILicense::getLicenseFamily).collect(Collectors.toList()));
-        subject = new MockLocation("subject");
+        subject = new TestingLocation("subject");
     }
 
     private void assertApproval(boolean pApproved) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 5a10fc716..cde7130c7 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -31,7 +31,6 @@
 
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
@@ -41,6 +40,7 @@
 import org.apache.rat.report.xml.writer.IXmlWriter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 import org.apache.rat.test.utils.Resources;
+import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Before;
 import org.junit.Test;
@@ -109,7 +109,7 @@ public void testNoLicense() throws Exception {
 
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
-        //configuration.addLicense(mockLicense);
+        // configuration.addLicense(mockLicense);
         try {
             XmlReportFactory.createStandardReport(writer, statistic, configuration);
             fail("Should have thrown exception");
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index 13b99f4a1..ae0dd6857 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -19,19 +19,25 @@
 package org.apache.rat.report.xml;
 
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
+import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.StringWriter;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
+
 import org.apache.rat.analysis.DefaultAnalyserFactory;
-import org.apache.rat.analysis.IHeaderMatcher.State;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.CopyrightMatcher;
+import org.apache.rat.analysis.matchers.OrMatcher;
+import org.apache.rat.analysis.matchers.SimpleTextMatcher;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.report.AbstractReport;
@@ -41,27 +47,35 @@
 import org.apache.rat.report.xml.writer.IXmlWriter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 import org.apache.rat.test.utils.Resources;
+import org.apache.rat.testhelpers.TestingLicense;
+import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Before;
 import org.junit.Test;
+import org.w3c.dom.Document;
 
 public class XmlReportTest {
 
     private static final Pattern IGNORE = Pattern.compile(".svn");
-    private StringWriter out;
+    private ByteArrayOutputStream out;
     private IXmlWriter writer;
     private RatReport report;
 
     @Before
     public void setUp() throws Exception {
-        out = new StringWriter();
-        writer = new XmlWriter(out);
+        out = new ByteArrayOutputStream();
+        writer = new XmlWriter(new BufferedWriter(new OutputStreamWriter(out)));
         writer.startDocument();
         final SimpleXmlClaimReporter reporter = new SimpleXmlClaimReporter(writer);
-        final ILicense matcher = mock(ILicense.class);
-        when(matcher.matches(any())).thenReturn(State.t);
+        final IHeaderMatcher asf1Matcher = new SimpleTextMatcher("http://www.apache.org/licenses/LICENSE-2.0");
+        final IHeaderMatcher asf2Matcher = new SimpleTextMatcher("https://www.apache.org/licenses/LICENSE-2.0.txt");
+        final IHeaderMatcher asfMatcher = new OrMatcher(Arrays.asList(asf1Matcher, asf2Matcher));
+        final ILicense asfLic = new TestingLicense("ASF", asfMatcher);
+
+        final IHeaderMatcher qosMatcher = new CopyrightMatcher("2004", "2011", "QOS.ch");
+        final ILicense qosLic = new TestingLicense("QOS", qosMatcher);
 
-        IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(Arrays.asList(matcher));
+        IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(Arrays.asList(asfLic, qosLic));
         final List<AbstractReport> reporters = new ArrayList<>();
         reporters.add(reporter);
         report = new ClaimReporterMultiplexer(analyser, reporters);
@@ -82,97 +96,23 @@ public void baseReport() throws Exception {
         final String output = out.toString();
         assertTrue("Preamble and document element are OK",
                 output.startsWith("<?xml version='1.0'?>" + "<rat-report timestamp="));
-        assertTrue(output + "Part after timestamp attribute is OK", output.endsWith(">" + "<resource name='"
-                + elementsPath + "/Image.png'><type name='binary'/></resource>" + "<resource name='" + elementsPath
-                + "/LICENSE'><type name='notice'/></resource>" + "<resource name='" + elementsPath
-                + "/NOTICE'><type name='notice'/></resource>" + "<resource name='" + elementsPath
-                + "/Source.java'><header-sample>package elements;\n" + "\n" + "/*\n"
-                + " * This file does intentionally *NOT* contain an AL license header,\n"
-                + " * because it is used in the test suite.\n" + " */\n" + "public class Source {\n" + "\n" + "}\n"
-                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
-                + "<resource name='" + elementsPath + "/Text.txt'><header-sample>/*\n"
-                + " * Licensed to the Apache Software Foundation (ASF) under one\n"
-                + " * or more contributor license agreements.  See the NOTICE file\n"
-                + " * distributed with this work for additional information\n"
-                + " * regarding copyright ownership.  The ASF licenses this file\n"
-                + " * to you under the Apache License, Version 2.0 (the \"License\");\n"
-                + " * you may not use this file except in compliance with the License.\n"
-                + " * You may obtain a copy of the License at\n" + " *\n"
-                + " *    http://www.apache.org/licenses/LICENSE-2.0\n" + " *\n"
-                + " * Unless required by applicable law or agreed to in writing,\n"
-                + " * software distributed under the License is distributed on an\n"
-                + " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
-                + " * KIND, either express or implied.  See the License for the\n"
-                + " * specific language governing permissions and limitations\n" + " * under the License.    \n"
-                + " */\n" + "\n" + "            \n"
-                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
-                + "<resource name='" + elementsPath + "/TextHttps.txt'><header-sample>/*\n"
-                + " * Licensed to the Apache Software Foundation (ASF) under one\n"
-                + " * or more contributor license agreements.  See the NOTICE file\n"
-                + " * distributed with this work for additional information\n"
-                + " * regarding copyright ownership.  The ASF licenses this file\n"
-                + " * to you under the Apache License, Version 2.0 (the \"License\");\n"
-                + " * you may not use this file except in compliance with the License.\n"
-                + " * You may obtain a copy of the License at\n" + " *\n"
-                + " *    https://www.apache.org/licenses/LICENSE-2.0.txt\n" + " *\n"
-                + " * Unless required by applicable law or agreed to in writing,\n"
-                + " * software distributed under the License is distributed on an\n"
-                + " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
-                + " * KIND, either express or implied.  See the License for the\n"
-                + " * specific language governing permissions and limitations\n" + " * under the License.    \n"
-                + " */\n" + "\n" + "            \n"
-                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
-                + "<resource name='" + elementsPath + "/Xml.xml'><header-sample>&lt;?xml version='1.0'?&gt;\n"
-                + "&lt;!--\n" + " Licensed to the Apache Software Foundation (ASF) under one   *\n"
-                + " or more contributor license agreements.  See the NOTICE file *\n"
-                + " distributed with this work for additional information        *\n"
-                + " regarding copyright ownership.  The ASF licenses this file   *\n"
-                + " to you under the Apache License, Version 2.0 (the            *\n"
-                + " \"License\"); you may not use this file except in compliance   *\n"
-                + " with the License.  You may obtain a copy of the License at   *\n"
-                + "                                                              *\n"
-                + "   http://www.apache.org/licenses/LICENSE-2.0                 *\n"
-                + "                                                              *\n"
-                + " Unless required by applicable law or agreed to in writing,   *\n"
-                + " software distributed under the License is distributed on an  *\n"
-                + " \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *\n"
-                + " KIND, either express or implied.  See the License for the    *\n"
-                + " specific language governing permissions and limitations      *\n"
-                + " under the License.                                           *\n" + "--&gt;\n"
-                + "&lt;document/&gt;\n"
-                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
-                + "<resource name='" + elementsPath
-                + "/buildr.rb'><header-sample># Licensed to the Apache Software Foundation (ASF) under one or more\n"
-                + "# contributor license agreements.  See the NOTICE file distributed with this\n"
-                + "# work for additional information regarding copyright ownership.  The ASF\n"
-                + "# licenses this file to you under the Apache License, Version 2.0 (the\n"
-                + "# \"License\"); you may not use this file except in compliance with the License.\n"
-                + "# You may obtain a copy of the License at\n" + "#\n"
-                + "#    http://www.apache.org/licenses/LICENSE-2.0\n" + "#\n"
-                + "# Unless required by applicable law or agreed to in writing, software\n"
-                + "# distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n"
-                + "# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the\n"
-                + "# License for the specific language governing permissions and limitations under\n"
-                + "# the License.\n" + "\n" + "unless defined?(Buildr::VERSION)\n" + "  require 'buildr/version'\n"
-                + "end\n" + "\n" + "require 'buildr/core'\n" + "require 'buildr/packaging'\n"
-                + "require 'buildr/java'\n" + "require 'buildr/ide'\n" + "require 'buildr/shell'\n"
-                + "require 'buildr/run'\n" + "\n"
-                + "# Methods defined in Buildr are both instance methods (e.g. when included in Project)\n"
-                + "# and class methods when invoked like Buildr.artifacts().\n" + "module Buildr ; extend self ; end\n"
-                + "\n" + "# The Buildfile object (self) has access to all the Buildr methods and constants.\n"
-                + "class &lt;&lt; self ; include Buildr ; end\n" + "\n"
-                + "# All modules defined under Buildr::* can be referenced without Buildr:: prefix\n"
-                + "# unless a conflict exists (e.g.  Buildr::RSpec vs ::RSpec)\n" + "class Object #:nodoc:\n"
-                + "  Buildr.constants.each do |name|\n" + "    const = Buildr.const_get(name)\n"
-                + "    if const.is_a?(Module)\n" + "      const_set name, const unless const_defined?(name)\n"
-                + "    end\n" + "  end\n" + "end\n" + "\n"
-                + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
-                + "<resource name='" + elementsPath + "/dummy.jar'><type name='archive'/></resource>"
-                + "<resource name='" + elementsPath + "/plain.json'><type name='binary'/></resource>"
-                + "<resource name='" + elementsPath
-                + "/sub/Empty.txt'><header-sample>\n</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/></resource>"
-                + "</rat-report>"));
         assertTrue("Is well formed", XmlUtils.isWellFormedXml(output));
+
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
+
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/ILoggerFactory.java", "QOS", null, "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Image.png", null, null, "binary");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/LICENSE", null, null, "notice");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/NOTICE", null, null, "notice");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Source.java", "?????", null, "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Text.txt", "ASF", null, "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/TextHttps.txt", "ASF", null, "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Xml.xml", "ASF", null, "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/buildr.rb", "ASF", null, "standard");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/dummy.jar", null, null, "archive");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/plain.json", null, null, "binary");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/sub/Empty.txt", "?????", null, "standard");
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
new file mode 100644
index 000000000..275fbc09d
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+public class TestingLicense implements ILicense {
+
+    private final ILicenseFamily family;
+    IHeaderMatcher matcher;
+    private String derivedFrom;
+    private String notes;
+
+    public TestingLicense() {
+        this("DfltTst", new TestingMatcher());
+    }
+
+    public TestingLicense(String id, IHeaderMatcher matcher) {
+        this.family = ILicenseFamily.builder().setLicenseFamilyCategory(id)
+                .setLicenseFamilyName("TestingLicense: " + id).build();
+        this.matcher = matcher;
+        this.derivedFrom = null;
+        this.notes = null;
+    }
+
+    @Override
+    public String toString() {
+        return family.toString();
+    }
+
+    public ILicenseFamily getFamily() {
+        return family;
+    }
+
+    public IHeaderMatcher getMatcher() {
+        return matcher;
+    }
+
+    public void setMatcher(IHeaderMatcher matcher) {
+        this.matcher = matcher;
+    }
+
+    public void setDerivedFrom(String derivedFrom) {
+        this.derivedFrom = derivedFrom;
+    }
+
+    @Override
+    public String getId() {
+        return matcher.getId();
+    }
+
+    @Override
+    public void reset() {
+        matcher.reset();
+    }
+
+    @Override
+    public State matches(String line) {
+        return matcher.matches(line);
+    }
+
+    @Override
+    public State finalizeState() {
+        return matcher.finalizeState();
+    }
+
+    @Override
+    public State currentState() {
+        return matcher.currentState();
+    }
+
+    @Override
+    public ILicenseFamily getLicenseFamily() {
+        return family;
+    }
+
+    @Override
+    public int compareTo(ILicense other) {
+        return ILicense.getComparator().compare(this, other);
+    }
+
+    @Override
+    public String getNotes() {
+        return notes;
+    }
+
+    @Override
+    public String derivedFrom() {
+        return derivedFrom;
+    }
+
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLocation.java
similarity index 82%
rename from apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
rename to apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLocation.java
index d4aba50bc..0425da893 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLocation.java
@@ -15,8 +15,8 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
-package org.apache.rat.document;
+ */
+package org.apache.rat.testhelpers;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,26 +25,27 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 
-public class MockLocation implements Document {
+public class TestingLocation implements Document {
 
     public final String name;
     public final String url;
     private final MetaData metaData = new MetaData();
-    
-    public MockLocation() {
+
+    public TestingLocation() {
         this("name", "url");
     }
-    
-    public MockLocation(String name) {
+
+    public TestingLocation(String name) {
         this(name, "url");
     }
 
-    public MockLocation(String name, String url) {
+    public TestingLocation(String name, String url) {
         super();
         this.name = name;
         this.url = url;
     }
 
+    @Override
     public String getName() {
         return name;
     }
@@ -53,20 +54,23 @@ public String getURL() {
         return url;
     }
 
+    @Override
     public boolean isComposite() {
         return false;
     }
 
+    @Override
     public Reader reader() throws IOException {
-        throw new UnsupportedOperationException( "Opening Reader in MockLocation");
+        throw new UnsupportedOperationException("Opening Reader in TestingLocation");
     }
 
+    @Override
     public MetaData getMetaData() {
         return metaData;
     }
-    
 
+    @Override
     public InputStream inputStream() throws IOException {
-        throw new UnsupportedOperationException("Opening inputStream in MockLocation");
+        throw new UnsupportedOperationException("Opening inputStream in TestingLocation");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
new file mode 100644
index 000000000..2d6d0b26e
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+import org.apache.rat.analysis.matchers.AbstractHeaderMatcher;
+
+public class TestingMatcher extends AbstractHeaderMatcher {
+    private State lastState;
+    private final boolean[] initialResults;
+    private Queue<Boolean> results;
+    public State finalState = State.f;
+
+    public TestingMatcher() {
+        this("dfltMtch", false);
+    }
+
+    public TestingMatcher(String id, boolean result) {
+        this(id, new boolean[] { result });
+    }
+
+    public TestingMatcher(String id, boolean... results) {
+        super(id);
+        initialResults = results;
+        this.results = new LinkedList<>();
+        reset();
+    }
+
+    @Override
+    public final State matches(String line) {
+        if (lastState == State.t) {
+            return lastState;
+        }
+        if (line != null && results.poll()) {
+            lastState = State.t;
+        }
+        return lastState;
+    }
+
+    @Override
+    public void reset() {
+        lastState = State.i;
+        results.clear();
+        for (boolean b : initialResults) {
+            this.results.add(b);
+        }
+    }
+
+    @Override
+    public State finalizeState() {
+        if (lastState == State.i) {
+            lastState = finalState;
+        }
+        return lastState;
+    }
+
+    @Override
+    public final State currentState() {
+        return lastState;
+    }
+}
\ No newline at end of file
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlUtils.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
similarity index 60%
rename from apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlUtils.java
rename to apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
index 098e201b6..e5ad20278 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlUtils.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
@@ -16,9 +16,12 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  */ 
-package org.apache.rat.report.xml;
+package org.apache.rat.testhelpers;
 
+import org.apache.rat.license.ILicenseFamily;
 import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -28,6 +31,12 @@
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+
+import static org.junit.Assert.assertEquals;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
@@ -63,6 +72,40 @@ public static final boolean isWellFormedXml(final InputSource isource) {
             throw new UndeclaredThrowableException(e);
         }
     }
+    
+    /**
+     * Finds a node via xpath on the document.  And then checks family, approval and type of elements of the node.
+     * @param doc The document to check/
+     * @param xpath the XPath instance to use.
+     * @param resource the xpath statement to locate the node.
+     * @param family the expected family for the node (may be null)
+     * @param approval the expected approval value (may be null)
+     * @param type the type of resource located.
+     * @return The node that was located
+     * @throws Exception on XPath error.
+     */
+    public static Node checkNode(Document doc, XPath xpath, String resource, String family, String approval, String type)
+            throws Exception {
+        Node root = getNode(doc, xpath, String.format("/rat-report/resource[@name='%s']", resource));
+        if (family != null) {
+            getNode(root, xpath, String.format("header-type[@name='%s']", ILicenseFamily.makeCategory(family)));
+            getNode(root, xpath, "license-family[@name]");
+            if (family.equals("?????")) {
+                getNode(root, xpath, "header-sample");
+            }
+        }
+        if (approval != null) {
+            getNode(root, xpath, String.format("license-approval[@name='%s']", approval));
+        }
+        getNode(root, xpath, String.format("type[@name='%s']", type));
+        return root;
+    }
+
+    public static Node getNode(Object source, XPath xPath, String xpath) throws XPathExpressionException {
+        NodeList nodeList = (NodeList) xPath.compile(xpath).evaluate(source, XPathConstants.NODESET);
+        assertEquals("Could not find " + xpath, 1, nodeList.getLength());
+        return nodeList.item(0);
+    }
 
     public static final boolean isWellFormedXml(final InputStream in) throws Exception {
         return isWellFormedXml(new InputSource(in));

From 778f7bde3b38f8916a1ba479670b09942c8d3360 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 7 Oct 2023 10:07:44 +0200
Subject: [PATCH 107/299] ant task test run

---
 .../src/test/java/org/example/Matcher.java     | 16 ++++------------
 .../test/resources/antunit/report-junit.xml    | 18 ++++--------------
 .../antunit/report-normal-operation.xml        | 18 ++++--------------
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/apache-rat-tasks/src/test/java/org/example/Matcher.java b/apache-rat-tasks/src/test/java/org/example/Matcher.java
index a3e9b9a88..168f1e8f3 100644
--- a/apache-rat-tasks/src/test/java/org/example/Matcher.java
+++ b/apache-rat-tasks/src/test/java/org/example/Matcher.java
@@ -16,23 +16,15 @@
  */
 package org.example;
 
-import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.AbstractSimpleMatcher;
 
-public class Matcher implements IHeaderMatcher {
+public class Matcher extends AbstractSimpleMatcher {
     public Matcher() {
+        super("MyCustomMatcher");
     }
 
     @Override
-    public String getId() {
-        return "MyCustomMatcher";
-    }
-
-    @Override
-    public void reset() {
-    }
-
-    @Override
-    public boolean matches(String line) {
+    public boolean doMatch(String line) {
         return true;
     }
 
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index 3e637445c..355b4a45b 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -168,25 +168,15 @@
 		<echo file="${output.dir}/src/org/example/InlineMatcher.java"><![CDATA[
 package org.example;
 
-import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.AbstractSimpleMatcher;
 
-public class InlineMatcher implements IHeaderMatcher {
+public class InlineMatcher extends AbstractSimpleMatcher {
     public InlineMatcher() {
+        super("InlineMatcher");
     }
 
     @Override
-    public String getId() {
-        return "MyCustomMatcher";
-    }
-
-
-    @Override
-    public void reset() {
-    }
-
-
-    @Override
-    public boolean matches(String line) {
+    public boolean doMatch(String line) {
         return true;
     }
 }
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
index 544668c6e..4066ff064 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
@@ -453,25 +453,15 @@ SPDX-License-Identifier: Apache-2.0
 		<echo file="${output.dir}/src/org/example/MyMatcher.java"><![CDATA[
 package org.example;
 
-import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.matchers.AbstractSimpleMatcher;
 
-public class MyMatcher implements IHeaderMatcher {
+public class MyMatcher extends AbstractSimpleMatcher {
     public MyMatcher() {
+        super("MyCustomMatcher");
     }
 
     @Override
-    public String getId() {
-        return "MyCustomMatcher";
-    }
-
-
-    @Override
-    public void reset() {
-    }
-
-
-    @Override
-    public boolean matches(String line) {
+    public boolean doMatch(String line) {
         return true;
     }
 }

From a43b6d52375ac7b721068e34f2fb03ace87e93c0 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 7 Oct 2023 15:22:31 +0200
Subject: [PATCH 108/299] fixes for plugin

---
 .../analysis/matchers/SPDXMatcherFactory.java |   5 +
 .../builders/AbstractBuilder.java             |   5 +
 .../builders/ChildContainerBuilder.java       |   7 +
 .../builders/CopyrightBuilder.java            |   5 +
 .../builders/MatcherRefBuilder.java           |   5 +
 .../configuration/builders/NotBuilder.java    |   5 +
 .../configuration/builders/RegexBuilder.java  |  18 +--
 .../configuration/builders/SpdxBuilder.java   |   5 +
 .../configuration/builders/TextBuilder.java   |  10 ++
 .../main/resources/org/apache/rat/default.xml |  11 --
 .../matchers/FullTextMatcherTest.java         |  18 +++
 .../analysis/matchers/SPDXMatcherTest.java    |  18 +++
 .../matchers/SimpleCopyrightTests.java        |  18 +++
 .../matchers/SimpleRegexMatcherTest.java      |  18 +++
 .../matchers/SimpleTextMatcherTest.java       |  18 +++
 apache-rat-plugin/src/it/it1/pom.xml          | 135 +++++++++++++-----
 apache-rat-plugin/src/it/it1/verify.groovy    |   8 +-
 .../src/main/java/org/apache/rat/mp/All.java  |   2 +-
 .../src/main/java/org/apache/rat/mp/Any.java  |   2 +-
 .../java/org/apache/rat/mp/Copyright.java     |   3 +-
 .../org/apache/rat/mp/EnclosingMatcher.java   |  23 +--
 .../main/java/org/apache/rat/mp/License.java  |  15 +-
 .../src/main/java/org/apache/rat/mp/Not.java  |   2 +-
 .../main/java/org/apache/rat/mp/Regex.java    |  14 ++
 .../src/main/java/org/apache/rat/mp/Spdx.java |   6 +
 .../src/main/java/org/apache/rat/mp/Text.java |   4 +
 .../org/apache/rat/mp/RatCheckMojoTest.java   |  68 ++++-----
 .../org/apache/rat/mp/RatTestHelpers.java     | 126 ++++++++--------
 28 files changed, 392 insertions(+), 182 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index b3e6a1b45..1a8e4a2e0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -23,6 +23,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
 
 /**
@@ -64,6 +66,9 @@ private SPDXMatcherFactory() {
     };
 
     public IHeaderMatcher create(String spdxId) {
+        if (StringUtils.isBlank(spdxId)) {
+            throw new ConfigurationException("'spdx' type matcher requires a name");
+        }
         Match matcher = matchers.get(spdxId);
         if (matcher == null) {
             matcher = new Match(spdxId);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
index 8e2300127..6322e1218 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
@@ -41,5 +41,10 @@ protected String getId() {
     }
 
     public abstract IHeaderMatcher build();
+    
+    @Override
+    public String toString() {
+        return String.format( "%s with id %s", this.getClass(), id);
+    }
 
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
index 3e4f43929..411232887 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
@@ -76,5 +76,12 @@ public AbstractBuilder add(Collection<IHeaderMatcher.Builder> children) {
     public List<IHeaderMatcher> getChildren() {
         return children.stream().map(IHeaderMatcher.Builder::build).collect(Collectors.toList());
     }
+    
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder(this.getClass().getSimpleName()).append( ":");
+        children.stream().map(Object::toString).forEach( x -> sb.append("\n").append(x));
+        return sb.toString();
+    }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
index d1f309d91..6bc46d5d8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
@@ -45,4 +45,9 @@ public CopyrightBuilder setOwner(String owner) {
     public IHeaderMatcher build() {
         return new CopyrightMatcher(getId(), start, end, owner);
     }
+    
+    @Override
+    public String toString() {
+        return String.format("Copyright Builder: s:%s e:%s o:%s", start, end, owner);
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
index b3d8c8d90..c3f80923d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
@@ -42,6 +42,11 @@ public IHeaderMatcher build() {
         return result != null ? result : new IHeaderMatcherProxy(referenceId, matchers);
     }
 
+    @Override
+    public String toString() {
+        return "MathcerRefBuilder: "+referenceId;
+    }
+    
     private class IHeaderMatcherProxy implements IHeaderMatcher {
         private final String proxyId;
         private IHeaderMatcher wrapped;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
index 64ebda142..7297cadfe 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
@@ -31,4 +31,9 @@ public IHeaderMatcher build() {
         }
         return new NotMatcher(getId(), children.get(0).build());
     }
+    
+    @Override
+    public String toString() {
+        return String.format( "NotBuilder: %s", children.size()>0 ? children.get(0) : null );
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
index 957f41e46..dac1309d4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
@@ -26,22 +26,24 @@
 
 public class RegexBuilder extends AbstractBuilder {
 
-    private Pattern exp;
+    private Pattern pattern;
 
-    public RegexBuilder setRegex(String exp) {
-        if (null == exp) {
-            throw new ConfigurationException("'regex' type matcher expression value may not be null");
-        }
-        this.exp = Pattern.compile(exp);
+    public RegexBuilder setExpr(String exp) {
+        this.pattern = exp == null ? null : Pattern.compile(exp);
         return this;
     }
 
     @Override
     public IHeaderMatcher build() {
-        if (null == exp) {
+        if (null == pattern) {
             throw new ConfigurationException("'regex' type matcher requires an expression");
         }
-        return new SimpleRegexMatcher(exp);
+        return new SimpleRegexMatcher(pattern);
+    }
+    
+    @Override
+    public String toString() {
+        return String.format("RegexBuilder: %s", pattern==null? null: pattern.pattern());
     }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
index d4fdb4ef0..f2ffda3cc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
@@ -34,4 +34,9 @@ public SpdxBuilder setName(String name) {
     public IHeaderMatcher build() {
         return SPDXMatcherFactory.INSTANCE.create(name);
     }
+    
+    @Override
+    public String toString() {
+        return "SpdxBuilder: "+name;
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
index 328a7a314..89f893eb2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
@@ -28,6 +28,8 @@ public class TextBuilder extends AbstractBuilder implements TextCaptureBuilder {
 
     private String text;
 
+    @SuppressWarnings("unchecked")
+    @Override
     public TextBuilder setText(String text) {
         this.text = text;
         return this;
@@ -43,4 +45,12 @@ public IHeaderMatcher build() {
 
         return complex ? new FullTextMatcher(getId(), text) : new SimpleTextMatcher(getId(), text);
     }
+
+    @Override
+    public String toString() {
+        if (text.length() > 20) {
+            return "TextBuilder: " + text.substring(0, 20) + "...";
+        }
+        return "TextBuilder: " + text;
+    }
 }
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index 24773c3fa..156a8ce6a 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rat-config>
 	<licenses>
-		<!--
-	<license id=id name=name>
-		<note></note>
-	    <text>  </text>
-		<copyright start='' end='' owner=''/>
-		<spdx name=''/> 
-		<and> <license>...</and>
-		<or> <license>...</or> 
-		<matcherRef refId='licenceid' />
-	</license>
--->
 		<license id="AL" name="Apache License Version 2.0">
 			<all>
 				<any id="ALStandard">
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
index 352472d98..e2926e63f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import org.junit.Before;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
index f167ff55f..01a4e5351 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import static org.junit.Assert.assertEquals;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
index 9c6b98899..89efd28b7 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import static org.junit.Assert.assertEquals;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
index f3241075d..160d5cf0b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import org.junit.Before;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
index 4aa7b41fa..7d88bdd88 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.analysis.matchers;
 
 import static org.junit.Assert.assertEquals;
diff --git a/apache-rat-plugin/src/it/it1/pom.xml b/apache-rat-plugin/src/it/it1/pom.xml
index 62815e007..382039d68 100644
--- a/apache-rat-plugin/src/it/it1/pom.xml
+++ b/apache-rat-plugin/src/it/it1/pom.xml
@@ -16,38 +16,105 @@
   limitations under the License.
 -->
 <project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.rat.test</groupId>
-  <artifactId>it1</artifactId>
-  <version>1.0</version>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <version>@pom.version@</version>
-        <configuration>
-          <licenses>
-            <license>
-              <licenseFamilyCategory>YAL__</licenseFamilyCategory>
-              <licenseFamilyName>Yet Another Software License</licenseFamilyName>
-              <notes></notes>
-              <text>Yet Another License</text>
-            </license>
-          </licenses>
-          <licenseFamilies>
-            <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-              <familyName>Yet Another Software License</familyName>
-            </licenseFamily>
-          </licenseFamilies>
-          <includes>
-            <include>src.apt</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.rat.test</groupId>
+	<artifactId>it1</artifactId>
+	<version>1.0</version>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+				<version>@pom.version@</version>
+				<configuration>
+					<licenses>
+<!--						<license>-->
+<!--							<id>CpyrP</id>-->
+<!--							<name>Copyright with properties</name>-->
+<!--							<notes></notes>-->
+<!--							<copyright start="1990" end="1991" owner="foo" />-->
+<!--						</license>-->
+						<license>
+							<id>CpyrT</id>
+							<name>Copyright with tags</name>
+							<notes></notes>
+							<copyright>
+								<start>1990</start>
+								<end>1991</end>
+								<owner>foo</owner>
+							</copyright>
+						</license>
+<!--						<license>-->
+<!--							<id>RegxP</id>-->
+<!--							<name>Regex with properties</name>-->
+<!--							<notes></notes>-->
+<!--							<regex expr="regex property" />-->
+<!--						</license>-->
+						<license>
+							<id>RegxT</id>
+							<name>Regex with tag</name>
+							<notes></notes>
+							<regex>regex tag</regex>
+						</license>
+<!--						<license>-->
+<!--							<id>SpdxP</id>-->
+<!--							<name>Spdx with properties</name>-->
+<!--							<notes></notes>-->
+<!--							<spdx name="spdx-property" />-->
+<!--						</license>-->
+						<license>
+							<id>SpdxT</id>
+							<name>Spdx with tag</name>
+							<notes></notes>
+							<spdx>spxd-tag</spdx>
+						</license>
+<!--						<license>-->
+<!--							<id>TextP</id>-->
+<!--							<name>Text with properties</name>-->
+<!--							<notes></notes>-->
+<!--							<text text="text-property" />-->
+<!--						</license>-->
+						<license>
+							<id>TextT</id>
+							<name>Text with tag</name>
+							<notes></notes>
+							<text>text-tag</text>
+						</license>
+						<license>
+							<id>Not</id>
+							<name>Not testing</name>
+							<notes></notes>
+							<not>
+								<text>not test text</text>
+							</not>
+						</license>
+						<license>
+							<id>All</id>
+							<name>All testing</name>
+							<notes></notes>
+							<all>
+								<text>all test text</text>
+								<spdx>all spdx text</spdx>
+							</all>
+						</license>
+						<license>
+							<id>Any</id>
+							<name>Any testing</name>
+							<notes></notes>
+							<any>
+								<text>any test text</text>
+								<spdx>any spdx text</spdx>
+							</any>
+						</license>
+					</licenses>
+					<includes>
+						<include>src.apt</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/apache-rat-plugin/src/it/it1/verify.groovy b/apache-rat-plugin/src/it/it1/verify.groovy
index 1d1080979..48129484f 100644
--- a/apache-rat-plugin/src/it/it1/verify.groovy
+++ b/apache-rat-plugin/src/it/it1/verify.groovy
@@ -14,6 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-content = new File( basedir, 'target/rat.txt' ).text
 
-assert content.contains( 'YAL__ src.apt' )
\ No newline at end of file
+f = new File( basedir, 'target/rat.txt' )
+assert f.exists()
+
+content = f.text
+
+assert content.contains( 'Not   src.apt' )
\ No newline at end of file
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
index 63de157b5..72700ac12 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/All.java
@@ -30,7 +30,7 @@ public All() {
     }
 
     @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
+    protected void setMatcher(IHeaderMatcher.Builder builder) {
         this.builder.add(builder);
     }
 
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
index 3a4daadc7..77cda43e1 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Any.java
@@ -30,7 +30,7 @@ public Any() {
     }
 
     @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
+    protected void setMatcher(IHeaderMatcher.Builder builder) {
         this.builder.add(builder);
     }
 
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
index da78e5949..034a105e5 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Copyright.java
@@ -38,6 +38,7 @@ public Copyright() {
 
     @Override
     public IHeaderMatcher build() {
-        return setStart(start).setEnd(stop).setOwner(owner).build();
+        setStart(start).setEnd(stop).setOwner(owner);
+        return super.build();
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
index 978abe7fb..d85f9c903 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
@@ -23,35 +23,40 @@
 
 abstract class EnclosingMatcher {
 
-    protected abstract void setBuilder(IHeaderMatcher.Builder builder);
+    protected abstract void setMatcher(IHeaderMatcher.Builder builder);
 
     @Parameter(required = false)
-    public void setAnd(All all) {
-        setBuilder(all);
+    public void setAll(All all) {
+        setMatcher(all);
     }
 
     @Parameter(required = false)
-    public void setOr(Any any) {
-        setBuilder(any);
+    public void setAny(Any any) {
+        setMatcher(any);
     }
 
     @Parameter(required = false)
     public void setText(Text text) {
-        setBuilder(text);
+        setMatcher(text);
     }
 
     @Parameter(required = false)
     public void setCopyright(Copyright copyright) {
-        setBuilder(copyright);
+        setMatcher(copyright);
     }
 
     @Parameter(required = false)
     public void setRegex(Regex regex) {
-        setBuilder(regex);
+        setMatcher(regex);
     }
 
     @Parameter(required = false)
     public void setSpdx(Spdx spdx) {
-        setBuilder(spdx);
+        setMatcher(spdx);
+    }
+    
+    @Parameter(required = false)
+    public void setNot(Not not) {
+        setMatcher(not);
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
index fc89c95a2..d506faf52 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
@@ -33,27 +33,22 @@ public class License extends EnclosingMatcher {
     private String derivedFrom;
 
     @Parameter(required = true)
-    private String licenseFamilyCategory;
+    private String id;
 
     @Parameter(required = true)
-    private String licenseFamilyName;
+    private String name;
 
     public License() {
     }
 
-    @Parameter(required = false)
-    public void setNot(Not not) {
-        setBuilder(not);
-    }
-
     @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
+    protected void setMatcher(IHeaderMatcher.Builder builder) {
         this.builder.setMatcher(builder);
     }
 
     public ILicense build() {
-        return builder.setDerivedFrom(derivedFrom).setLicenseFamilyCategory(licenseFamilyCategory)
-                .setLicenseFamilyCategory(licenseFamilyName).setNotes(notes).build();
+        return builder.setDerivedFrom(derivedFrom).setLicenseFamilyCategory(id)
+                .setLicenseFamilyName(name).setNotes(notes).build();
     }
 
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
index c2a668919..2ba51c8d8 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Not.java
@@ -30,7 +30,7 @@ public Not() {
     }
 
     @Override
-    protected void setBuilder(IHeaderMatcher.Builder builder) {
+    protected void setMatcher(IHeaderMatcher.Builder builder) {
         this.builder.add(builder);
     }
 
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
index dffb321e6..28febed33 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
@@ -18,7 +18,21 @@
  */
 package org.apache.rat.mp;
 
+import javax.inject.Named;
+
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.configuration.builders.RegexBuilder;
 
 public class Regex extends RegexBuilder {
+
+    @Named("expr")
+    public RegexBuilder setExpr(String exp) {
+        System.out.format("Calling setText() with %s\n", exp);
+        return super.setExpr(exp);
+    }
+    public void set(String exp) {
+        System.out.format("Calling set() with %s\n", exp);
+        setExpr(exp);
+    }
+
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
index 5916425be..54620d78a 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
@@ -18,7 +18,13 @@
  */
 package org.apache.rat.mp;
 
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.configuration.builders.SpdxBuilder;
 
 public class Spdx extends SpdxBuilder {
+    
+    @Parameter(name="name")
+    public void set(String name) {
+        super.setName(name);
+    }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
index dee10c45f..16adab186 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
@@ -18,7 +18,11 @@
  */
 package org.apache.rat.mp;
 
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.configuration.builders.TextBuilder;
 
 public class Text extends TextBuilder {
+    public void set(String text) {
+        super.setText(text);
+    }
 }
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index c6eb06949..1e2cdc582 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -212,44 +212,44 @@ public void testIt3() throws Exception {
      *
      * @throws Exception The test failed.
      */
-    @Ignore
-    public void testIt4() throws Exception {
+//    @Ignore
+//    public void testIt4() throws Exception {
     	// In previous versions of the JDK, it used to be possible to
     	// change the value of file.encoding at runtime. As of Java 16,
     	// this is no longer possible. Instead, at this point, we check,
     	// that file.encoding is actually ISO-8859-1. (Within Maven, this
     	// is enforced by the configuration of the surefire plugin.) If not,
     	// we skip this test.
-    	Assume.assumeTrue("Expected file.encoding=ISO-8859-1", "ISO-8859-1".equals(System.getProperty("file.encoding")));
-        final RatCheckMojo mojo = newRatCheckMojo("it4");
-        final File ratTxtFile = getRatTxtFile(mojo);
-        try {
-            setVariableValueToObject(mojo, "reportStyle", "xml");
-            mojo.execute();
-            fail("Expected RatCheckException");
-        } catch (RatCheckException e) {
-            final String msg = e.getMessage();
-            // default value is "${project.build.directory}/rat.txt"
-            final String REPORTFILE = "rat.txt";
-
-            assertTrue("report filename was not contained in '" + msg + "'",
-                    msg.contains(REPORTFILE));
-            assertFalse("no null allowed in '" + msg + "'", (msg.toUpperCase()
-                    .contains("NULL")));
-        }
-        assertTrue(ratTxtFile.exists());
-        DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        try (FileInputStream fis = new FileInputStream(ratTxtFile)) {
-            Document doc = db.parse(fis);
-            NodeList headerSample = doc.getElementsByTagName("header-sample");
-            String textContent = headerSample.item(0).getTextContent();
-            if (textContent.length() == 0) { // can be the pom since this test will parse 2 files but the pom is "ok"
-                textContent = headerSample.item(1).getTextContent();
-            }
-            boolean byteSequencePresent = textContent.contains("\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF");
-            assertTrue("Report should contain test umlauts, got '" + textContent + "'", byteSequencePresent);
-        } catch (Exception ex) {
-            fail("Report file could not be parsed as XML: " + ex.getMessage());
-        }
-    }
+//    	Assume.assumeTrue("Expected file.encoding=ISO-8859-1", "ISO-8859-1".equals(System.getProperty("file.encoding")));
+//        final RatCheckMojo mojo = newRatCheckMojo("it4");
+//        final File ratTxtFile = getRatTxtFile(mojo);
+//        try {
+//            setVariableValueToObject(mojo, "reportStyle", "xml");
+//            mojo.execute();
+//            fail("Expected RatCheckException");
+//        } catch (RatCheckException e) {
+//            final String msg = e.getMessage();
+//            // default value is "${project.build.directory}/rat.txt"
+//            final String REPORTFILE = "rat.txt";
+//
+//            assertTrue("report filename was not contained in '" + msg + "'",
+//                    msg.contains(REPORTFILE));
+//            assertFalse("no null allowed in '" + msg + "'", (msg.toUpperCase()
+//                    .contains("NULL")));
+//        }
+//        assertTrue(ratTxtFile.exists());
+//        DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+//        try (FileInputStream fis = new FileInputStream(ratTxtFile)) {
+//            Document doc = db.parse(fis);
+//            NodeList headerSample = doc.getElementsByTagName("header-sample");
+//            String textContent = headerSample.item(0).getTextContent();
+//            if (textContent.length() == 0) { // can be the pom since this test will parse 2 files but the pom is "ok"
+//                textContent = headerSample.item(1).getTextContent();
+//            }
+//            boolean byteSequencePresent = textContent.contains("\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF");
+//            assertTrue("Report should contain test umlauts, got '" + textContent + "'", byteSequencePresent);
+//        } catch (Exception ex) {
+//            fail("Report file could not be parsed as XML: " + ex.getMessage());
+//        }
+//    }
 }
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
index 1656a95ff..bee5e2950 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
@@ -1,5 +1,16 @@
 package org.apache.rat.mp;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -30,17 +41,6 @@
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.util.DirectoryScanner;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
 /**
  * Test helpers used when verifying mojo interaction in RAT integration tests.
  */
@@ -71,8 +71,8 @@ public static void remove(File pDir) throws IOException {
     }
 
     /**
-     * Copies the given files recursively in order to get all integration test
-     * files into a target directory.
+     * Copies the given files recursively in order to get all integration test files
+     * into a target directory.
      *
      * @param pSource source files.
      * @param pTarget target directory
@@ -86,7 +86,7 @@ public static void copy(File pSource, File pTarget) throws IOException {
             final DirectoryScanner scanner = new DirectoryScanner();
             scanner.setBasedir(pSource);
             scanner.addDefaultExcludes();
-            scanner.setIncludes(new String[]{"*"});
+            scanner.setIncludes(new String[] { "*" });
             scanner.scan();
             final String[] dirs = scanner.getIncludedDirectories();
 
@@ -100,20 +100,19 @@ public static void copy(File pSource, File pTarget) throws IOException {
                 copy(new File(pSource, file), new File(pTarget, file));
             }
         } else if (pSource.isFile()) {
-            final FileInputStream fis = new FileInputStream(pSource);
-            final FileOutputStream fos = new FileOutputStream(pTarget);
-            final byte[] buffer = new byte[8192];
-            for (; ; ) {
-                int res = fis.read(buffer);
-                if (res == -1) {
-                    break;
-                }
-                if (res > 0) {
-                    fos.write(buffer, 0, res);
+            try (final FileInputStream fis = new FileInputStream(pSource);
+                    final FileOutputStream fos = new FileOutputStream(pTarget);) {
+                final byte[] buffer = new byte[8192];
+                for (;;) {
+                    int res = fis.read(buffer);
+                    if (res == -1) {
+                        break;
+                    }
+                    if (res > 0) {
+                        fos.write(buffer, 0, res);
+                    }
                 }
             }
-            fos.close();
-            fis.close();
         } else {
             throw new IOException("Unable to copy unknown object " + pSource);
         }
@@ -126,8 +125,7 @@ public static void copy(File pSource, File pTarget) throws IOException {
      * @return A configured instance of a Default renderer.
      * @throws Exception Creating the object failed.
      */
-    public static Renderer newSiteRenderer(PlexusContainer container)
-            throws Exception {
+    public static Renderer newSiteRenderer(PlexusContainer container) throws Exception {
         return (Renderer) container.lookup(Renderer.ROLE, "default");
     }
 
@@ -139,15 +137,14 @@ public static Renderer newSiteRenderer(PlexusContainer container)
      */
     public static ArtifactFactory newArtifactFactory() throws Exception {
         final InvocationHandler handler = new InvocationHandler() {
-            public Object invoke(Object pProxy, Method pMethod, Object[] pArgs)
-                    throws Throwable {
+            @Override
+            public Object invoke(Object pProxy, Method pMethod, Object[] pArgs) throws Throwable {
                 System.out.println("Invoking method " + pMethod);
                 throw new IllegalStateException("Not implemented");
             }
         };
-        return (ArtifactFactory) Proxy.newProxyInstance(Thread.currentThread()
-                        .getContextClassLoader(),
-                new Class[]{ArtifactFactory.class}, handler);
+        return (ArtifactFactory) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
+                new Class[] { ArtifactFactory.class }, handler);
     }
 
     /**
@@ -157,14 +154,12 @@ public Object invoke(Object pProxy, Method pMethod, Object[] pArgs)
      * @return A configured instance of {@link MavenArtifactRepository}.
      * @throws Exception Creating the object failed.
      */
-    public static ArtifactRepository newArtifactRepository(
-            PlexusContainer container) throws Exception {
+    public static ArtifactRepository newArtifactRepository(PlexusContainer container) throws Exception {
         File m2Dir = new File(System.getProperty("user.home"), ".m2");
         File settingsFile = new File(m2Dir, "settings.xml");
         String localRepo = null;
         if (settingsFile.exists()) {
-            Settings settings = new SettingsXpp3Reader().read(new FileReader(
-                    settingsFile));
+            Settings settings = new SettingsXpp3Reader().read(new FileReader(settingsFile));
             localRepo = settings.getLocalRepository();
         }
         if (localRepo == null) {
@@ -172,42 +167,42 @@ public static ArtifactRepository newArtifactRepository(
         }
         ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) container
                 .lookup(ArtifactRepositoryLayout.ROLE, "default");
-        return new MavenArtifactRepository("local", "file://" + localRepo,
-                repositoryLayout, new ArtifactRepositoryPolicy(), new ArtifactRepositoryPolicy());
+        return new MavenArtifactRepository("local", "file://" + localRepo, repositoryLayout,
+                new ArtifactRepositoryPolicy(), new ArtifactRepositoryPolicy());
     }
 
-    public static File makeSourceDirectory(String mvnBaseDir, File pFile,
-                                           String pDir, boolean pCreateCopy) throws IOException {
+    public static File makeSourceDirectory(String mvnBaseDir, File pFile, String pDir, boolean pCreateCopy)
+            throws IOException {
         if (!pCreateCopy) {
             return pFile;
         }
 
-        final File targetDir = new File(new File(new File(mvnBaseDir),
-                "target/it-source"), pDir);
+        final File targetDir = new File(new File(new File(mvnBaseDir), "target/it-source"), pDir);
         remove(targetDir);
         copy(pFile, targetDir);
         return targetDir;
     }
 
-    public static File getSourceDirectory(String mvnBaseDir, String pDir,
-                                          boolean pCreateCopy, final File baseDir) throws IOException {
-        return makeSourceDirectory(mvnBaseDir, new File(new File(baseDir,
-                "src/test/resources/unit"), pDir), pDir, pCreateCopy);
+    public static File getSourceDirectory(String mvnBaseDir, String pDir, boolean pCreateCopy, final File baseDir)
+            throws IOException {
+        return makeSourceDirectory(mvnBaseDir, new File(new File(baseDir, "src/test/resources/unit"), pDir), pDir,
+                pCreateCopy);
     }
 
     /**
-     * Reads the created report file and verifies, whether the detected numbers
-     * are matching.
+     * Reads the created report file and verifies, whether the detected numbers are
+     * matching.
      *
-     * @param pRatTxtFile        The file to read.
-     * @param pNumALFiles        The number of files with AL.
+     * @param pRatTxtFile The file to read.
+     * @param pNumALFiles The number of files with AL.
      * @param pNumNoLicenseFiles The number of files without license.
-     * @throws IOException              An error occurred while reading the file or the file does not
-     *                                  exist at all.
-     * @throws IllegalArgumentException In case of mismatches in file numbers passed in as parameter.
+     * @throws IOException An error occurred while reading the file or the file does
+     * not exist at all.
+     * @throws IllegalArgumentException In case of mismatches in file numbers passed
+     * in as parameter.
      */
-    public static void ensureRatReportIsCorrect(File pRatTxtFile,
-                                                int pNumALFiles, int pNumNoLicenseFiles) throws IOException {
+    public static void ensureRatReportIsCorrect(File pRatTxtFile, int pNumALFiles, int pNumNoLicenseFiles)
+            throws IOException {
         if (!pRatTxtFile.exists()) {
             throw new FileNotFoundException("Could not find " + pRatTxtFile);
         }
@@ -217,34 +212,25 @@ public static void ensureRatReportIsCorrect(File pRatTxtFile,
             reader = new BufferedReader(new FileReader(pRatTxtFile));
             Integer numALFiles = null;
             Integer numNoLicenseFiles = null;
-            for (; ; ) {
+            for (;;) {
                 String line = reader.readLine();
                 if (line == null) {
                     break;
                 }
                 int offset = line.indexOf("Apache Licensed: ");
                 if (offset >= 0) {
-                    numALFiles = Integer.valueOf(line.substring(
-                            offset + "Apache Licensed: ".length()).trim());
+                    numALFiles = Integer.valueOf(line.substring(offset + "Apache Licensed: ".length()).trim());
                 }
                 offset = line.indexOf("Unknown Licenses");
                 if (offset >= 0) {
-                    numNoLicenseFiles = Integer.valueOf(line.substring(0, offset)
-                            .trim());
+                    numNoLicenseFiles = Integer.valueOf(line.substring(0, offset).trim());
                 }
             }
             reader.close();
 
-            if (!Integer.valueOf(pNumALFiles).equals(numALFiles)) {
-                throw new IllegalArgumentException(
-                        "Amount of licensed files does not match. Expected "
-                                + pNumALFiles + ", got " + numALFiles);
-            }
-
-            if (!Integer.valueOf(pNumNoLicenseFiles).equals(numNoLicenseFiles)) {
+            if (!Integer.valueOf(pNumALFiles).equals(numALFiles) || !Integer.valueOf(pNumNoLicenseFiles).equals(numNoLicenseFiles)) {
                 throw new IllegalArgumentException(
-                        "Amount of licensed files does not match. Expected "
-                                + pNumALFiles + ", got " + numALFiles);
+                        "Amount of licensed files does not match. Expected " + pNumALFiles + ", got " + numALFiles);
             }
         } finally {
             IOUtils.closeQuietly(reader);

From 29f34cf781988379d72e3d265b4e0ce667b89ad8 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 7 Oct 2023 15:25:31 +0200
Subject: [PATCH 109/299] fixed ant tasks

---
 .../main/java/org/apache/rat/anttasks/Regex.java  |  4 ++--
 .../src/test/resources/antunit/customLicense.xml  | 15 +--------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
index 20c3b1c22..4b910620c 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
@@ -26,11 +26,11 @@ public class Regex implements IHeaderMatcher.Builder {
     private RegexBuilder builder = new RegexBuilder();
 
     public void setRegex(String pattern) {
-        builder.setRegex(pattern);
+        builder.setExpr(pattern);
     }
     
     public void addText(String pattern) {
-        builder.setRegex(pattern);
+        builder.setExpr(pattern);
     }
 
     @Override
diff --git a/apache-rat-tasks/src/test/resources/antunit/customLicense.xml b/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
index b798d6ad0..9d8dd94c2 100644
--- a/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
@@ -21,21 +21,8 @@
 -->
 <rat-config>
 	<licenses>
-		<!--
-	<license id=id name=name>
-		<note></note>
-	    <text>  </text>
-		<copyright start='' end='' owner=''/>
-		<spdx name=''/> 
-		<and> <license>...</and>
-		<or> <license>...</or> 
-		<matcher_ref refid='matcherid' />
-		<regex exp='' />
-	</license>
--->
 		<license id="EXAMPLE" name="Example License">
-			<regex regex='.' />
+			<regex expr='.' />
 		</license>
-
 	</licenses>
 </rat-config>

From d836fc90744e256f37ef81eba117a08c3c6360dc Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 7 Oct 2023 16:04:45 +0200
Subject: [PATCH 110/299] added Deprecation tags and cleaned up code

---
 .../java/org/apache/rat/api/MetaData.java     |  47 +++++++-
 .../apache/rat/config/ConfigurationUtil.java  |  44 -------
 .../org/apache/rat/configuration/Format.java  |   1 +
 .../configuration/ILicenseFamilyProxy.java    |  45 --------
 .../rat/configuration/ILicenseProxy.java      |  97 ----------------
 .../configuration/MatcherBuilderTracker.java  |  30 +++--
 .../configuration/XMLConfigurationReader.java |  14 +--
 .../builders/AbstractBuilder.java             |   2 -
 .../rat/document/ToNameTransformer.java       |  18 ++-
 .../impl/AbstractMonolithicDocument.java      |   6 +-
 .../document/impl/ArchiveEntryDocument.java   |  21 ++--
 .../rat/document/impl/DocumentImplUtils.java  |   5 +-
 .../rat/document/impl/FileDocument.java       |  30 ++---
 .../document/impl/MonolithicFileDocument.java |  15 ++-
 .../util/DocumentAnalyserMultiplexer.java     |   5 +-
 .../apache/rat/header/ArrayCharFilter.java    |   7 +-
 .../org/apache/rat/report/AbstractReport.java |   6 +-
 .../claim/util/ClaimReporterMultiplexer.java  |  16 +--
 .../xml/writer/impl/base/XmlWriter.java       | 107 +++++++++---------
 .../org/apache/rat/walker/ArchiveWalker.java  |   1 +
 .../apache/rat/walker/DirectoryWalker.java    |  37 +++---
 .../apache/rat/walker/FileNameComparator.java |   3 +-
 .../java/org/apache/rat/walker/Walker.java    |   7 +-
 .../rat/document/ToNameTransformerTest.java   |   7 +-
 24 files changed, 218 insertions(+), 353 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index 26a4a9512..2c9f78a46 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -26,7 +26,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
 
 /**
  * Data about the subject.
@@ -58,73 +57,119 @@ public class MetaData {
     // Shortcuts used in report output, must be exactly 5 characters
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN = "GEN  ";
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN = "?????";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL = "AL   ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_OASIS = "OASIS";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3CD = "W3CD ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3C = "W3C  ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_DOJO = "DOJO ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_TMF = "TMF  ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL1 ="GPL1 ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL2 ="GPL2 ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL3 = "GPL3 ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_MIT = "MIT  ";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_CDDL1 = "CDDL1";
 
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN);
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_UNKNOWN = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_OASIS);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3CD = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3CD);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_W3C = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_W3C);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_DOJO = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_DOJO);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_TMF = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY, RAT_LICENSE_FAMILY_CATEGORY_VALUE_TMF);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL1 = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY,RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL1);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL2 = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY,RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL2);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_GPL3 = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY,RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL3);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY,RAT_LICENSE_FAMILY_CATEGORY_VALUE_MIT);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1 = new Datum(RAT_URL_LICENSE_FAMILY_CATEGORY,RAT_LICENSE_FAMILY_CATEGORY_VALUE_CDDL1);
 
     // License Family Standard Names
     public static final String RAT_URL_LICENSE_FAMILY_NAME= RAT_BASE_URL + "#LicenseFamilyName";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT = "W3C Software Copyright";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT = "W3C Document Copyright";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE = "OASIS Open License";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE = "Modified BSD License";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0 = "Apache License Version 2.0";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1 =
             "GNU General Public License, version 1";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2 =
             "GNU General Public License, version 2";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3 =
             "GNU General Public License, version 3";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_MIT =
             "The MIT License";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1 =
             "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1 = "Academic Free License, Version 2.1";
+    @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_UNKNOWN = "?????";
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_W3C_SOFTWARE_COPYRIGHT 
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_W3C_DOCUMENT_COPYRIGHT 
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_OASIS_OPEN_LICENSE 
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE 
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
+    @Deprecated
     public static final Datum
             RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1);
+    @Deprecated
     public static final Datum
             RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2);
+    @Deprecated
     public static final Datum
             RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_3 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3);
+    @Deprecated
     public static final Datum
             RAT_LICENSE_FAMILY_NAME_DATUM_MIT = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_MIT);
+    @Deprecated
     public static final Datum
             RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1 = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_ACADEMIC_FREE_LICENSE_VERSION_2_1
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1);
+    @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_UNKNOWN); 
     
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java b/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java
deleted file mode 100644
index 5bdb6831f..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.rat.config;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.rat.license.ILicenseFamily;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ConfigurationUtil {
-    /**
-     * Extract license names from the given license families.
-     *
-     * @param approvedLicenses list of license family implementations.
-     * @return extracted names of given license families.
-     */
-//    public static final List<String> toNames(final ILicenseFamily[] approvedLicenses) {
-//        List<String> names = new ArrayList<>();
-//        if (approvedLicenses != null && approvedLicenses.length > 0) {
-//            for (ILicenseFamily approvedFamily : approvedLicenses) {
-//                names.add(approvedFamily.getFamilyName());
-//            }
-//        }
-//        return names;
-//    }
-
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index 933475cbf..862e3320b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -37,6 +37,7 @@ public enum Format {
     private Constructor<MatcherReader> matcherReader;
     private Constructor<LicenseReader> licenseReader;
     
+    @SuppressWarnings("unchecked")
     Format(Class<?> reader, String... suffix) {
         if (reader != null)
         {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
deleted file mode 100644
index 2d937f3da..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseFamilyProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.configuration;
-
-import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
-
-//public class ILicenseFamilyProxy implements ILicenseFamily {
-//    private final ILicense wrapped;
-//
-//    static public ILicenseFamily create(ILicense license) {
-//        return (license instanceof ILicenseProxy) ? new ILicenseFamilyProxy((ILicenseProxy)license) : license.getLicenseFamily();
-//    }
-//
-//    private ILicenseFamilyProxy(ILicenseProxy license) {
-//        this.wrapped = license;
-//    }
-//
-//    @Override
-//    public String getFamilyName() {
-//        return wrapped.getLicenseFamily().getFamilyName();
-//    }
-//
-//    @Override
-//    public String getFamilyCategory() {
-//        return wrapped.getLicenseFamily().getFamilyCategory();
-//    }
-//
-//}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
deleted file mode 100644
index 0d42ca21e..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/ILicenseProxy.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.configuration;
-
-import java.util.SortedSet;
-
-import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
-
-//public class ILicenseProxy implements ILicense {
-//    private final String proxyId;
-//    private ILicense wrapped;
-//    private SortedSet<ILicense> licenses;
-//
-//    static public ILicense create(String proxyId, SortedSet<ILicense> licenses) {
-//        ILicense result = ILicense.search(proxyId, licenses);
-//        if (result == null) {
-//            result = new ILicenseProxy(proxyId, licenses);
-//        }
-//        return result;
-//    }
-//
-//    ILicenseProxy(String proxyId, SortedSet<ILicense> licenses) {
-//        this.proxyId = proxyId;
-//        this.licenses = licenses;
-//    }
-//
-//    void setLicenses(SortedSet<ILicense> licenses) {
-//        this.licenses = licenses;
-//    }
-//    
-//    private void checkProxy() {
-//        if (wrapped == null) {
-//            wrapped = ILicense.search(proxyId, licenses);
-//            if (wrapped == null) {
-//                throw new IllegalStateException(String.format("%s is not a valid family category", proxyId));
-//            }
-//        }
-//    }
-//
-//    @Override
-//    public ILicenseFamily getLicenseFamily() {
-//        checkProxy();
-//        return wrapped.getLicenseFamily();
-//    }
-//
-//    @Override
-//    public String getNotes() {
-//        checkProxy();
-//        return wrapped.getNotes();
-//    }
-//
-//    @Override
-//    public ILicense derivedFrom() {
-//        checkProxy();
-//        return wrapped.derivedFrom();
-//    }
-//
-//    @Override
-//    public String getId() {
-//        checkProxy();
-//        return wrapped.getId();
-//    }
-//
-//    @Override
-//    public void reset() {
-//        checkProxy();
-//        wrapped.reset();
-//    }
-//
-//    @Override
-//    public boolean matches(String line) {
-//        checkProxy();
-//        return wrapped.matches(line);
-//    }
-//
-//    @Override
-//    public int compareTo(ILicense arg0) {
-//        return ILicense.getComparator().compare(this, arg0);
-//    }
-//}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
index 80460d388..f44a34e01 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
@@ -18,11 +18,7 @@
  */
 package org.apache.rat.configuration;
 
-import java.io.File;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -37,7 +33,7 @@ public class MatcherBuilderTracker {
     private static MatcherBuilderTracker INSTANCE;
 
     private final Map<String, Class<? extends AbstractBuilder>> matcherBuilders;
-    
+
     private static synchronized MatcherBuilderTracker instance() {
         if (INSTANCE == null) {
             INSTANCE = new MatcherBuilderTracker();
@@ -49,22 +45,22 @@ private static synchronized MatcherBuilderTracker instance() {
     public static void addBuilder(String className, String name) {
         instance().addBuilderImpl(className, name);
     }
-    
+
     public static AbstractBuilder getMatcherBuilder(String name) {
-        Class<? extends AbstractBuilder> clazz =  instance().matcherBuilders.get(name);
+        Class<? extends AbstractBuilder> clazz = instance().matcherBuilders.get(name);
         if (clazz == null) {
-            StringBuilder sb = new StringBuilder("\nValid builders\n" );
+            StringBuilder sb = new StringBuilder("\nValid builders\n");
             instance().matcherBuilders.keySet().stream().forEach(x -> sb.append(x).append("\n"));
-            sb.append( "ERROR MSG\n");
-            
-            throw new ConfigurationException( sb.append("No matcher builder named "+name).toString());
+            sb.append("ERROR MSG\n");
+
+            throw new ConfigurationException(sb.append("No matcher builder named " + name).toString());
         }
         try {
             return clazz.getConstructor().newInstance();
-        } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-            throw new ConfigurationException( String.format(
-                    "Can not instantiate matcher builder named %s (%s)",
-                    name, clazz.getName()), e);
+        } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
+                | IllegalArgumentException | InvocationTargetException e) {
+            throw new ConfigurationException(
+                    String.format("Can not instantiate matcher builder named %s (%s)", name, clazz.getName()), e);
         }
     }
 
@@ -73,7 +69,7 @@ private MatcherBuilderTracker() {
     }
 
     private void addBuilderImpl(String className, String name) {
-        Objects.requireNonNull(className, "className may not be null" );
+        Objects.requireNonNull(className, "className may not be null");
         Class<?> clazz;
         try {
             clazz = getClass().getClassLoader().loadClass(className);
@@ -95,7 +91,7 @@ private void addBuilderImpl(String className, String name) {
                     throw new ConfigurationException("Last segment of " + candidate.getName()
                             + " may not be 'Builder', but must end in 'Builder'");
                 }
-                name = name.replaceFirst(".", StringUtils.lowerCase(name.substring(0,1)));
+                name = name.replaceFirst(".", StringUtils.lowerCase(name.substring(0, 1)));
             }
             matcherBuilders.put(name, candidate);
         } else {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 581e87757..27701a7ad 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -18,10 +18,7 @@
  */
 package org.apache.rat.configuration;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
@@ -33,7 +30,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
@@ -52,7 +48,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.IHeaderMatcher.Builder;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
 import org.apache.rat.configuration.builders.AbstractBuilder;
@@ -90,13 +85,12 @@
 
 public class XMLConfigurationReader implements LicenseReader, MatcherReader {
 
-
     private final static String ATT_ID = "id";
     private final static String ATT_NAME = "name";
     private final static String ATT_DERIVED_FROM = "derived_from";
     private final static String ATT_LICENSE_REF = "license_ref";
     private final static String ATT_CLASS_NAME = "class";
-    
+
     private final static String ROOT = "rat-config";
     private final static String LICENSES = "licenses";
     private final static String LICENSE = "license";
@@ -222,8 +216,8 @@ private AbstractBuilder parseMatcher(Node matcherNode) {
                 MethodUtils.invokeExactMethod(builder, methodName, n.getNodeValue());
             } catch (NoSuchMethodException e) {
                 throw new ConfigurationException(
-                        String.format( "'%s' does not have a setter '%s' that takes a String argument",
-                        matcherNode.getNodeName(), methodName));
+                        String.format("'%s' does not have a setter '%s' that takes a String argument",
+                                matcherNode.getNodeName(), methodName));
             } catch (IllegalAccessException | InvocationTargetException | DOMException e) {
                 throw new ConfigurationException(e);
             }
@@ -322,7 +316,7 @@ public abstract class DelegatingBuilder extends AbstractBuilder {
     private void parseMatcherBuilder(Node classNode) {
         Map<String, String> attributes = attributes(classNode);
         if (attributes.get(ATT_CLASS_NAME) == null) {
-            throw new ConfigurationException( "matcher must have a "+ATT_CLASS_NAME+" attribute");
+            throw new ConfigurationException("matcher must have a " + ATT_CLASS_NAME + " attribute");
         }
         MatcherBuilderTracker.addBuilder(attributes.get(ATT_CLASS_NAME), attributes.get(ATT_NAME));
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
index 6322e1218..6336eb01b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
@@ -39,8 +39,6 @@ public final boolean hasId() {
     protected String getId() {
         return id;
     }
-
-    public abstract IHeaderMatcher build();
     
     @Override
     public String toString() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java b/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
index 0f8809599..6ddec12f4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
@@ -21,20 +21,18 @@
 import org.apache.commons.collections4.Transformer;
 import org.apache.rat.api.Document;
 
-public class ToNameTransformer implements Transformer {
+/* this class does not appear to be used */
+@Deprecated
+public class ToNameTransformer implements Transformer<Document,String> {
 
-    private static final Transformer TO_NAME_TRANSFORMER = new ToNameTransformer();
+    private static final Transformer<Document,String> TO_NAME_TRANSFORMER = new ToNameTransformer();
     
-    public static final Transformer toNameTransformer() {
+    public static final Transformer<Document,String> toNameTransformer() {
         return TO_NAME_TRANSFORMER;
     }
     
-    public Object transform(Object subject) {
-        Object result = null;
-        if (subject instanceof Document) {
-            Document location = (Document) subject;
-            result = location.getName();
-        }
-        return result;
+    @Override
+    public String transform(Document location) {
+        return location == null ? null : location.getName();
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java
index 302e3729a..27167e19f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java
@@ -15,13 +15,12 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.document.impl;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 
-
 /**
  * Abstract base class for monolithic documents.
  */
@@ -34,14 +33,17 @@ public AbstractMonolithicDocument(String pName) {
         this.metaData = new MetaData();
     }
 
+    @Override
     public boolean isComposite() {
         return false;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public MetaData getMetaData() {
         return metaData;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
index f316fe6ee..990ff470f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
@@ -28,7 +28,6 @@
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
-import org.apache.rat.api.RatException;
 
 public class ArchiveEntryDocument implements Document {
 
@@ -37,44 +36,44 @@ public class ArchiveEntryDocument implements Document {
 
     private final MetaData metaData = new MetaData();
 
-    public ArchiveEntryDocument(File file, byte[] contents) throws RatException {
+    public ArchiveEntryDocument(File file, byte[] contents) {
         super();
         name = DocumentImplUtils.toName(file);
         this.contents = contents;
     }
 
+    @Override
     public MetaData getMetaData() {
         return metaData;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public InputStream inputStream() throws IOException {
         return new ByteArrayInputStream(contents);
     }
 
+    @Override
     public boolean isComposite() {
         return DocumentImplUtils.isZipStream(new ByteArrayInputStream(contents));
     }
 
+    @Override
     public Reader reader() throws IOException {
         return new InputStreamReader(new ByteArrayInputStream(contents));
     }
 
-
     /**
      * Representations suitable for logging.
-     * @return a <code>String</code> representation 
-     * of this object.
+     * 
+     * @return a <code>String</code> representation of this object.
      */
     @Override
-    public String toString()
-    {
-        return "TarEntryDocument ( "
-            + "name = " + this.name + " "
-            + "metaData = " + this.metaData + " "
-            + " )";
+    public String toString() {
+        return "TarEntryDocument ( " + "name = " + this.name + " " + "metaData = " + this.metaData + " " + " )";
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
index f72160f75..716a2f393 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
@@ -15,14 +15,13 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.document.impl;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
 
 import org.apache.commons.io.IOUtils;
@@ -33,7 +32,7 @@ public final static String toName(File file) {
         String path = file.getPath();
         return path.replace('\\', '/');
     }
-    
+
     public static final boolean isZipStream(InputStream stream) {
         ZipInputStream zip = new ZipInputStream(stream);
         try {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
index d8d32322a..8bdfd9971 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.document.impl;
 
 import java.io.File;
@@ -37,47 +37,47 @@ public class FileDocument implements Document {
     private final File file;
     private final String name;
     private final MetaData metaData = new MetaData();
-    
+
     public FileDocument(final File file) {
         super();
         this.file = file;
         name = DocumentImplUtils.toName(file);
     }
 
+    @Override
     public boolean isComposite() {
         return DocumentImplUtils.isZip(file);
     }
 
+    @Override
     public Reader reader() throws IOException {
         return new FileReader(file);
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public MetaData getMetaData() {
         return metaData;
-    }    
-    
+    }
+
+    @Override
     public InputStream inputStream() throws IOException {
         return new FileInputStream(file);
     }
 
     /**
      * Representations suitable for logging.
-     * @return a <code>String</code> representation 
-     * of this object.
+     * 
+     * @return a <code>String</code> representation of this object.
      */
     @Override
-    public String toString()
-    {
-        return "FileDocument ( "
-            + "file = " + this.file + " "
-            + "name = " + this.name + " "
-            + "metaData = " + this.metaData + " "
-            + " )";
+    public String toString() {
+        return "FileDocument ( " + "file = " + this.file + " " + "name = " + this.name + " " + "metaData = "
+                + this.metaData + " " + " )";
     }
-    
-    
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
index dca7a53ef..1c1cbef7e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
@@ -30,7 +30,6 @@
 
 import org.apache.rat.api.Document;
 
-
 public class MonolithicFileDocument extends AbstractMonolithicDocument {
     private static final String FILE_URL_PREFIX = "file";
 
@@ -46,27 +45,31 @@ public static Document newInstance(final URL url) {
             final File f = new File(url.getFile());
             return new MonolithicFileDocument(f);
         }
-        return new AbstractMonolithicDocument(url.toExternalForm()){
+        return new AbstractMonolithicDocument(url.toExternalForm()) {
+            @Override
             public Reader reader() throws IOException {
                 return new InputStreamReader(inputStream(), StandardCharsets.UTF_8);
-           }
+            }
 
+            @Override
             public InputStream inputStream() throws IOException {
                 return url.openStream();
             }
         };
     }
 
-     public MonolithicFileDocument(final File file) {
+    public MonolithicFileDocument(final File file) {
         super(DocumentImplUtils.toName(file));
         this.file = file;
     }
 
-     public Reader reader() throws IOException {
+    @Override
+    public Reader reader() throws IOException {
         return new FileReader(file);
     }
 
-     public InputStream inputStream() throws IOException {
+    @Override
+    public InputStream inputStream() throws IOException {
         return new FileInputStream(file);
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
index da2126e2c..620970387 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.document.impl.util;
 
 import org.apache.rat.api.Document;
@@ -25,12 +25,13 @@
 public class DocumentAnalyserMultiplexer implements IDocumentAnalyser {
 
     private final IDocumentAnalyser[] analysers;
-    
+
     public DocumentAnalyserMultiplexer(final IDocumentAnalyser[] analysers) {
         super();
         this.analysers = analysers;
     }
 
+    @Override
     public void analyse(Document document) throws RatDocumentAnalysisException {
         for (IDocumentAnalyser analyser : analysers) {
             analyser.analyse(document);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java b/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
index 762f8255f..af82fe21b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
@@ -15,23 +15,24 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.header;
 
 class ArrayCharFilter implements CharFilter {
 
     private final char[] filtered;
     private final int length;
-    
+
     protected ArrayCharFilter(final char[] filtered) {
         super();
         this.filtered = filtered;
         length = filtered.length;
     }
 
+    @Override
     public boolean isFilteredOut(char character) {
         boolean result = false;
-        for(int i=0; i<length ;i++) {
+        for (int i = 0; i < length; i++) {
             if (character == filtered[i]) {
                 result = true;
                 break;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java b/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
index 18bfd1fd5..6c8920321 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
@@ -15,25 +15,27 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.report;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 
-
 /**
  * Abstract base class for deriving implementations of {@link RatReport}.
  */
 public abstract class AbstractReport implements RatReport {
+    @Override
     public void startReport() throws RatException {
         // Does nothing
     }
 
+    @Override
     public void report(Document document) throws RatException {
         // Does nothing
     }
 
+    @Override
     public void endReport() throws RatException {
         // Does nothing
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java b/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
index 572d7b9cb..a476b5612 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
@@ -15,18 +15,17 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.report.claim.util;
 
+import java.util.List;
+
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.report.RatReport;
 
-import java.util.List;
-
-
 public class ClaimReporterMultiplexer implements RatReport {
     private final IDocumentAnalyser analyser;
     private final List<? extends RatReport> reporters;
@@ -36,6 +35,7 @@ public ClaimReporterMultiplexer(final IDocumentAnalyser pAnalyser, final List<?
         this.reporters = reporters;
     }
 
+    @Override
     public void report(Document document) throws RatException {
         if (analyser != null) {
             try {
@@ -46,18 +46,20 @@ public void report(Document document) throws RatException {
         }
         for (RatReport report : reporters) {
             report.report(document);
-        } 
+        }
     }
 
+    @Override
     public void startReport() throws RatException {
         for (RatReport report : reporters) {
             report.startReport();
-        } 
+        }
     }
 
+    @Override
     public void endReport() throws RatException {
         for (RatReport report : reporters) {
             report.endReport();
-        } 
+        }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
index d9168dbb1..e71c4c674 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
@@ -18,10 +18,6 @@
  */
 package org.apache.rat.report.xml.writer.impl.base;
 
-import org.apache.rat.report.xml.writer.IXmlWriter;
-import org.apache.rat.report.xml.writer.InvalidXmlException;
-import org.apache.rat.report.xml.writer.OperationNotAllowedException;
-
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayDeque;
@@ -29,13 +25,20 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.rat.report.xml.writer.IXmlWriter;
+import org.apache.rat.report.xml.writer.InvalidXmlException;
+import org.apache.rat.report.xml.writer.OperationNotAllowedException;
+
 /**
- * <p>Lightweight {@link IXmlWriter} implementation.</p>
  * <p>
- * Requires a wrapper to be used safely in a multithreaded
- * environment.</p>
+ * Lightweight {@link IXmlWriter} implementation.
+ * </p>
+ * <p>
+ * Requires a wrapper to be used safely in a multithreaded environment.
+ * </p>
  * <p>
- * Not intended to be subclassed. Please copy and hack!</p>
+ * Not intended to be subclassed. Please copy and hack!
+ * </p>
  */
 public final class XmlWriter implements IXmlWriter {
 
@@ -269,10 +272,11 @@ public final class XmlWriter implements IXmlWriter {
         Arrays.fill(CHARACTER_CODES, 0x4E00, 0x9FA5, NAME_START_OR_BODY_CHAR);
         CHARACTER_CODES[0x3007] = NAME_START_OR_BODY_CHAR;
         Arrays.fill(CHARACTER_CODES, 0x3021, 0x3029, NAME_START_OR_BODY_CHAR);
-        // NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
+        // NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar |
+        // Extender
         CHARACTER_CODES['.'] = NAME_BODY_CHAR;
         CHARACTER_CODES['-'] = NAME_BODY_CHAR;
-        // CombiningChar 
+        // CombiningChar
         Arrays.fill(CHARACTER_CODES, 0x0300, 0x0345, NAME_BODY_CHAR);
         Arrays.fill(CHARACTER_CODES, 0x0360, 0x0361, NAME_BODY_CHAR);
         Arrays.fill(CHARACTER_CODES, 0x0483, 0x0486, NAME_BODY_CHAR);
@@ -368,7 +372,7 @@ public final class XmlWriter implements IXmlWriter {
         Arrays.fill(CHARACTER_CODES, 0x302A, 0x302F, NAME_BODY_CHAR);
         CHARACTER_CODES[0x3099] = NAME_BODY_CHAR;
         CHARACTER_CODES[0x309A] = NAME_BODY_CHAR;
-        // Digit 
+        // Digit
         Arrays.fill(CHARACTER_CODES, 0x0030, 0x0039, NAME_BODY_CHAR);
         Arrays.fill(CHARACTER_CODES, 0x0660, 0x0669, NAME_BODY_CHAR);
         Arrays.fill(CHARACTER_CODES, 0x06F0, 0x06F9, NAME_BODY_CHAR);
@@ -384,7 +388,7 @@ public final class XmlWriter implements IXmlWriter {
         Arrays.fill(CHARACTER_CODES, 0x0E50, 0x0E59, NAME_BODY_CHAR);
         Arrays.fill(CHARACTER_CODES, 0x0ED0, 0x0ED9, NAME_BODY_CHAR);
         Arrays.fill(CHARACTER_CODES, 0x0F20, 0x0F29, NAME_BODY_CHAR);
-        // Extender 
+        // Extender
         CHARACTER_CODES[0x00B7] = NAME_BODY_CHAR;
         CHARACTER_CODES[0x02D0] = NAME_BODY_CHAR;
         CHARACTER_CODES[0x02D1] = NAME_BODY_CHAR;
@@ -400,7 +404,7 @@ public final class XmlWriter implements IXmlWriter {
     }
 
     private final Writer writer;
-    private final ArrayDeque elementNames;
+    private final ArrayDeque<CharSequence> elementNames;
     private final Set<CharSequence> currentAttributes = new HashSet<>();
 
     boolean elementsWritten = false;
@@ -409,18 +413,18 @@ public final class XmlWriter implements IXmlWriter {
 
     public XmlWriter(final Writer writer) {
         this.writer = writer;
-        this.elementNames = new ArrayDeque<CharSequence>();
+        this.elementNames = new ArrayDeque<>();
     }
 
     /**
-     * Starts a document by writing a prolog.
-     * Calling this method is optional.
-     * When writing a document fragment, it should <em>not</em> be called.
+     * Starts a document by writing a prolog. Calling this method is optional. When
+     * writing a document fragment, it should <em>not</em> be called.
      *
      * @return this object
-     * @throws OperationNotAllowedException if called after the first element has been written
-     *                                      or once a prolog has already been written
+     * @throws OperationNotAllowedException if called after the first element has
+     * been written or once a prolog has already been written
      */
+    @Override
     public IXmlWriter startDocument() throws IOException {
         if (elementsWritten) {
             throw new OperationNotAllowedException("Document already started");
@@ -438,9 +442,11 @@ public IXmlWriter startDocument() throws IOException {
      *
      * @param elementName the name of the element, not null
      * @return this object
-     * @throws InvalidXmlException          if the name is not valid for an xml element
-     * @throws OperationNotAllowedException if called after the first element has been closed
+     * @throws InvalidXmlException if the name is not valid for an xml element
+     * @throws OperationNotAllowedException if called after the first element has
+     * been closed
      */
+    @Override
     public IXmlWriter openElement(final CharSequence elementName) throws IOException {
         if (elementsWritten && elementNames.isEmpty()) {
             throw new OperationNotAllowedException("Root element already closed. Cannot open new element.");
@@ -461,25 +467,25 @@ public IXmlWriter openElement(final CharSequence elementName) throws IOException
     }
 
     /**
-     * Writes an attribute of an element.
-     * Note that this is only allowed directly after {@link #openElement(CharSequence)}
-     * or {@link #attribute}.
+     * Writes an attribute of an element. Note that this is only allowed directly
+     * after {@link #openElement(CharSequence)} or {@link #attribute}.
      *
-     * @param name  the attribute name, not null
+     * @param name the attribute name, not null
      * @param value the attribute value, not null
      * @return this object
-     * @throws InvalidXmlException          if the name is not valid for an xml attribute
-     *                                      or if a value for the attribute has already been written
-     * @throws OperationNotAllowedException if called after {@link #content(CharSequence)}
-     *                                      or {@link #closeElement()} or before any call to {@link #openElement(CharSequence)}
+     * @throws InvalidXmlException if the name is not valid for an xml attribute or
+     * if a value for the attribute has already been written
+     * @throws OperationNotAllowedException if called after
+     * {@link #content(CharSequence)} or {@link #closeElement()} or before any call
+     * to {@link #openElement(CharSequence)}
      */
+    @Override
     public IXmlWriter attribute(CharSequence name, CharSequence value) throws IOException {
         if (elementNames.isEmpty()) {
             if (elementsWritten) {
                 throw new OperationNotAllowedException("Root element has already been closed.");
-            } else {
-                throw new OperationNotAllowedException("Close called before an element has been opened.");
             }
+            throw new OperationNotAllowedException("Close called before an element has been opened.");
         }
         if (isInvalidName(name)) {
             throw new InvalidXmlException("'" + name + "' is not a valid attribute name.");
@@ -505,22 +511,21 @@ private void writeAttributeContent(CharSequence content) throws IOException {
     }
 
     /**
-     * Writes content.
-     * Calling this method will automatically
-     * Note that this method does not use CDATA.
+     * Writes content. Calling this method will automatically Note that this method
+     * does not use CDATA.
      *
      * @param content the content to write
      * @return this object
-     * @throws OperationNotAllowedException if called before any call to {@link #openElement}
-     *                                      or after the first element has been closed
+     * @throws OperationNotAllowedException if called before any call to
+     * {@link #openElement} or after the first element has been closed
      */
+    @Override
     public IXmlWriter content(CharSequence content) throws IOException {
         if (elementNames.isEmpty()) {
             if (elementsWritten) {
                 throw new OperationNotAllowedException("Root element has already been closed.");
-            } else {
-                throw new OperationNotAllowedException("An element must be opened before content can be written.");
-            }
+            } 
+            throw new OperationNotAllowedException("An element must be opened before content can be written.");
         }
         if (inElement) {
             writer.write('>');
@@ -564,18 +569,18 @@ private boolean isOutOfRange(final char character) {
      * Closes the last element written.
      *
      * @return this object
-     * @throws OperationNotAllowedException if called before any call to {@link #openElement}
-     *                                      or after the first element has been closed
+     * @throws OperationNotAllowedException if called before any call to
+     * {@link #openElement} or after the first element has been closed
      */
+    @Override
     public IXmlWriter closeElement() throws IOException {
         if (elementNames.isEmpty()) {
             if (elementsWritten) {
                 throw new OperationNotAllowedException("Root element has already been closed.");
-            } else {
-                throw new OperationNotAllowedException("Close called before an element has been opened.");
-            }
+            } 
+            throw new OperationNotAllowedException("Close called before an element has been opened.");
         }
-        final CharSequence elementName = (CharSequence) elementNames.pop();
+        final CharSequence elementName = elementNames.pop();
         if (inElement) {
             writer.write('/');
             writer.write('>');
@@ -590,16 +595,16 @@ public IXmlWriter closeElement() throws IOException {
         return this;
     }
 
-
     /**
-     * Closes all pending elements.
-     * When appropriate, resources are also flushed and closed.
-     * No exception is raised when called upon a document whose
-     * root element has already been closed.
+     * Closes all pending elements. When appropriate, resources are also flushed and
+     * closed. No exception is raised when called upon a document whose root element
+     * has already been closed.
      *
      * @return this object
-     * @throws OperationNotAllowedException if called before any call to {@link #openElement}
+     * @throws OperationNotAllowedException if called before any call to
+     * {@link #openElement}
      */
+    @Override
     public IXmlWriter closeDocument() throws IOException {
         if (elementNames.isEmpty() && !elementsWritten) {
             throw new OperationNotAllowedException("Close called before an element has been opened.");
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
index 4e5ec3b70..39242da63 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
@@ -60,6 +60,7 @@ public ArchiveWalker(File file, final FilenameFilter filter) throws FileNotFound
      * @param report the defined RatReport to run on this GZIP walker.
      * 
      */
+    @Override
     public void run(final RatReport report) throws RatException {
 
         try {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
index c9b7f12cf..0bc5d2a77 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
@@ -19,17 +19,17 @@
 
 package org.apache.rat.walker;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 import org.apache.rat.document.impl.FileDocument;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.report.RatReport;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
 /**
  * Walks directories.
  */
@@ -44,9 +44,9 @@ public DirectoryWalker(File file) {
     /**
      * Constructs a walker.
      *
-     * @param file   not null
-     * @param filter filters input files (optional),
-     *               or null when no filtering should be performed
+     * @param file not null
+     * @param filter filters input files (optional), or null when no filtering
+     * should be performed
      */
     public DirectoryWalker(File file, final FilenameFilter filter) {
         super(file.getPath(), file, filter);
@@ -64,7 +64,7 @@ public boolean isRestricted() {
      * Process a directory, restricted directories will be ignored.
      *
      * @param report The report to process the directory with
-     * @param file   the directory to process
+     * @param file the directory to process
      * @throws RatException
      */
     private void processDirectory(RatReport report, final File file) throws RatException {
@@ -74,11 +74,12 @@ private void processDirectory(RatReport report, final File file) throws RatExcep
     }
 
     /**
-     * Run a report over all files and directories in this DirectoryWalker,
-     * ignoring any files/directories set to be ignored.
+     * Run a report over all files and directories in this DirectoryWalker, ignoring
+     * any files/directories set to be ignored.
      *
      * @param report the defined RatReport to run on this Directory walker.
      */
+    @Override
     public void run(final RatReport report) throws RatException {
         process(report, file);
     }
@@ -87,7 +88,7 @@ public void run(final RatReport report) throws RatException {
      * Process a directory, ignoring any files/directories set to be ignored.
      *
      * @param report the report to use in processing
-     * @param file   the run the report against
+     * @param file the run the report against
      * @throws RatException
      */
     private void process(final RatReport report, final File file) throws RatException {
@@ -101,10 +102,11 @@ private void process(final RatReport report, final File file) throws RatExceptio
     }
 
     /**
-     * Process all directories in a set of file objects, ignoring any directories set to be ignored.
+     * Process all directories in a set of file objects, ignoring any directories
+     * set to be ignored.
      *
      * @param report the report to use in processing
-     * @param files  the files to process (only directories will be processed)
+     * @param files the files to process (only directories will be processed)
      * @throws RatException
      */
     private void processDirectories(final RatReport report, final File[] files) throws RatException {
@@ -116,10 +118,11 @@ private void processDirectories(final RatReport report, final File[] files) thro
     }
 
     /**
-     * Process all files in a set of file objects, ignoring any files set to be ignored.
+     * Process all files in a set of file objects, ignoring any files set to be
+     * ignored.
      *
      * @param report the report to use in processing
-     * @param files  the files to process (only files will be processed)
+     * @param files the files to process (only files will be processed)
      * @throws RatException
      */
     private void processNonDirectories(final RatReport report, final File[] files) throws RatException {
@@ -135,7 +138,7 @@ private void processNonDirectories(final RatReport report, final File[] files) t
      * Report on the given file.
      *
      * @param report the report to process the file with
-     * @param file   the file to be reported on
+     * @param file the file to be reported on
      * @throws RatException
      */
     private void report(final RatReport report, File file) throws RatException {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java b/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java
index c3ed80366..d0dddbde6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.walker;
 
 import java.io.File;
@@ -23,6 +23,7 @@
 
 class FileNameComparator implements Comparator<File> {
 
+    @Override
     public int compare(File firstFile, File secondFile) {
         int result = 0;
         if (firstFile == null) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
index 064d9ed79..a89862c69 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
@@ -19,12 +19,12 @@
 
 package org.apache.rat.walker;
 
-import org.apache.rat.report.IReportable;
-
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.regex.Pattern;
 
+import org.apache.rat.report.IReportable;
+
 /**
  * Abstract walker.
  */
@@ -37,6 +37,7 @@ public abstract class Walker implements IReportable {
 
     protected static FilenameFilter regexFilter(final Pattern pattern) {
         return new FilenameFilter() {
+            @Override
             public boolean accept(File dir, String name) {
                 final boolean result;
                 if (pattern == null) {
@@ -52,7 +53,7 @@ public boolean accept(File dir, String name) {
     protected boolean isRestricted(File file) {
         return file.getName().startsWith(".");
     }
- 
+
     protected final boolean isNotIgnored(final File file) {
         boolean result = false;
         if (filter != null) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
index 07cd33e3d..26dc6a90f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
@@ -15,21 +15,20 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.document;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import org.apache.rat.testhelpers.TestingLocation;
+import org.junit.Test;
 
 public class ToNameTransformerTest {
 
     private final ToNameTransformer transformer = new ToNameTransformer();
-    
+
     @Test
     public void transformLocation() {
         TestingLocation location = new TestingLocation();

From c281ff89c8d017a99e56349cfd3a560c5deab64d Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 10:42:06 +0200
Subject: [PATCH 111/299] Cleaned up files

---
 apache-rat-core/pom.xml                       | 259 ++++++++----------
 .../org/apache/rat/ReportTransformer.java     |  24 +-
 .../analysis/license/CopyrightLicense.java    |  57 ----
 .../license/FullTextMatchingLicense.java      |  41 ---
 .../license/SimplePatternBasedLicense.java    |  59 ----
 .../matchers/AbstractMatcherContainer.java    |   2 +-
 .../analysis/matchers/CopyrightMatcher.java   |  31 +--
 .../rat/document/ToNameTransformer.java       |  18 +-
 .../impl/AbstractMonolithicDocument.java      |   6 +-
 .../document/impl/ArchiveEntryDocument.java   |  21 +-
 .../rat/document/impl/DocumentImplUtils.java  |   5 +-
 .../rat/document/impl/FileDocument.java       |  30 +-
 .../document/impl/MonolithicFileDocument.java |  15 +-
 .../util/DocumentAnalyserMultiplexer.java     |   5 +-
 .../apache/rat/header/ArrayCharFilter.java    |   7 +-
 .../org/apache/rat/report/AbstractReport.java |   6 +-
 .../org/apache/rat/report/IReportable.java    |   8 -
 .../claim/util/ClaimReporterMultiplexer.java  |  16 +-
 .../org/apache/rat/walker/ArchiveWalker.java  |   1 -
 .../apache/rat/walker/DirectoryWalker.java    |  37 ++-
 .../apache/rat/walker/FileNameComparator.java |   3 +-
 .../java/org/apache/rat/walker/Walker.java    |   7 +-
 .../java/org/apache/rat/anttasks/License.java |   4 +-
 .../antunit/report-bad-configurations.xml     |  12 +-
 .../test/resources/antunit/report-junit.xml   |  20 +-
 .../antunit/report-normal-operation.xml       |  78 +++---
 26 files changed, 275 insertions(+), 497 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 93402c934..52397adb9 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -1,152 +1,127 @@
 <?xml version='1.0'?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-  this
-work for additional information regarding copyright ownership.
-  The ASF
-licenses this file to You under the Apache License, Version 2.0
-  (the
-"License"); you may not use this file except in compliance with
-  the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-  Unless required by applicable law
-or agreed to in writing, software
-  distributed under the License is distributed
-on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-express or implied.
-  See the License for the specific language governing
-permissions and
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.rat</groupId>
-		<artifactId>apache-rat-project</artifactId>
-		<version>0.16-SNAPSHOT</version>
-	</parent>
-	<artifactId>apache-rat-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache Creadur Rat::Core</name>
-	<description>The core functionality, shared by the Ant tasks
-		and the Maven plugin.</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.rat</groupId>
+    <artifactId>apache-rat-project</artifactId>
+    <version>0.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>apache-rat-core</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Creadur Rat::Core</name>
+  <description>The core functionality, shared by the Ant tasks
+    and the Maven plugin.</description>
+
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/filtered-resources</directory>
+      </resource>
+      <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>RELEASE_NOTES.txt</include>
+        </includes>
+      </resource>
+    </resources>
 
-	<build>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>true</filtering>
-				<directory>src/main/filtered-resources</directory>
-			</resource>
-			<resource>
-				<directory>..</directory>
-				<targetPath>META-INF</targetPath>
-				<includes>
-					<include>RELEASE_NOTES.txt</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.rat</groupId>
-					<artifactId>apache-rat-plugin</artifactId>
-					<configuration>
-						<excludes>
-							<!-- These files have bad license headers because
-                            they are used to test bad license headers -->
-							<exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
-							<exclude>src/test/resources/oasis/bad/*.*</exclude>
-							<!-- These files does not have license headers
-                            because they are used to test license headers -->
-							<exclude>src/test/resources/elements/Source.java</exclude>
-							<exclude>
-								src/test/resources/elements/ILoggerFactory.java</exclude>
-							<exclude>src/test/resources/elements/sub/Empty.txt</exclude>
-							<exclude>src/test/resources/violations/bad.txt</exclude>
-							<exclude>src/test/resources/violations/FilterTest.cs</exclude>
-							<!-- used to test for binary files; does not work on
-                            UTF-8 (e.g. MacOSX) -->
-							<exclude>src/test/resources/binaries/Image-png.not</exclude>
-							<!-- These files have a valid license header that
-                            was not recognised by older rat versions -->
-							<exclude>src/test/resources/elements/TextHttps.txt</exclude>
-							<!-- Remove after using RAT 0.14 for dog-fooding
-                            ..... older versions do not ignore JSON -->
-							<exclude>src/test/resources/elements/plain.json</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <!-- These files have bad license headers because they are used to test bad license headers -->
+              <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
+              <exclude>src/test/resources/oasis/bad/*.*</exclude>
+              <!-- These files does not have license headers because they are used to test license headers -->
+              <exclude>src/test/resources/elements/Source.java</exclude>
+              <exclude>src/test/resources/elements/ILoggerFactory.java</exclude>
+              <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
+              <exclude>src/test/resources/violations/bad.txt</exclude>
+              <exclude>src/test/resources/violations/FilterTest.cs</exclude>
+              <!-- used to test for binary files; does not work on UTF-8 (e.g. MacOSX) -->
+              <exclude>src/test/resources/binaries/Image-png.not</exclude>
+              <!-- These files have a valid license header that was not recognised by older rat versions -->
+              <exclude>src/test/resources/elements/TextHttps.txt</exclude>
+              <!-- Remove after using RAT 0.14 for dog-fooding ..... older versions do not ignore JSON -->
+              <exclude>src/test/resources/elements/plain.json</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.rat</groupId>
-			<artifactId>apache-rat-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-collections4</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-compress</artifactId>
-			<exclusions>
-				<!-- Not actually used (yet) so no point including it -->
-				<exclusion>
-					<groupId>org.tukaani</groupId>
-					<artifactId>xz</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-configuration2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>31.0.1-jre</version>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.rat</groupId>
+      <artifactId>apache-rat-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <exclusions>
+        <!-- Not actually used (yet) so no point including it -->
+        <exclusion>
+          <groupId>org.tukaani</groupId>
+          <artifactId>xz</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java b/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java
index 534d7e721..399226a37 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportTransformer.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat;
 
 import java.io.InputStream;
@@ -29,27 +29,29 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+
 class ReportTransformer implements Runnable {
 
     private final Writer out;
     private final Transformer transformer;
     private final Reader in;
-
-    public ReportTransformer(final Writer out, final Reader style, final Reader in)
-            throws TransformerConfigurationException {
+    
+    public ReportTransformer(final Writer out, final Reader style, 
+            final Reader in) throws TransformerConfigurationException {
         this.out = out;
-        transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(style));
+        transformer = TransformerFactory.newInstance().newTransformer(
+                new StreamSource(style));
         this.in = in;
     }
-
-    public ReportTransformer(final Writer out, final InputStream style, final Reader in)
-            throws TransformerConfigurationException {
+    
+    public ReportTransformer(final Writer out, final InputStream style, 
+            final Reader in) throws TransformerConfigurationException {
         this.out = out;
-        transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(style));
+        transformer = TransformerFactory.newInstance().newTransformer(
+                new StreamSource(style));
         this.in = in;
     }
-
-    @Override
+    
     public void run() {
         try {
             transform();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
deleted file mode 100644
index 6eb02531a..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightLicense.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.analysis.matchers.CopyrightMatcher;
-import org.apache.rat.license.ILicenseFamily;
-
-/**
- * Matches a typical Copyright header line only based on a regex pattern which
- * allows for one (starting) year or year range, and a configurable copyright
- * owner. <br>
- * <br>
- * The matching is done case insensitive<br>
- * <br>
- * Example supported Copyright header lines, using copyright owner
- * &quot;FooBar&quot;
- * <ul>
- * <li>* Copyright 2010 FooBar. *</li>
- * <li>* Copyright 2010-2012 FooBar. *</li>
- * <li>*copyright 2012 foobar*</li>
- * </ul>
- * <p>
- * Note also that the copyright owner is appended to the regex pattern, so can
- * support additional regex but also requires escaping where needed,<br>
- * e.g. use &quot;FooBar \(www\.foobar\.com\)&quot; for matching &quot;FooBar
- * (www.foobar.com)&quot;
- * </p>
- *
- * @since Rat 0.9
- */
-public class CopyrightLicense extends BaseLicense {
-
-    protected CopyrightLicense(ILicenseFamily licenseFamily, String notes, String start, String stop, String owner) {
-        super(licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
-    }
-
-    public CopyrightLicense(String id, ILicenseFamily licenseFamily, String notes, String start, String stop,
-            String owner) {
-        super(id, licenseFamily, notes, new CopyrightMatcher(start, stop, owner));
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
deleted file mode 100644
index 09c1cc181..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.analysis.matchers.FullTextMatcher;
-import org.apache.rat.license.ILicenseFamily;
-
-/**
- * Accumulates all letters and numbers contained inside the header and compares
- * it to the full text of a given license (after reducing it to letters and
- * numbers as well).
- *
- * <p>
- * The text comparison is case insensitive but assumes only characters in the
- * US-ASCII charset are being matched.
- * </p>
- *
- * @since Rat 0.9
- */
-public class FullTextMatchingLicense extends BaseLicense {
-
-    public FullTextMatchingLicense(ILicenseFamily family, String notes, String fullText) {
-        super(family, notes, new FullTextMatcher(fullText));
-    }
-}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
deleted file mode 100644
index 9e3fb2a30..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.OrMatcher;
-import org.apache.rat.analysis.matchers.SimpleTextMatcher;
-import org.apache.rat.license.ILicenseFamily;
-
-/**
- * @since Rat 0.8
- */
-public class SimplePatternBasedLicense extends BaseLicense {
-
-    private static IHeaderMatcher getMatcher(String[] patterns) {
-        if (patterns.length == 1) {
-            return new SimpleTextMatcher(patterns[0]);
-        }
-        Collection<IHeaderMatcher> collection = Arrays.stream(patterns).map(SimpleTextMatcher::new)
-                .collect(Collectors.toList());
-        return new OrMatcher(collection);
-    }
-
-    /**
-     * Creates a pattern based license with full documentation.
-     * 
-     * @param pLicenseFamilyCategory
-     * @param pLicenseFamilyName
-     * @param pNotes
-     * @param pPatterns
-     */
-    public SimplePatternBasedLicense(ILicenseFamily licenseFamily, String notes, String[] patterns) {
-        this(null, licenseFamily, notes, patterns);
-    }
-
-    public SimplePatternBasedLicense(String id, ILicenseFamily licenseFamily, String notes, String[] patterns) {
-        super(licenseFamily, notes, getMatcher(patterns));
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index 7b86c8969..7125a4966 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -25,7 +25,7 @@
 
 public abstract class AbstractMatcherContainer extends AbstractHeaderMatcher {
 
-    protected Collection<IHeaderMatcher> enclosed;
+    protected final Collection<IHeaderMatcher> enclosed;
 
     public AbstractMatcherContainer(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index 96656fa87..fa4b4ad05 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -46,7 +46,7 @@
  *
  * @since Rat 0.9
  */
-public class CopyrightMatcher extends AbstractHeaderMatcher {
+public class CopyrightMatcher extends AbstractSimpleMatcher {
 
     private static final String COPYRIGHT_SYMBOL_DEFN = "\\([Cc]\\)|©";
     private static final String COPYRIGHT_PATTERN_DEFN = "(\\b)?" + COPYRIGHT_SYMBOL_DEFN + "|Copyright\\b";
@@ -57,15 +57,12 @@ public class CopyrightMatcher extends AbstractHeaderMatcher {
     private final Pattern dateOwnerPattern;
     private final Pattern ownerDatePattern;
 
-    private State state;
-
     public CopyrightMatcher(String start, String stop, String owner) {
         this(null, start, stop, owner);
     }
 
     public CopyrightMatcher(String id, String start, String stop, String owner) {
         super(id);
-        state = State.i;
         String dateDefn = "";
         if (StringUtils.isNotEmpty(start)) {
             if (StringUtils.isNotEmpty(stop)) {
@@ -94,39 +91,21 @@ public CopyrightMatcher(String id, String start, String stop, String owner) {
     }
 
     @Override
-    public State matches(String line) {
+    protected boolean doMatch(String line) {
         Matcher matcher = COPYRIGHT_PATTERN.matcher(line);
         if (matcher.find()) {
             String buffer = line.substring(matcher.end());
             matcher = dateOwnerPattern.matcher(buffer);
             if (matcher.find() && matcher.start() == 0) {
-                this.state = State.t;
+                return true;
             }
             if (ownerDatePattern != null) {
                 matcher = ownerDatePattern.matcher(buffer);
                 if (matcher.find() && matcher.start() == 0) {
-                    this.state = State.t;
+                    return true;
                 }
             }
         }
-        return currentState();
-    }
-
-    @Override
-    public State currentState() {
-        return state;
-    }
-
-    @Override
-    public void reset() {
-        state = State.i;
-    }
-
-    @Override
-    public State finalizeState() {
-        if (state == State.i) {
-            state = State.f;
-        }
-        return state;
+        return false;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java b/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
index 6ddec12f4..0f8809599 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
@@ -21,18 +21,20 @@
 import org.apache.commons.collections4.Transformer;
 import org.apache.rat.api.Document;
 
-/* this class does not appear to be used */
-@Deprecated
-public class ToNameTransformer implements Transformer<Document,String> {
+public class ToNameTransformer implements Transformer {
 
-    private static final Transformer<Document,String> TO_NAME_TRANSFORMER = new ToNameTransformer();
+    private static final Transformer TO_NAME_TRANSFORMER = new ToNameTransformer();
     
-    public static final Transformer<Document,String> toNameTransformer() {
+    public static final Transformer toNameTransformer() {
         return TO_NAME_TRANSFORMER;
     }
     
-    @Override
-    public String transform(Document location) {
-        return location == null ? null : location.getName();
+    public Object transform(Object subject) {
+        Object result = null;
+        if (subject instanceof Document) {
+            Document location = (Document) subject;
+            result = location.getName();
+        }
+        return result;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java
index 27167e19f..302e3729a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/AbstractMonolithicDocument.java
@@ -15,12 +15,13 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.document.impl;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 
+
 /**
  * Abstract base class for monolithic documents.
  */
@@ -33,17 +34,14 @@ public AbstractMonolithicDocument(String pName) {
         this.metaData = new MetaData();
     }
 
-    @Override
     public boolean isComposite() {
         return false;
     }
 
-    @Override
     public String getName() {
         return name;
     }
 
-    @Override
     public MetaData getMetaData() {
         return metaData;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
index 990ff470f..f316fe6ee 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
@@ -28,6 +28,7 @@
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
+import org.apache.rat.api.RatException;
 
 public class ArchiveEntryDocument implements Document {
 
@@ -36,44 +37,44 @@ public class ArchiveEntryDocument implements Document {
 
     private final MetaData metaData = new MetaData();
 
-    public ArchiveEntryDocument(File file, byte[] contents) {
+    public ArchiveEntryDocument(File file, byte[] contents) throws RatException {
         super();
         name = DocumentImplUtils.toName(file);
         this.contents = contents;
     }
 
-    @Override
     public MetaData getMetaData() {
         return metaData;
     }
 
-    @Override
     public String getName() {
         return name;
     }
 
-    @Override
     public InputStream inputStream() throws IOException {
         return new ByteArrayInputStream(contents);
     }
 
-    @Override
     public boolean isComposite() {
         return DocumentImplUtils.isZipStream(new ByteArrayInputStream(contents));
     }
 
-    @Override
     public Reader reader() throws IOException {
         return new InputStreamReader(new ByteArrayInputStream(contents));
     }
 
+
     /**
      * Representations suitable for logging.
-     * 
-     * @return a <code>String</code> representation of this object.
+     * @return a <code>String</code> representation 
+     * of this object.
      */
     @Override
-    public String toString() {
-        return "TarEntryDocument ( " + "name = " + this.name + " " + "metaData = " + this.metaData + " " + " )";
+    public String toString()
+    {
+        return "TarEntryDocument ( "
+            + "name = " + this.name + " "
+            + "metaData = " + this.metaData + " "
+            + " )";
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
index 716a2f393..f72160f75 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
@@ -15,13 +15,14 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.document.impl;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
 
 import org.apache.commons.io.IOUtils;
@@ -32,7 +33,7 @@ public final static String toName(File file) {
         String path = file.getPath();
         return path.replace('\\', '/');
     }
-
+    
     public static final boolean isZipStream(InputStream stream) {
         ZipInputStream zip = new ZipInputStream(stream);
         try {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
index 8bdfd9971..d8d32322a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.document.impl;
 
 import java.io.File;
@@ -37,47 +37,47 @@ public class FileDocument implements Document {
     private final File file;
     private final String name;
     private final MetaData metaData = new MetaData();
-
+    
     public FileDocument(final File file) {
         super();
         this.file = file;
         name = DocumentImplUtils.toName(file);
     }
 
-    @Override
     public boolean isComposite() {
         return DocumentImplUtils.isZip(file);
     }
 
-    @Override
     public Reader reader() throws IOException {
         return new FileReader(file);
     }
 
-    @Override
     public String getName() {
         return name;
     }
 
-    @Override
     public MetaData getMetaData() {
         return metaData;
-    }
-
-    @Override
+    }    
+    
     public InputStream inputStream() throws IOException {
         return new FileInputStream(file);
     }
 
     /**
      * Representations suitable for logging.
-     * 
-     * @return a <code>String</code> representation of this object.
+     * @return a <code>String</code> representation 
+     * of this object.
      */
     @Override
-    public String toString() {
-        return "FileDocument ( " + "file = " + this.file + " " + "name = " + this.name + " " + "metaData = "
-                + this.metaData + " " + " )";
+    public String toString()
+    {
+        return "FileDocument ( "
+            + "file = " + this.file + " "
+            + "name = " + this.name + " "
+            + "metaData = " + this.metaData + " "
+            + " )";
     }
-
+    
+    
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
index 1c1cbef7e..dca7a53ef 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
@@ -30,6 +30,7 @@
 
 import org.apache.rat.api.Document;
 
+
 public class MonolithicFileDocument extends AbstractMonolithicDocument {
     private static final String FILE_URL_PREFIX = "file";
 
@@ -45,31 +46,27 @@ public static Document newInstance(final URL url) {
             final File f = new File(url.getFile());
             return new MonolithicFileDocument(f);
         }
-        return new AbstractMonolithicDocument(url.toExternalForm()) {
-            @Override
+        return new AbstractMonolithicDocument(url.toExternalForm()){
             public Reader reader() throws IOException {
                 return new InputStreamReader(inputStream(), StandardCharsets.UTF_8);
-            }
+           }
 
-            @Override
             public InputStream inputStream() throws IOException {
                 return url.openStream();
             }
         };
     }
 
-    public MonolithicFileDocument(final File file) {
+     public MonolithicFileDocument(final File file) {
         super(DocumentImplUtils.toName(file));
         this.file = file;
     }
 
-    @Override
-    public Reader reader() throws IOException {
+     public Reader reader() throws IOException {
         return new FileReader(file);
     }
 
-    @Override
-    public InputStream inputStream() throws IOException {
+     public InputStream inputStream() throws IOException {
         return new FileInputStream(file);
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
index 620970387..da2126e2c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexer.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.document.impl.util;
 
 import org.apache.rat.api.Document;
@@ -25,13 +25,12 @@
 public class DocumentAnalyserMultiplexer implements IDocumentAnalyser {
 
     private final IDocumentAnalyser[] analysers;
-
+    
     public DocumentAnalyserMultiplexer(final IDocumentAnalyser[] analysers) {
         super();
         this.analysers = analysers;
     }
 
-    @Override
     public void analyse(Document document) throws RatDocumentAnalysisException {
         for (IDocumentAnalyser analyser : analysers) {
             analyser.analyse(document);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java b/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
index af82fe21b..762f8255f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
@@ -15,24 +15,23 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.header;
 
 class ArrayCharFilter implements CharFilter {
 
     private final char[] filtered;
     private final int length;
-
+    
     protected ArrayCharFilter(final char[] filtered) {
         super();
         this.filtered = filtered;
         length = filtered.length;
     }
 
-    @Override
     public boolean isFilteredOut(char character) {
         boolean result = false;
-        for (int i = 0; i < length; i++) {
+        for(int i=0; i<length ;i++) {
             if (character == filtered[i]) {
                 result = true;
                 break;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java b/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
index 6c8920321..18bfd1fd5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
@@ -15,27 +15,25 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.report;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 
+
 /**
  * Abstract base class for deriving implementations of {@link RatReport}.
  */
 public abstract class AbstractReport implements RatReport {
-    @Override
     public void startReport() throws RatException {
         // Does nothing
     }
 
-    @Override
     public void report(Document document) throws RatException {
         // Does nothing
     }
 
-    @Override
     public void endReport() throws RatException {
         // Does nothing
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java b/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
index 05598ea06..d7fd7af89 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/IReportable.java
@@ -20,15 +20,7 @@
 
 import org.apache.rat.api.RatException;
 
-/**
- * An interface that identifies things that can be reported upon.
- */
 public interface IReportable {
 
-    /**
-     * Runs a report against the thing to be reported on.
-     * @param report The report to run.
-     * @throws RatException on error.
-     */
     void run(RatReport report) throws RatException;
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java b/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
index a476b5612..572d7b9cb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
@@ -15,17 +15,18 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.report.claim.util;
 
-import java.util.List;
-
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.report.RatReport;
 
+import java.util.List;
+
+
 public class ClaimReporterMultiplexer implements RatReport {
     private final IDocumentAnalyser analyser;
     private final List<? extends RatReport> reporters;
@@ -35,7 +36,6 @@ public ClaimReporterMultiplexer(final IDocumentAnalyser pAnalyser, final List<?
         this.reporters = reporters;
     }
 
-    @Override
     public void report(Document document) throws RatException {
         if (analyser != null) {
             try {
@@ -46,20 +46,18 @@ public void report(Document document) throws RatException {
         }
         for (RatReport report : reporters) {
             report.report(document);
-        }
+        } 
     }
 
-    @Override
     public void startReport() throws RatException {
         for (RatReport report : reporters) {
             report.startReport();
-        }
+        } 
     }
 
-    @Override
     public void endReport() throws RatException {
         for (RatReport report : reporters) {
             report.endReport();
-        }
+        } 
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
index 39242da63..4e5ec3b70 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
@@ -60,7 +60,6 @@ public ArchiveWalker(File file, final FilenameFilter filter) throws FileNotFound
      * @param report the defined RatReport to run on this GZIP walker.
      * 
      */
-    @Override
     public void run(final RatReport report) throws RatException {
 
         try {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
index 0bc5d2a77..c9b7f12cf 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
@@ -19,17 +19,17 @@
 
 package org.apache.rat.walker;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 import org.apache.rat.document.impl.FileDocument;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.report.RatReport;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
 /**
  * Walks directories.
  */
@@ -44,9 +44,9 @@ public DirectoryWalker(File file) {
     /**
      * Constructs a walker.
      *
-     * @param file not null
-     * @param filter filters input files (optional), or null when no filtering
-     * should be performed
+     * @param file   not null
+     * @param filter filters input files (optional),
+     *               or null when no filtering should be performed
      */
     public DirectoryWalker(File file, final FilenameFilter filter) {
         super(file.getPath(), file, filter);
@@ -64,7 +64,7 @@ public boolean isRestricted() {
      * Process a directory, restricted directories will be ignored.
      *
      * @param report The report to process the directory with
-     * @param file the directory to process
+     * @param file   the directory to process
      * @throws RatException
      */
     private void processDirectory(RatReport report, final File file) throws RatException {
@@ -74,12 +74,11 @@ private void processDirectory(RatReport report, final File file) throws RatExcep
     }
 
     /**
-     * Run a report over all files and directories in this DirectoryWalker, ignoring
-     * any files/directories set to be ignored.
+     * Run a report over all files and directories in this DirectoryWalker,
+     * ignoring any files/directories set to be ignored.
      *
      * @param report the defined RatReport to run on this Directory walker.
      */
-    @Override
     public void run(final RatReport report) throws RatException {
         process(report, file);
     }
@@ -88,7 +87,7 @@ public void run(final RatReport report) throws RatException {
      * Process a directory, ignoring any files/directories set to be ignored.
      *
      * @param report the report to use in processing
-     * @param file the run the report against
+     * @param file   the run the report against
      * @throws RatException
      */
     private void process(final RatReport report, final File file) throws RatException {
@@ -102,11 +101,10 @@ private void process(final RatReport report, final File file) throws RatExceptio
     }
 
     /**
-     * Process all directories in a set of file objects, ignoring any directories
-     * set to be ignored.
+     * Process all directories in a set of file objects, ignoring any directories set to be ignored.
      *
      * @param report the report to use in processing
-     * @param files the files to process (only directories will be processed)
+     * @param files  the files to process (only directories will be processed)
      * @throws RatException
      */
     private void processDirectories(final RatReport report, final File[] files) throws RatException {
@@ -118,11 +116,10 @@ private void processDirectories(final RatReport report, final File[] files) thro
     }
 
     /**
-     * Process all files in a set of file objects, ignoring any files set to be
-     * ignored.
+     * Process all files in a set of file objects, ignoring any files set to be ignored.
      *
      * @param report the report to use in processing
-     * @param files the files to process (only files will be processed)
+     * @param files  the files to process (only files will be processed)
      * @throws RatException
      */
     private void processNonDirectories(final RatReport report, final File[] files) throws RatException {
@@ -138,7 +135,7 @@ private void processNonDirectories(final RatReport report, final File[] files) t
      * Report on the given file.
      *
      * @param report the report to process the file with
-     * @param file the file to be reported on
+     * @param file   the file to be reported on
      * @throws RatException
      */
     private void report(final RatReport report, File file) throws RatException {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java b/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java
index d0dddbde6..c3ed80366 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.walker;
 
 import java.io.File;
@@ -23,7 +23,6 @@
 
 class FileNameComparator implements Comparator<File> {
 
-    @Override
     public int compare(File firstFile, File secondFile) {
         int result = 0;
         if (firstFile == null) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
index a89862c69..064d9ed79 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
@@ -19,12 +19,12 @@
 
 package org.apache.rat.walker;
 
+import org.apache.rat.report.IReportable;
+
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.regex.Pattern;
 
-import org.apache.rat.report.IReportable;
-
 /**
  * Abstract walker.
  */
@@ -37,7 +37,6 @@ public abstract class Walker implements IReportable {
 
     protected static FilenameFilter regexFilter(final Pattern pattern) {
         return new FilenameFilter() {
-            @Override
             public boolean accept(File dir, String name) {
                 final boolean result;
                 if (pattern == null) {
@@ -53,7 +52,7 @@ public boolean accept(File dir, String name) {
     protected boolean isRestricted(File file) {
         return file.getName().startsWith(".");
     }
-
+ 
     protected final boolean isNotIgnored(final File file) {
         boolean result = false;
         if (filter != null) {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
index 0c531dbe9..0d7aacd28 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
@@ -42,11 +42,11 @@ public void setDerivedFrom(String derivedFrom) {
         builder.setDerivedFrom(derivedFrom);
     }
 
-    public void setLicenseFamilyCategory(String licenseFamilyCategory) {
+    public void setId(String licenseFamilyCategory) {
         builder.setLicenseFamilyCategory(licenseFamilyCategory);
     }
 
-    public void setLicenseFamilyName(String licenseFamilyName) {
+    public void setName(String licenseFamilyName) {
         builder.setLicenseFamilyName(licenseFamilyName);
     }
 
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
index 88cf1a693..d0759865a 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
@@ -80,7 +80,7 @@
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
-            licenseFamilyCategory="YASL1"
+            id="YASL1"
             notes="Interesting License">
           <rat:text>exmpl</rat:text>
         </rat:license>
@@ -94,7 +94,7 @@
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            name="Yet Another Software License (YASL) 1.0"
             notes="Interesting License">
           <rat:text text="exampl"/>
         </rat:license>
@@ -108,8 +108,8 @@
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            id="YASL1"
+            name="Yet Another Software License (YASL) 1.0"
             notes="Interesting License">
             <rat:regex />
         </rat:license>
@@ -123,8 +123,8 @@
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
-            licenseFamilyCategory="YASL1"
-            licenseFamilyName="Yet Another Software License (YASL) 1.0"
+            id="YASL1"
+            name="Yet Another Software License (YASL) 1.0"
             notes="Interesting License">
         	<rat:text/>
         </rat:license>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index 355b4a45b..f0a1ade07 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -63,8 +63,8 @@
 	<target name="testWithALUnknown">
 		<rat:report useDefaultLicenses="false">
 			<rat:license
-				licenseFamilyCategory="YASL1"
-				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				id="YASL1"
+				name="Yet Another Software License (YASL) 1.0"
 				notes="Interesting License">
 				<rat:copyright start="2023" end="2024" owner="public domain" />
 			</rat:license>
@@ -83,8 +83,8 @@
 	<target name="testInlineCustomMatcher" depends="prepareCustomMatcher">
 		<rat:report useDefaultLicenses="false">
 			<rat:license
-				licenseFamilyCategory="YASL1"
-				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				id="YASL1"
+				name="Yet Another Software License (YASL) 1.0"
 				notes="Interesting License">
 				<inlineMatcher />
 			</rat:license>
@@ -95,8 +95,8 @@
 	<target name="testCustomMatcher">
 		<rat:report useDefaultLicenses="false">
 			<rat:license
-				licenseFamilyCategory="YASL1"
-				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				id="YASL1"
+				name="Yet Another Software License (YASL) 1.0"
 				notes="Interesting License">
 				<matcher />
 			</rat:license>
@@ -107,8 +107,8 @@
 	<target name="testCustomMatcherBuilder">
 		<rat:report useDefaultLicenses="false">
 			<rat:license
-				licenseFamilyCategory="YASL1"
-				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				id="YASL1"
+				name="Yet Another Software License (YASL) 1.0"
 				notes="Interesting License">
 				<matcherBuilder />
 			</rat:license>
@@ -153,8 +153,8 @@
 		<rat:report>
 			<file file="${resource.dir}/index.apt" />
 			<rat:license
-				licenseFamilyCategory="YASL1"
-				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				id="YASL1"
+				name="Yet Another Software License (YASL) 1.0"
 				notes="Interesting License">
 				<rat:copyright start="2023" end="2024" owner="public domain" />
 			</rat:license>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
index 4066ff064..141d860c8 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
@@ -130,8 +130,8 @@ SPDX-License-Identifier: Apache-2.0
 		<rat:report useDefaultLicenses="false">
 			<file file="${ant.file}" />
 			<rat:license
-				licenseFamilyCategory="YASL1"
-				licenseFamilyName="Yet Another Software License (YASL) 1.0"
+				id="YASL1"
+				name="Yet Another Software License (YASL) 1.0"
 				notes="Interesting License">
 				<!-- non existant copyright in this file -->
 				<rat:copyright owner="non existant" />
@@ -147,8 +147,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false" reportFile="${report.file}">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					 <!--  non existant copyright in this file  -->
 					<rat:copyright owner="non existant" />
@@ -164,8 +164,8 @@ SPDX-License-Identifier: Apache-2.0
 <!-- 			<rat:report useDefaultLicenses="false">-->
 <!--				<file file="${ant.file}" />-->
 <!--				<rat:license-->
-<!--					licenseFamilyCategory="EXMPL"-->
-<!--					licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"-->
+<!--					id="EXMPL"-->
+<!--					name="Yet Another Software License (EXAMPLE) 1.0"-->
 <!--					notes="Interesting License">-->
 <!--					<matcher />-->
 <!--				</rat:license>-->
@@ -178,8 +178,8 @@ SPDX-License-Identifier: Apache-2.0
 <!--			<rat:report useDefaultLicenses="false">-->
 <!--				<file file="${ant.file}" />-->
 <!--				<rat:license-->
-<!--					licenseFamilyCategory="EXMPL"-->
-<!--					licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"-->
+<!--					id="EXMPL"-->
+<!--					name="Yet Another Software License (EXAMPLE) 1.0"-->
 <!--					notes="Interesting License">-->
 <!--					<matcherBuilder />-->
 <!--				</rat:license>-->
@@ -193,8 +193,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="EXMPL"
-					licenseFamilyName="Yet Another Software License (EXAMPLE) 1.0"
+					id="EXMPL"
+					name="Yet Another Software License (EXAMPLE) 1.0"
 					notes="Interesting License">
 					<myMatcher />
 				</rat:license>
@@ -219,8 +219,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:any>
 						<rat:copyright start="2023" end="2024" owner="public domain" />
@@ -234,8 +234,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:all>
 						<rat:text text="the other text" />
@@ -249,8 +249,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${resource.dir}/index.apt" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:copyright start="2023" end="2024" owner="public domain" />
 				</rat:license>
@@ -261,8 +261,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:not>
 						 <!--  non existant copyright in this file  -->
@@ -276,8 +276,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:regex regex="regex\sregex" />
 				</rat:license>
@@ -288,8 +288,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:regex>regex\sregex</rat:regex>
 				</rat:license>
@@ -300,8 +300,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:spdx name="Apache-2.0" />
 				</rat:license>
@@ -312,8 +312,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:spdx>Apache-2.0</rat:spdx>
 				</rat:license>
@@ -324,8 +324,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:text text="The text" />
 				</rat:license>
@@ -336,8 +336,8 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:text>The text</rat:text>
 				</rat:license>
@@ -351,8 +351,8 @@ SPDX-License-Identifier: Apache-2.0
 				removeApprovedLicense="YASL1">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:text>License Family Name: Yet Another Software License
 						(YASL) 1.0</rat:text>
@@ -369,8 +369,8 @@ SPDX-License-Identifier: Apache-2.0
 				useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					<rat:text>License Family Name: Yet Another Software License
 						(YASL) 1.0</rat:text>
@@ -387,8 +387,8 @@ SPDX-License-Identifier: Apache-2.0
 				useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
 					 <!--  non existant copyright in this file  -->
 					<rat:copyright owner="non existant" />
@@ -406,10 +406,10 @@ SPDX-License-Identifier: Apache-2.0
 				useDefaultLicenses="false">
 				<file file="${ant.file}" />
 				<rat:license
-					licenseFamilyCategory="YASL1"
-					licenseFamilyName="Yet Another Software License (YASL) 1.0"
+					id="YASL1"
+					name="Yet Another Software License (YASL) 1.0"
 					notes="Interesting License">
-					<rat:text>licenseFamilyName="Yet Another Software License (YASL)
+					<rat:text>name="Yet Another Software License (YASL)
 						${test.version}</rat:text>
 				</rat:license>
 			</rat:report>

From cf9742e3363d029a2eb50241c863269bd57508aa Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 10:58:57 +0200
Subject: [PATCH 112/299] cleaned up files

---
 .../rat/annotation/TestLicenseAppender.java   | 694 ++++++++++--------
 .../rat/config/ConfigurationUtilTest.java     |  37 -
 .../org/apache/rat/document/MockDocument.java |  20 +-
 .../rat/document/MockDocumentAnalyser.java    |   9 +-
 .../apache/rat/header/SimpleCharFilter.java   |   8 +-
 .../org/apache/rat/test/utils/Resources.java  |  23 +-
 6 files changed, 401 insertions(+), 390 deletions(-)
 delete mode 100644 apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java

diff --git a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
index 0e595519e..71e09d965 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
@@ -18,8 +18,11 @@
  */
 package org.apache.rat.annotation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.apache.commons.io.IOUtils;
+import org.apache.rat.test.utils.Resources;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -28,11 +31,8 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.rat.test.utils.Resources;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 public class TestLicenseAppender {
     @ClassRule
@@ -49,11 +49,16 @@ private interface NewFileReader {
     }
 
     private static String getTemporaryFileWithName(String fileName) throws IOException {
-        return fileName != null ? baseTempFolder.newFile(fileName).getAbsolutePath()
-                : baseTempFolder.newFile().getAbsolutePath();
+        if (fileName != null) {
+            return baseTempFolder.newFile(fileName).getAbsolutePath();
+        } else {
+            return baseTempFolder.newFile().getAbsolutePath();
+        }
     }
 
-    private static void createTestFile(String fileName, FileCreator creator) throws IOException {
+    private static void createTestFile(String fileName,
+                                       FileCreator creator)
+            throws IOException {
         FileWriter w = null;
         try {
             creator.createFile(w = new FileWriter(fileName));
@@ -68,13 +73,16 @@ private static void tryToDelete(File f) {
         }
     }
 
-    private static void commonTestTemplate(String relativeName, FileCreator creator, NewFileReader reader)
+    private static void commonTestTemplate(String relativeName,
+                                           FileCreator creator,
+                                           NewFileReader reader)
             throws IOException {
         String name = getTemporaryFileWithName(relativeName);
         try {
             createTestFile(name, creator);
 
-            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender();
+            ApacheV2LicenseAppender appender =
+                    new ApacheV2LicenseAppender();
             appender.append(new File(name));
 
             BufferedReader r = null;
@@ -90,33 +98,39 @@ private static void commonTestTemplate(String relativeName, FileCreator creator,
         }
     }
 
-    private static NewFileReader checkLines(final String firstLine, final String secondLine) {
+    private static NewFileReader checkLines(final String firstLine,
+                                            final String secondLine) {
         return new NewFileReader() {
-            @Override
             public void readFile(BufferedReader r) throws IOException {
                 String line = r.readLine();
-                assertEquals("First line is incorrect", firstLine, line);
+                assertEquals("First line is incorrect",
+                        firstLine, line);
                 if (secondLine != null) {
                     line = r.readLine();
-                    assertEquals("Second line is incorrect", secondLine, line);
+                    assertEquals("Second line is incorrect",
+                            secondLine, line);
                 }
             }
         };
     }
 
-    private static NewFileReader checkLines(final String firstLine, final String secondLine, final String thirdLine) {
+    private static NewFileReader checkLines(final String firstLine,
+                                            final String secondLine,
+                                            final String thirdLine) {
         return new NewFileReader() {
-            @Override
             public void readFile(BufferedReader r) throws IOException {
                 String line = r.readLine();
-                assertEquals("First line is incorrect", firstLine, line);
+                assertEquals("First line is incorrect",
+                        firstLine, line);
                 if (secondLine != null) {
                     line = r.readLine();
-                    assertEquals("Second line is incorrect", secondLine, line);
+                    assertEquals("Second line is incorrect",
+                            secondLine, line);
                 }
                 if (thirdLine != null) {
                     line = r.readLine();
-                    assertEquals("Third line is incorrect", thirdLine, line);
+                    assertEquals("Third line is incorrect",
+                            thirdLine, line);
                 }
             }
         };
@@ -126,20 +140,22 @@ public void readFile(BufferedReader r) throws IOException {
     public void addLicenseToUnknownFile() throws IOException {
         String filename = getTemporaryFileWithName(null);
         createTestFile(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
+            public void createFile(Writer writer)
+                    throws IOException {
                 writer.write("Unknown file type\n");
             }
         });
 
         File file = new File(filename);
         file.deleteOnExit();
-        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender();
+        ApacheV2LicenseAppender appender =
+                new ApacheV2LicenseAppender();
         appender.append(file);
 
         File newFile = new File(filename + ".new");
         newFile.deleteOnExit();
-        assertFalse("No new file should have been written", newFile.exists());
+        assertFalse("No new file should have been written",
+                newFile.exists());
     }
 
     @Test
@@ -149,14 +165,15 @@ public void addLicenseToJava() throws IOException {
         final String secondLine = "";
         final String thirdLine = "/*";
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("\n");
-                writer.write("public class test {\n");
-                writer.write("}\n");
-            }
-        }, checkLines(firstLine, secondLine, thirdLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("\n");
+                        writer.write("public class test {\n");
+                        writer.write("}\n");
+                    }
+                },
+                checkLines(firstLine, secondLine, thirdLine));
     }
 
     @Test
@@ -164,12 +181,13 @@ public void addLicenseToJavaWithoutPackage() throws IOException {
         String filename = "tmp.java";
         String commentLine = "/*";
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("public class test {\n");
-                writer.write("}\n");
-            }
-        }, checkLines(commentLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("public class test {\n");
+                        writer.write("}\n");
+                    }
+                },
+                checkLines(commentLine, null));
     }
 
     @Test
@@ -180,14 +198,15 @@ public void addLicenseToXML() throws IOException {
         final String thirdLine = "<!--";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("\n");
-                writer.write("<xml>\n");
-                writer.write("</xml>\n");
-            }
-        }, checkLines(firstLine, secondLine, thirdLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("\n");
+                        writer.write("<xml>\n");
+                        writer.write("</xml>\n");
+                    }
+                },
+                checkLines(firstLine, secondLine, thirdLine));
     }
 
     @Test
@@ -197,12 +216,13 @@ public void addLicenseToXMLWithoutDecl() throws IOException {
         final String secondLine = "<!--";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("<xml>\n");
-                writer.write("</xml>\n");
-            }
-        }, checkLines(firstLine, secondLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("<xml>\n");
+                        writer.write("</xml>\n");
+                    }
+                },
+                checkLines(firstLine, secondLine));
     }
 
     @Test
@@ -211,13 +231,14 @@ public void addLicenseToHTML() throws IOException {
         String commentLine = "<!--";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("<html>\n");
-                writer.write("\n");
-                writer.write("</html>\n");
-            }
-        }, checkLines(commentLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("<html>\n");
+                        writer.write("\n");
+                        writer.write("</html>\n");
+                    }
+                },
+                checkLines(commentLine, null));
     }
 
     @Test
@@ -226,13 +247,14 @@ public void addLicenseToCSS() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(".class {\n");
-                writer.write(" background-color: red;");
-                writer.write("}\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(".class {\n");
+                        writer.write(" background-color: red;");
+                        writer.write("}\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -241,13 +263,14 @@ public void addLicenseToJavascript() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("if (a ==b) {>\n");
-                writer.write(" alert(\"how useful!\");");
-                writer.write("}\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("if (a ==b) {>\n");
+                        writer.write(" alert(\"how useful!\");");
+                        writer.write("}\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -256,13 +279,14 @@ public void addLicenseToAPT() throws IOException {
         String firstLine = "~~" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("A Simple APT file");
-                writer.write(" This file contains nothing\n");
-                writer.write(" of any importance\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("A Simple APT file");
+                        writer.write(" This file contains nothing\n");
+                        writer.write(" of any importance\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -271,13 +295,14 @@ public void addLicenseToProperties() throws IOException {
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("property = value\n");
-                writer.write("fun = true\n");
-                writer.write("cool = true\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("property = value\n");
+                        writer.write("fun = true\n");
+                        writer.write("cool = true\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -287,41 +312,46 @@ public void addLicenseToScala() throws IOException {
         final String newFirstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("\n");
-                writer.write("    object X { val x = 1; }\n");
-                writer.write("}\n");
-            }
-        }, new NewFileReader() {
-            @Override
-            public void readFile(BufferedReader reader) throws IOException {
-                String line = reader.readLine();
-                assertEquals("First line is incorrect", newFirstLine, line);
-                while ((line = reader.readLine()) != null) {
-                    if (line.length() == 0) {
-                        line = reader.readLine();
-                        break;
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("\n");
+                        writer.write("    object X { val x = 1; }\n");
+                        writer.write("}\n");
                     }
-                }
-                assertEquals("Package line is incorrect", firstLine, line);
-            }
-        });
+                },
+                new NewFileReader() {
+                    public void readFile(BufferedReader reader)
+                            throws IOException {
+                        String line = reader.readLine();
+                        assertEquals("First line is incorrect",
+                                newFirstLine, line);
+                        while ((line = reader.readLine()) != null) {
+                            if (line.length() == 0) {
+                                line = reader.readLine();
+                                break;
+                            }
+                        }
+                        assertEquals("Package line is incorrect",
+                                firstLine, line);
+                    }
+                });
     }
 
     @Test
-    public void addLicenseToRubyWithoutHashBang() throws IOException {
+    public void addLicenseToRubyWithoutHashBang()
+            throws IOException {
         String filename = "tmp.rb";
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("class Foo\n");
-                writer.write("end\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("class Foo\n");
+                        writer.write("end\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -331,26 +361,29 @@ public void addLicenseToRubyWithHashBang() throws IOException {
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("class Foo\n");
-                writer.write("end\n");
-            }
-        }, checkLines(firstLine, secondLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("class Foo\n");
+                        writer.write("end\n");
+                    }
+                },
+                checkLines(firstLine, secondLine));
     }
 
     @Test
-    public void addLicenseToPerlWithoutHashBang() throws IOException {
+    public void addLicenseToPerlWithoutHashBang()
+            throws IOException {
         String filename = "tmp.pl";
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("print \"Hello world\"\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("print \"Hello world\"\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -360,41 +393,45 @@ public void addLicenseToPerlWithHashBang() throws IOException {
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("print \"Hello world\"\n");
-            }
-        }, checkLines(firstLine, secondLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("print \"Hello world\"\n");
+                    }
+                },
+                checkLines(firstLine, secondLine));
     }
 
     @Test
     public void addLicenseToPerlModule() throws IOException {
         String filename = "tmp.pm";
         final String firstLine = "package API::TestAPI;";
-        final String secondLine = "";
+        final String secondLine = ""; 
         final String thirdLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("print \"Hello world\"\n");
-            }
-        }, checkLines(firstLine, secondLine, thirdLine));
-    }
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("print \"Hello world\"\n");
+                    }
+                },
+                checkLines(firstLine, secondLine, thirdLine));
+    }    
 
     @Test
-    public void addLicenseToTclWithoutHashBang() throws IOException {
+    public void addLicenseToTclWithoutHashBang()
+            throws IOException {
         String filename = "tmp.tcl";
         String firstLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("puts \"Hello world\"\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("puts \"Hello world\"\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -404,12 +441,13 @@ public void addLicenseToTclWithHashBang() throws IOException {
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("puts \"Hello world\"\n");
-            }
-        }, checkLines(firstLine, secondLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("puts \"Hello world\"\n");
+                    }
+                },
+                checkLines(firstLine, secondLine));
     }
 
     @Test
@@ -420,13 +458,14 @@ public void addLicenseToPHP() throws IOException {
         final String thirdLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("echo 'Hello World'\n");
-                writer.write("?>\n");
-            }
-        }, checkLines(firstLine, secondLine, thirdLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("echo 'Hello World'\n");
+                        writer.write("?>\n");
+                    }
+                },
+                checkLines(firstLine, secondLine, thirdLine));
     }
 
     @Test
@@ -435,14 +474,15 @@ public void addLicenseToCSharp() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("namespace org.example {\n");
-                writer.write("    public class Foo {\n");
-                writer.write("    }\n");
-                writer.write("}\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("namespace org.example {\n");
+                        writer.write("    public class Foo {\n");
+                        writer.write("    }\n");
+                        writer.write("}\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -451,13 +491,14 @@ public void addLicenseToGroovy() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("package org.example \n");
-                writer.write("    class Foo {\n");
-                writer.write("    }\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("package org.example \n");
+                        writer.write("    class Foo {\n");
+                        writer.write("    }\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -466,14 +507,15 @@ public void addLicenseToCPlusPlus() throws IOException {
         String firstLine = "/*";
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write("namespace org.example {\n");
-                writer.write("    public class Foo {\n");
-                writer.write("    }\n");
-                writer.write("}\n");
-            }
-        }, checkLines(firstLine, null));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("namespace org.example {\n");
+                        writer.write("    public class Foo {\n");
+                        writer.write("    }\n");
+                        writer.write("}\n");
+                    }
+                },
+                checkLines(firstLine, null));
     }
 
     @Test
@@ -482,28 +524,33 @@ public void addLicenseToGo() throws IOException {
         final String firstLine = "package main";
         String secondLine = "";
         String thirdLine = "/*";
+        
+        		
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write("import (\n");
-                writer.write("    log\n");
-                writer.write(")\n");
-            }
-        }, checkLines(firstLine, secondLine, thirdLine));
-    }
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("import (\n");
+                        writer.write("    log\n");
+                        writer.write(")\n");
+                    }
+                },
+                checkLines(firstLine, secondLine, thirdLine));
+    }    
 
     @Test
     public void fileWithBOM() throws IOException {
         File f = Resources.getResourceFile("violations/FilterTest.cs");
         try {
-            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender();
+            ApacheV2LicenseAppender appender =
+                    new ApacheV2LicenseAppender();
             appender.append(f);
 
             BufferedReader r = null;
             try {
-                r = new BufferedReader(new FileReader(f.getAbsolutePath() + ".new"));
+                r = new BufferedReader(new FileReader(f.getAbsolutePath()
+                        + ".new"));
                 assertEquals("/*", r.readLine());
                 String line = null;
                 while ((line = r.readLine()) != null) {
@@ -523,160 +570,169 @@ public void fileWithBOM() throws IOException {
     @Test
     public void addLicenseToVS2003solution() throws IOException {
         String filename = "tmp.sln";
-        final String firstLine = "Microsoft Visual Studio Solution File," + " Format Version 8.0";
+        final String firstLine = "Microsoft Visual Studio Solution File,"
+                + " Format Version 8.0";
         String secondLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write(
-                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
-                writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
-                writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
-                writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
-                writer.write("\tEndProjectSection\n");
-                writer.write("EndProject\n");
-            }
-        }, checkLines(firstLine, secondLine));
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
+                        writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
+                        writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
+                        writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
+                        writer.write("\tEndProjectSection\n");
+                        writer.write("EndProject\n");
+                    }
+                },
+                checkLines(firstLine, secondLine));
     }
 
     @Test
     public void addLicenseToVS2005solution() throws IOException {
         String filename = "tmp.sln";
-        final String firstLine = "Microsoft Visual Studio Solution File," + " Format Version 9.0";
+        final String firstLine = "Microsoft Visual Studio Solution File,"
+                + " Format Version 9.0";
         final String secondLine = "# Visual Studio 2005";
         final String thirdLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write(secondLine + "\n");
-                writer.write(
-                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
-                writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
-                writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
-                writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
-                writer.write("\tEndProjectSection\n");
-                writer.write("EndProject\n");
-            }
-        }, new NewFileReader() {
-            @Override
-            public void readFile(BufferedReader r) throws IOException {
-                String line = r.readLine();
-                assertEquals("First line is incorrect", firstLine, line);
-                line = r.readLine();
-                assertEquals("Second line is incorrect", secondLine, line);
-                line = r.readLine();
-                assertEquals("Third line is incorrect", thirdLine, line);
-            }
-        });
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write(secondLine + "\n");
+                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"ConsoleApp\", \"Tutorials\\ConsoleApp\\cs\\src\\ConsoleApp.csproj\", \"{933969DF-2BC5-44E6-8B1A-400FC276A23F}\"\n");
+                        writer.write("\tProjectSection(WebsiteProperties) = preProject\n");
+                        writer.write("\t\tDebug.AspNetCompiler.Debug = \"True\"\n");
+                        writer.write("\t\tRelease.AspNetCompiler.Debug = \"False\"\n");
+                        writer.write("\tEndProjectSection\n");
+                        writer.write("EndProject\n");
+                    }
+                },
+                new NewFileReader() {
+                    public void readFile(BufferedReader r) throws IOException {
+                        String line = r.readLine();
+                        assertEquals("First line is incorrect",
+                                firstLine, line);
+                        line = r.readLine();
+                        assertEquals("Second line is incorrect",
+                                secondLine, line);
+                        line = r.readLine();
+                        assertEquals("Third line is incorrect",
+                                thirdLine, line);
+                    }
+                });
     }
 
     @Test
     public void addLicenseToVS2010ExpressSolution() throws IOException {
         String filename = "tmp.sln";
-        final String firstLine = "Microsoft Visual Studio Solution File, " + "Format Version 11.00";
+        final String firstLine = "Microsoft Visual Studio Solution File, "
+                + "Format Version 11.00";
         final String secondLine = "# Visual C# Express 2010";
         final String thirdLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write(secondLine + "\n");
-                writer.write(
-                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
-                writer.write("EndProject\n");
-                writer.write(
-                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
-                writer.write("EndProject\n");
-                writer.write("Global\n");
-                writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
-                writer.write("Debug|Any CPU = Debug|Any CPU\n");
-                writer.write("Release|Any CPU = Release|Any CPU\n");
-                writer.write("EndGlobalSection\n");
-                writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                writer.write("EndGlobalSection\n");
-                writer.write("GlobalSection(SolutionProperties) = preSolution\n");
-                writer.write("HideSolutionNode = FALSE\n");
-                writer.write("EndGlobalSection\n");
-                writer.write("EndGlobal \n");
-            }
-        }, new NewFileReader() {
-            @Override
-            public void readFile(BufferedReader r) throws IOException {
-                String line = r.readLine();
-                assertEquals("First line is incorrect", firstLine, line);
-                line = r.readLine();
-                assertEquals("Second line is incorrect", secondLine, line);
-                line = r.readLine();
-                assertEquals("Third line is incorrect", thirdLine, line);
-            }
-        });
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write(secondLine + "\n");
+                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
+                        writer.write("EndProject\n");
+                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
+                        writer.write("EndProject\n");
+                        writer.write("Global\n");
+                        writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
+                        writer.write("Debug|Any CPU = Debug|Any CPU\n");
+                        writer.write("Release|Any CPU = Release|Any CPU\n");
+                        writer.write("EndGlobalSection\n");
+                        writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                        writer.write("EndGlobalSection\n");
+                        writer.write("GlobalSection(SolutionProperties) = preSolution\n");
+                        writer.write("HideSolutionNode = FALSE\n");
+                        writer.write("EndGlobalSection\n");
+                        writer.write("EndGlobal \n");
+                    }
+                },
+                new NewFileReader() {
+                    public void readFile(BufferedReader r) throws IOException {
+                        String line = r.readLine();
+                        assertEquals("First line is incorrect",
+                                firstLine, line);
+                        line = r.readLine();
+                        assertEquals("Second line is incorrect",
+                                secondLine, line);
+                        line = r.readLine();
+                        assertEquals("Third line is incorrect",
+                                thirdLine, line);
+                    }
+                });
     }
 
     @Test
     public void addLicenseToVS2010SolutionWithBlankLine() throws IOException {
         String filename = "tmp.sln";
         final String firstLine = "";
-        final String secondLine = "Microsoft Visual Studio Solution File, " + "Format Version 11.00";
+        final String secondLine = "Microsoft Visual Studio Solution File, "
+                + "Format Version 11.00";
         final String thirdLine = "# Visual C# Express 2010";
         final String forthLine = "#" + FIRST_LICENSE_LINE;
 
         commonTestTemplate(filename, new FileCreator() {
-            @Override
-            public void createFile(Writer writer) throws IOException {
-                writer.write(firstLine + "\n");
-                writer.write(secondLine + "\n");
-                writer.write(thirdLine + "\n");
-                writer.write(
-                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
-                writer.write("EndProject\n");
-                writer.write(
-                        "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
-                writer.write("EndProject\n");
-                writer.write("Global\n");
-                writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
-                writer.write("Debug|Any CPU = Debug|Any CPU\n");
-                writer.write("Release|Any CPU = Release|Any CPU\n");
-                writer.write("EndGlobalSection\n");
-                writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
-                writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
-                writer.write("EndGlobalSection\n");
-                writer.write("GlobalSection(SolutionProperties) = preSolution\n");
-                writer.write("HideSolutionNode = FALSE\n");
-                writer.write("EndGlobalSection\n");
-                writer.write("EndGlobal \n");
-            }
-        }, new NewFileReader() {
-            @Override
-            public void readFile(BufferedReader r) throws IOException {
-                String line = r.readLine();
-                assertEquals("First line is incorrect", firstLine, line);
-                line = r.readLine();
-                assertEquals("Second line is incorrect", secondLine, line);
-                line = r.readLine();
-                assertEquals("Third line is incorrect", thirdLine, line);
-                line = r.readLine();
-                assertEquals("Forth line is incorrect", forthLine, line);
-            }
-        });
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write(firstLine + "\n");
+                        writer.write(secondLine + "\n");
+                        writer.write(thirdLine + "\n");
+                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Lucene.Net\", \"..\\..\\..\\src\\core\\Lucene.Net.csproj\", \"{5D4AD9BE-1FFB-41AB-9943-25737971BF57}\"\n");
+                        writer.write("EndProject\n");
+                        writer.write("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Contrib.Highlighter\", \"..\\..\\..\\src\\contrib\\Highlighter\\Contrib.Highlighter.csproj\", \"{901D5415-383C-4AA6-A256-879558841BEA}\"\n");
+                        writer.write("EndProject\n");
+                        writer.write("Global\n");
+                        writer.write("GlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
+                        writer.write("Debug|Any CPU = Debug|Any CPU\n");
+                        writer.write("Release|Any CPU = Release|Any CPU\n");
+                        writer.write("EndGlobalSection\n");
+                        writer.write("GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                        writer.write("{5D4AD9BE-1FFB-41AB-9943-25737971BF57}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU\n");
+                        writer.write("{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU\n");
+                        writer.write("EndGlobalSection\n");
+                        writer.write("GlobalSection(SolutionProperties) = preSolution\n");
+                        writer.write("HideSolutionNode = FALSE\n");
+                        writer.write("EndGlobalSection\n");
+                        writer.write("EndGlobal \n");
+                    }
+                },
+                new NewFileReader() {
+                    public void readFile(BufferedReader r) throws IOException {
+                        String line = r.readLine();
+                        assertEquals("First line is incorrect",
+                                firstLine, line);
+                        line = r.readLine();
+                        assertEquals("Second line is incorrect",
+                                secondLine, line);
+                        line = r.readLine();
+                        assertEquals("Third line is incorrect",
+                                thirdLine, line);
+                        line = r.readLine();
+                        assertEquals("Forth line is incorrect",
+                                forthLine, line);
+                    }
+                });
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
deleted file mode 100644
index 85f6a5f57..000000000
--- a/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.rat.config;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-public class ConfigurationUtilTest {
-//    @Test
-//    public void toNamesIsNullSafe() {
-//        assertTrue(ConfigurationUtil.toNames(null).isEmpty());
-//    }
-//
-//    @Test
-//    public void toNamesIsEmptyArraySafe() {
-//        assertTrue(ConfigurationUtil.toNames(new ILicenseFamily[0]).isEmpty());
-//    }
-//    @Test
-//    public void toNamesRegular() {
-    // assertEquals(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1,
-    // ConfigurationUtil.toNames(new ILicenseFamily[]{new
-    // GPL1LicenseFamily()}).get(0));
-//    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
index 43571ce7f..d52ae6b7c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
@@ -15,16 +15,16 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.document;
 
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
 public class MockDocument implements Document {
 
     private final Reader reader;
@@ -38,35 +38,31 @@ public MockDocument() {
     public MockDocument(String name) {
         this(null, name);
     }
-
+    
     public MockDocument(Reader reader, String name) {
         super();
         this.reader = reader;
         this.name = name;
     }
 
-    @Override
     public Reader reader() throws IOException {
         return reader;
     }
 
-    @Override
     public String getName() {
         return name;
     }
 
-    @Override
     public boolean isComposite() {
         return false;
     }
-
-    @Override
+    
     public MetaData getMetaData() {
         return metaData;
     }
+    
 
-    @Override
     public InputStream inputStream() throws IOException {
-        throw new UnsupportedOperationException("in MockDocument inputStream()");
+        throw new UnsupportedOperationException();
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java
index c5b513ec4..65a3d44e8 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/MockDocumentAnalyser.java
@@ -15,19 +15,18 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.document;
 
+import org.apache.rat.api.Document;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.rat.api.Document;
-
 public class MockDocumentAnalyser implements IDocumentAnalyser {
 
     public final List<Document> matches = new ArrayList<>();
-
-    @Override
+    
     public void analyse(Document document) throws RatDocumentAnalysisException {
         matches.add(document);
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java b/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java
index 3478cef3d..cf44004de 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/header/SimpleCharFilter.java
@@ -15,17 +15,15 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.header;
 
 public class SimpleCharFilter implements CharFilter {
 
     public boolean filterOut = false;
+    
+    public SimpleCharFilter() {}
 
-    public SimpleCharFilter() {
-    }
-
-    @Override
     public boolean isFilteredOut(char character) {
         return filterOut;
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java b/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java
index 8ebcca1c3..f96088487 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java
@@ -18,6 +18,8 @@
  */
 package org.apache.rat.test.utils;
 
+import org.apache.rat.document.impl.DocumentImplUtils;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileFilter;
@@ -29,10 +31,10 @@
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.rat.document.impl.DocumentImplUtils;
 
 /**
- * Utility class, which provides static methods for creating test cases.
+ * Utility class, which provides static methods for creating
+ * test cases.
  */
 public class Resources {
     /**
@@ -62,8 +64,7 @@ public static File getMainResourceFile(String pResource) throws IOException {
     }
 
     /**
-     * Try to to load the given file from baseDir, in case of errors try to add
-     * module names to fix behaviour from within IntelliJ.
+     * Try to to load the given file from baseDir, in case of errors try to add module names to fix behaviour from within IntelliJ.
      */
     private static File getResourceFromBase(File baseDir, String pResource) throws IOException {
         File f = new File(baseDir, pResource);
@@ -74,8 +75,8 @@ private static File getResourceFromBase(File baseDir, String pResource) throws I
     }
 
     /**
-     * Locates a set of resource files in the class path. In case of errors try to
-     * add module names to fix behaviour from within IntelliJ.
+     * Locates a set of resource files in the class path.
+     * In case of errors try to add module names to fix behaviour from within IntelliJ.
      */
     public static File[] getResourceFiles(String pResource) throws IOException {
         File f = new File(TEST_RESOURCE_BASE_PATH, pResource);
@@ -84,7 +85,6 @@ public static File[] getResourceFiles(String pResource) throws IOException {
         }
 
         return f.listFiles(new FileFilter() {
-            @Override
             public boolean accept(File pathname) {
                 return pathname.isFile();
             }
@@ -106,23 +106,22 @@ public static Reader getResourceReader(String pResource) throws IOException {
     }
 
     /**
-     * Locates a resource file in the class path and returns a
-     * {@link BufferedReader}.
+     * Locates a resource file in the class path and returns a {@link BufferedReader}.
      */
     public static BufferedReader getBufferedResourceReader(String pResource) throws IOException {
         return new BufferedReader(getResourceReader(pResource));
     }
 
     /**
-     * Locates a resource file in the class path and returns a
-     * {@link BufferedReader}.
+     * Locates a resource file in the class path and returns a {@link BufferedReader}.
      */
     public static BufferedReader getBufferedReader(File file) throws IOException {
         return new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
     }
 
     /**
-     * Locates the name of a directory, which contains the given resource file.
+     * Locates the name of a directory, which contains the given
+     * resource file.
      */
     public static String getResourceDirectory(String pResource) throws IOException {
         final File resource = getResourceFile(pResource);

From ed9aaa3d3ed85a187138982e5d535c8c49b679aa Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 11:07:44 +0200
Subject: [PATCH 113/299] cleaned up files

---
 .../org/apache/rat/mp/FilesReportable.java    | 64 ++++++++++---------
 .../rat/mp/HeaderMatcherSpecification.java    | 16 +++--
 .../rat/mp/LicenseFamilySpecification.java    | 16 +++--
 .../org/apache/rat/mp/RatCheckException.java  |  8 ++-
 4 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
index e49e2f89b..ae339edd3 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
@@ -1,12 +1,5 @@
 package org.apache.rat.mp;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -33,27 +26,41 @@
 import org.apache.rat.report.IReportable;
 import org.apache.rat.report.RatReport;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+
 /**
  * Implementation of IReportable that traverses over a set of files.
  */
-class FilesReportable implements IReportable {
+class FilesReportable implements IReportable
+{
     private final File basedir;
 
     private final String[] files;
 
-    FilesReportable(File basedir, String[] files) throws IOException {
-        final File currentDir = new File(System.getProperty("user.dir")).getCanonicalFile();
+    FilesReportable( File basedir, String[] files )
+            throws IOException
+    {
+        final File currentDir = new File( System.getProperty( "user.dir" ) ).getCanonicalFile();
         final File f = basedir.getCanonicalFile();
-        if (currentDir.equals(f)) {
+        if ( currentDir.equals( f ) )
+        {
             this.basedir = null;
-        } else {
+        }
+        else
+        {
             this.basedir = basedir;
         }
         this.files = files;
     }
 
-    @Override
-    public void run(RatReport report) throws RatException {
+    public void run( RatReport report ) throws RatException
+    {
         FileDocument document = new FileDocument();
         for (String file : files) {
             document.setFile(new File(basedir, file));
@@ -62,40 +69,39 @@ public void run(RatReport report) throws RatException {
         }
     }
 
-    private class FileDocument implements Document {
+    private class FileDocument implements Document
+    {
         private File file;
         private final MetaData metaData = new MetaData();
-
-        void setFile(File file) {
+        
+        void setFile( File file )
+        {
             this.file = file;
         }
 
-        @Override
         public boolean isComposite() {
             return DocumentImplUtils.isZip(file);
         }
 
-        @Override
-        public Reader reader() throws IOException {
-            final InputStream in = new FileInputStream(file);
-            return new InputStreamReader(in);
+        public Reader reader() throws IOException
+        {
+            final InputStream in = new FileInputStream( file );
+            return new InputStreamReader( in );
         }
 
-        @Override
-        public String getName() {
-            return DocumentImplUtils.toName(file);
+        public String getName()
+        {
+            return DocumentImplUtils.toName( file );
         }
 
-        @Override
         public MetaData getMetaData() {
             return metaData;
         }
-
-        @Override
+        
         public InputStream inputStream() throws IOException {
             return new FileInputStream(file);
         }
-
+        
         @Override
         public String toString() {
             return "File:" + file.getAbsolutePath();
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
index 68ce2ddf3..0c0c306ad 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
@@ -20,10 +20,11 @@
  */
 
 /**
- * Used to specify additional license matchers. A license matcher is basically a
- * class, which implements {@link org.apache.rat.analysis.IHeaderMatcher}.
+ * Used to specify additional license matchers. A license matcher is basically a class, which implements
+ * {@link org.apache.rat.analysis.IHeaderMatcher}.
  */
-public class HeaderMatcherSpecification {
+public class HeaderMatcherSpecification
+{
     /**
      * The license matchers class name.
      */
@@ -34,16 +35,19 @@ public class HeaderMatcherSpecification {
      * 
      * @return Class name of the license matcher.
      */
-    public String getClassName() {
+    public String getClassName()
+    {
         return className;
     }
 
     /**
      * Sets the license matchers class name. Required.
      * 
-     * @param pClassName Class name of the license matcher.
+     * @param pClassName
+     *            Class name of the license matcher.
      */
-    public void setClassName(String pClassName) {
+    public void setClassName( String pClassName )
+    {
         className = pClassName;
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
index 0f888781c..5bd4941ea 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
@@ -20,10 +20,11 @@
  */
 
 /**
- * Used to specify additional license families. A license family is basically a
- * class, which implements {@link org.apache.rat.license.ILicenseFamily}.
+ * Used to specify additional license families. A license family is basically a class, which implements
+ * {@link org.apache.rat.license.ILicenseFamily}.
  */
-public class LicenseFamilySpecification {
+public class LicenseFamilySpecification
+{
     /**
      * The license family's class name.
      */
@@ -34,16 +35,19 @@ public class LicenseFamilySpecification {
      * 
      * @return Class name of the license family.
      */
-    public String getClassName() {
+    public String getClassName()
+    {
         return className;
     }
 
     /**
      * Sets the license family's class name. Required.
      * 
-     * @param pClassName Class name of the license family.
+     * @param pClassName
+     *            Class name of the license family.
      */
-    public void setClassName(String pClassName) {
+    public void setClassName( String pClassName )
+    {
         className = pClassName;
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java
index c5aa65f56..001695366 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckException.java
@@ -21,10 +21,12 @@
 
 import org.apache.maven.plugin.MojoFailureException;
 
-public class RatCheckException extends MojoFailureException {
+public class RatCheckException extends MojoFailureException
+{
     private static final long serialVersionUID = -1720861476741779140L;
 
-    public RatCheckException(String message) {
-        super(message);
+    public RatCheckException( String message )
+    {
+        super( message );
     }
 }

From a4828a632b8d5ea4b8d3677ad116eda60637c6c4 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 11:19:40 +0200
Subject: [PATCH 114/299] cleaned up files

---
 .../anttasks/ResourceCollectionContainer.java |   24 +-
 pom.xml                                       | 1449 ++++++++---------
 2 files changed, 709 insertions(+), 764 deletions(-)

diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
index 103ee0f36..6fe9175bc 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */
+ */ 
 package org.apache.rat.anttasks;
 
 import java.io.File;
@@ -23,7 +23,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.util.stream.Stream;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
@@ -36,8 +35,8 @@
 import org.apache.tools.ant.types.resources.FileResource;
 
 /**
- * Implementation of IReportable that traverses over a resource collection
- * internally.
+ * Implementation of IReportable that traverses over a resource
+ * collection internally.
  */
 class ResourceCollectionContainer implements IReportable {
     private final ResourceCollection rc;
@@ -45,12 +44,7 @@ class ResourceCollectionContainer implements IReportable {
     ResourceCollectionContainer(ResourceCollection rc) {
         this.rc = rc;
     }
-    
-    public Stream<? extends Resource> getFiles() {
-        return rc.stream().filter( r -> !r.isDirectory());
-    }
 
-    @Override
     public void run(RatReport report) throws RatException {
         ResourceDocument document = new ResourceDocument();
         for (Resource r : rc) {
@@ -61,7 +55,6 @@ public void run(RatReport report) throws RatException {
             }
         }
     }
-
     private class ResourceDocument implements Document {
 
         private Resource resource;
@@ -70,14 +63,12 @@ private class ResourceDocument implements Document {
         private void setResource(Resource resource) {
             this.resource = resource;
         }
-
-        @Override
+        
         public Reader reader() throws IOException {
             final InputStream in = resource.getInputStream();
             return new InputStreamReader(in);
         }
 
-        @Override
         public String getName() {
             // TODO: reconsider names
             String result = null;
@@ -91,7 +82,6 @@ public String getName() {
             return result;
         }
 
-        @Override
         public boolean isComposite() {
             if (resource instanceof FileResource) {
                 final FileResource fileResource = (FileResource) resource;
@@ -100,13 +90,11 @@ public boolean isComposite() {
             }
             return false;
         }
-
-        @Override
+        
         public MetaData getMetaData() {
             return metaData;
         }
-
-        @Override
+        
         public InputStream inputStream() throws IOException {
             return resource.getInputStream();
         }
diff --git a/pom.xml b/pom.xml
index 45a67065f..04359fd27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,776 +15,733 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache</groupId>
-		<artifactId>apache</artifactId>
-		<version>29</version>
-	</parent>
-	<groupId>org.apache.rat</groupId>
-	<artifactId>apache-rat-project</artifactId>
-	<version>0.16-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Apache Creadur Rat</name>
-	<url>https://creadur.apache.org/rat/</url>
-	<description>
-		Apache Rat is a release audit tool. It improves accuracy and efficiency
-		when checking
-		releases. It is heuristic in nature: making guesses about possible
-		problems. It
-		will produce false positives and cannot find every possible issue with a
-		release.
-		Its reports require interpretation.
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>29</version>
+  </parent>
+  <groupId>org.apache.rat</groupId>
+  <artifactId>apache-rat-project</artifactId>
+  <version>0.16-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Apache Creadur Rat</name>
+  <url>https://creadur.apache.org/rat/</url>
+  <description>
+Apache Rat is a release audit tool. It improves accuracy and efficiency when checking
+releases. It is heuristic in nature: making guesses about possible problems. It
+will produce false positives and cannot find every possible issue with a release.
+Its reports require interpretation.
 
-		In response to demands from project quality tool developers, Rat is
-		available as a
-		library suitable for inclusion in tools. This POM describes that
-		library.
-		Note that binary compatibility is not guaranteed between 0.x releases.
-		Apache Rat is developed by the Apache Creadur project, a language and
-		build
-		agnostic home for software distribution comprehension and audit tools.
-	</description>
-	<inceptionYear>2006</inceptionYear>
-	<properties>
-		<!-- taken from
-		https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-		<project.build.outputTimestamp>10</project.build.outputTimestamp>
-		<ant.version>1.10.13</ant.version>
-		<mockito.version>4.11.0</mockito.version>
-		<javaVersion>1.8</javaVersion>
-		<maven.compiler.source>${javaVersion}</maven.compiler.source>
-		<maven.compiler.target>${javaVersion}</maven.compiler.target>
-		<!-- This is the version of Maven required to use the Rat Maven Plugin -->
-		<mavenVersion>3.2.5</mavenVersion>
-		<creadur.jira.id>RAT</creadur.jira.id>
-		<!-- maven plugin versions -->
-		<mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
-		<mavenChangesVersion>2.12.1</mavenChangesVersion>
-		<mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
-		<mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
-		<!-- Used to generate download page for RAT during site builds, please
-		adapt versions manually BEFORE doing a release -->
-		<previousRatVersion>0.16</previousRatVersion>
-		<currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
-	</properties>
-	<distributionManagement>
-		<site>
-			<id>staging</id>
-			<url>file:bogus</url>
-		</site>
-	</distributionManagement>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-api</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-tasks</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
-				<version>1.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-collections4</artifactId>
-				<version>4.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-configuration2</artifactId>
-				<version>2.9.0</version>
-			</dependency>
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>1.9.4</version>
-            </dependency>
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>
-                    commons-io</artifactId>
-				<version>2.11.0</version>
-            </dependency>
-			<dependency>
-				<groupId>
-                    org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>3.12.0</version>
-            </dependency>
-			<dependency>
-				<groupId>
-                    org.apache.commons</groupId>
-				<artifactId>commons-compress</artifactId>
-				<version>
-                    1.23.0</version>
-            </dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>
-                    junit</artifactId>
-				<version>4.13.2</version>
-				<scope>test</scope>
-            </dependency>
-			<dependency>
-				<groupId>
-                    org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>
-                    ${mockito.version}</version>
-				<scope>test</scope>
-            </dependency>
-			<dependency>
-				<groupId>
-                    org.hamcrest</groupId>
-				<artifactId>hamcrest-library</artifactId>
-				<version>2.2</version>
-				<scope>
-                    test</scope>
-            </dependency>
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>
-                    ant</artifactId>
-				<version>${ant.version}</version>
-				<scope>provided</scope>
-            </dependency>
-			<dependency>
-				<groupId>
-                    org.apache.ant</groupId>
-				<artifactId>ant-antunit</artifactId>
-				<version>1.4.1</version>
-				<scope>
-                    test</scope>
-            </dependency>
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>
-                    ant-testutil</artifactId>
-				<version>${ant.version}</version>
-				<scope>test</scope>
-            </dependency>
-			<dependency>
-				<groupId>
-                    org.apache.maven.plugin-tools</groupId>
-				<artifactId>
-                    maven-plugin-annotations</artifactId>
-				<version>
-                    ${mavenPluginPluginVersion}</version>
-            </dependency>
-		</dependencies>
-	</dependencyManagement>
-	<reporting>
-		<!-- N.B. plugins defined here in the <reporting> section ignore what's
-		defined in <pluginManagement>
+In response to demands from project quality tool developers, Rat is available as a
+library suitable for inclusion in tools. This POM describes that library.
+Note that binary compatibility is not guaranteed between 0.x releases.
+
+Apache Rat is developed by the Apache Creadur project, a language and build
+agnostic home for software distribution comprehension and audit tools.
+  </description>
+  <inceptionYear>2006</inceptionYear>
+  <properties>
+    <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+    <project.build.outputTimestamp>10</project.build.outputTimestamp>
+    <ant.version>1.10.14</ant.version>
+    <mockito.version>4.11.0</mockito.version>
+    <javaVersion>1.8</javaVersion>
+    <maven.compiler.source>${javaVersion}</maven.compiler.source>
+    <maven.compiler.target>${javaVersion}</maven.compiler.target>
+    <!-- This is the version of Maven required to use the Rat Maven Plugin -->
+    <mavenVersion>3.2.5</mavenVersion>
+    <creadur.jira.id>RAT</creadur.jira.id>
+    <!-- maven plugin versions -->
+    <mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
+    <mavenChangesVersion>2.12.1</mavenChangesVersion>
+    <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
+    <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
+    <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
+    <previousRatVersion>0.16</previousRatVersion>
+    <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
+  </properties>
+  <distributionManagement>
+    <site>
+      <id>staging</id>
+      <url>file:bogus</url>
+    </site>
+  </distributionManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-tasks</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <version>1.5.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>4.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.9.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.11.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.12.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>1.24.0</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13.2</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>${mockito.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-library</artifactId>
+        <version>2.2</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${ant.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-antunit</artifactId>
+        <version>1.4.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-testutil</artifactId>
+        <version>${ant.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-annotations</artifactId>
+        <version>${mavenPluginPluginVersion}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <reporting>
+    <!-- N.B. plugins defined here in the <reporting> section ignore what's defined in <pluginManagement>
          in the <build> section above, so we have to define the versions here. -->
-		<plugins>
-			<!-- org.apache.maven.plugins, alpha order by artifact id -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changes-plugin</artifactId>
-				<version>${mavenChangesVersion}</version>
-				<configuration>
-					<xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
-					<columnNames>Fix
-						Version,Key,Component,Summary,Type,Resolution,Status</columnNames>
-					<!-- Sort cols in natural order when using JQL for JIRA 5.1 -->
-					<sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>
-					<resolutionIds>Fixed</resolutionIds>
-					<statusIds>Resolved,Closed</statusIds>
-					<!-- Don't include sub-task -->
-					<typeIds>Bug,New Feature,Task,Improvement,Wish,Test</typeIds>
-					<!-- For JIRA >= 5.1 -->
-					<useJql>true</useJql>
-					<!-- TODO: what's the meaning of these copy-paste variables? -->
-					<onlyCurrentVersion>${commons.changes.onlyCurrentVersion}</onlyCurrentVersion>
-					<maxEntries>${commons.changes.maxEntries}</maxEntries>
-					<runOnlyAtExecutionRoot>
-						${commons.changes.runOnlyAtExecutionRoot}</runOnlyAtExecutionRoot>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>changes-report</report>
-							<report>jira-report</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${mavenJavadocPluginVersion}</version>
-				<configuration>
-					<tags>
-						<tag>
-							<name>TODO</name>
-							<placement>X</placement>
-							<head>To do:</head>
-						</tag>
-					</tags>
-					<notimestamp>true</notimestamp>
-					<doclint>none</doclint>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<id>non-aggregate</id>
-						<configuration>
-						</configuration>
-						<reports>
-							<report>javadoc</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>aggregate</id>
-						<configuration>
-						</configuration>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>3.3.0</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>jxr-no-fork</report>
-							<report>test-jxr-no-fork</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>${mavenPmdPluginVersion}</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>pmd</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>3.4.3</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>dependencies</report>
-							<report>team</report>
-							<report>mailing-lists</report>
-							<report>issue-management</report>
-							<report>ci-management</report>
-							<!-- Do not enable the license report;
+    <plugins>
+      <!-- org.apache.maven.plugins, alpha order by artifact id -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changes-plugin</artifactId>
+        <version>${mavenChangesVersion}</version>
+        <configuration>
+          <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
+          <columnNames>Fix Version,Key,Component,Summary,Type,Resolution,Status</columnNames>
+          <!-- Sort cols in natural order when using JQL for JIRA 5.1 -->
+          <sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>
+          <resolutionIds>Fixed</resolutionIds>
+          <statusIds>Resolved,Closed</statusIds>
+          <!-- Don't include sub-task -->
+          <typeIds>Bug,New Feature,Task,Improvement,Wish,Test</typeIds>
+          <!-- For JIRA >= 5.1 -->
+          <useJql>true</useJql>
+          <!-- TODO: what's the meaning of these copy-paste variables? -->
+          <onlyCurrentVersion>${commons.changes.onlyCurrentVersion}</onlyCurrentVersion>
+          <maxEntries>${commons.changes.maxEntries}</maxEntries>
+          <runOnlyAtExecutionRoot>${commons.changes.runOnlyAtExecutionRoot}</runOnlyAtExecutionRoot>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+              <report>jira-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${mavenJavadocPluginVersion}</version>
+        <configuration>
+          <tags>
+            <tag>
+              <name>TODO</name>
+              <placement>X</placement>
+              <head>To do:</head>
+            </tag>
+          </tags>
+          <notimestamp>true</notimestamp>
+          <doclint>none</doclint>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <id>non-aggregate</id>
+            <configuration>
+            </configuration>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+          <reportSet>
+            <id>aggregate</id>
+            <configuration>
+            </configuration>
+            <reports>
+              <report>aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>3.3.0</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>jxr-no-fork</report>
+              <report>test-jxr-no-fork</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>${mavenPmdPluginVersion}</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>pmd</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>3.4.3</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>dependencies</report>
+              <report>team</report>
+              <report>mailing-lists</report>
+              <report>issue-management</report>
+              <report>ci-management</report>
+              <!-- Do not enable the license report;
                    license links must only point to
                    http://www.apache.org/licenses/
               <report>license</report>
               -->
-							<report>scm</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
-	<build>
-		<defaultGoal>clean install</defaultGoal>
-		<pluginManagement>
-			<!--
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+  <build>
+    <defaultGoal>clean install</defaultGoal>
+    <pluginManagement>
+      <!--
         This section is typically used to configure the versions of
         plugins that we use. Note, that we are inheriting from the
         parent POM, so we only have to configure version numbers,
         if ours is different.
       -->
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>3.1.0</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.ant</groupId>
-							<artifactId>ant</artifactId>
-							<version>${ant.version}</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.11.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>${mavenJavadocPluginVersion}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.6.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-invoker-plugin</artifactId>
-					<version>3.5.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-pmd-plugin</artifactId>
-					<version>${mavenPmdPluginVersion}</version>
-					<configuration>
-						<targetJdk>${javaVersion}</targetJdk>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-plugin-plugin</artifactId>
-					<version>${mavenPluginPluginVersion}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.12.1</version>
-					<configuration>
-						<relativizeDecorationLinks>false</relativizeDecorationLinks>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.rat</groupId>
-					<artifactId>apache-rat-plugin</artifactId>
-					<!-- Do not use property values here as this causes problems
-					during release -->
-					<version>0.15</version>
-					<configuration>
-						<excludes>
-							<exclude>.asf.yaml</exclude>
-							<exclude>BUILD.txt</exclude>
-							<!-- rat:check does not seem to use exclusions from
-							modules -->
-							<exclude>apache-rat/README*.txt</exclude>
-							<exclude>apache-rat-core/src/test/resources/**</exclude>
-							<exclude>apache-rat*/target/**</exclude>
-							<exclude>apache-rat-plugin/src/test/resources/**</exclude>
-							<exclude>apache-rat-plugin/src/it/**</exclude>
-							<exclude>apache-rat-tasks/src/test/resources/**</exclude>
-							<exclude>**/iso-8859-1.html</exclude>
-							<exclude>**/velocity.log</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-remote-resources-plugin</artifactId>
-					<version>3.1.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>3.0.0</version>
-					<configuration>
-						<!-- Only prompt once for the release version -->
-						<autoVersionSubmodules>true</autoVersionSubmodules>
-						<mavenExecutorId>forked-path</mavenExecutorId>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.3.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.1.0</version>
-					<configuration>
-						<forkCount>1</forkCount>
-						<argLine>-Dfile.encoding=ISO-8859-1</argLine>
-					</configuration>
-				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.rat</groupId>
-										<artifactId>
-											apache-rat-plugin
-										</artifactId>
-										<versionRange>[0.15,)</versionRange>
-										<goals>
-											<goal>check</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>pre-site</phase>
-						<id>copy-site-resources</id>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<copy file="RELEASE_NOTES.txt"
-									todir="${project.build.directory}/site/"
-									failonerror="false" />
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.3.0</version>
-				<executions>
-					<execution>
-						<!-- This checks the bytecode version of the
-						dependencies transitively -->
-						<id>enforce-bytecode-version</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<enforceBytecodeVersion>
-									<maxJdkVersion>${javaVersion}</maxJdkVersion>
-								</enforceBytecodeVersion>
-								<requireMavenVersion>
-									<version>3.0.5</version>
-								</requireMavenVersion>
-							</rules>
-							<fail>true</fail>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>extra-enforcer-rules</artifactId>
-						<version>1.7.0</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>animal-sniffer-maven-plugin</artifactId>
-				<version>1.23</version>
-				<executions>
-					<execution>
-						<!-- This checks the source code of our project -->
-						<!--
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>3.1.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.ant</groupId>
+              <artifactId>ant</artifactId>
+              <version>${ant.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.11.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${mavenJavadocPluginVersion}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.6.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>3.5.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>${mavenPmdPluginVersion}</version>
+          <configuration>
+            <targetJdk>${javaVersion}</targetJdk>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${mavenPluginPluginVersion}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.12.1</version>
+          <configuration>
+            <relativizeDecorationLinks>false</relativizeDecorationLinks>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <!-- Do not use property values here as this causes problems during release -->
+          <version>0.15</version>
+          <configuration>
+            <excludes>
+              <exclude>.asf.yaml</exclude>
+              <exclude>BUILD.txt</exclude>
+              <!-- rat:check does not seem to use exclusions from modules -->
+              <exclude>apache-rat/README*.txt</exclude>
+              <exclude>apache-rat-core/src/test/resources/**</exclude>
+              <exclude>apache-rat*/target/**</exclude>
+              <exclude>apache-rat-plugin/src/test/resources/**</exclude>
+              <exclude>apache-rat-plugin/src/it/**</exclude>
+              <exclude>apache-rat-tasks/src/test/resources/**</exclude>
+              <exclude>**/iso-8859-1.html</exclude>
+              <exclude>**/velocity.log</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>3.0.0</version>
+          <configuration>
+            <!-- Only prompt once for the release version -->
+            <autoVersionSubmodules>true</autoVersionSubmodules>
+            <mavenExecutorId>forked-path</mavenExecutorId>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.1.0</version>
+          <configuration>
+            <forkCount>1</forkCount>
+            <argLine>-Dfile.encoding=ISO-8859-1</argLine>
+          </configuration>
+        </plugin>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.rat</groupId>
+                    <artifactId>
+        							apache-rat-plugin
+        						</artifactId>
+                    <versionRange>[0.15,)</versionRange>
+                    <goals>
+                      <goal>check</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>pre-site</phase>
+            <id>copy-site-resources</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.3.0</version>
+        <executions>
+          <execution>
+            <!-- This checks the bytecode version of the dependencies transitively -->
+            <id>enforce-bytecode-version</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <enforceBytecodeVersion>
+                  <maxJdkVersion>${javaVersion}</maxJdkVersion>
+                </enforceBytecodeVersion>
+                <requireMavenVersion>
+                  <version>3.0.5</version>
+                </requireMavenVersion>
+              </rules>
+              <fail>true</fail>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>1.7.0</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <version>1.23</version>
+        <executions>
+          <execution>
+            <!-- This checks the source code of our project -->
+            <!--
               Note that this cannot use our ${javaVersion} property, so it must
               be changed manually when we decide to move to a higher version of
               Java
             -->
-						<id>check-java-1.8-compat</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<signature>
-								<groupId>org.codehaus.mojo.signature</groupId>
-								<artifactId>java18</artifactId>
-								<version>1.0</version>
-							</signature>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-ssh</artifactId>
-				<!-- Last version that is compatible with Maven 2 -->
-				<version>3.5.3</version>
-			</extension>
-		</extensions>
-	</build>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://issues.apache.org/jira/browse/RAT</url>
-	</issueManagement>
-	<ciManagement>
-		<system>Jenkins</system>
-		<url>https://ci-builds.apache.org/job/Creadur/job/Creadur-Rat/</url>
-	</ciManagement>
-	<mailingLists>
-		<mailingList>
-			<name>Rat Development (Apache Creadur project)</name>
-			<subscribe>dev-subscribe@creadur.apache.org</subscribe>
-			<unsubscribe>dev-unsubscribe@creadur.apache.org</unsubscribe>
-			<post>dev@creadur.apache.org</post>
-			<archive>https://mail-archives.apache.org/mod_mbox/creadur-dev/</archive>
-		</mailingList>
-		<mailingList>
-			<name>Rat Commits (Apache Creadur project)</name>
-			<subscribe>commits-subscribe@creadur.apache.org</subscribe>
-			<unsubscribe>commits-unsubscribe@creadur.apache.org</unsubscribe>
-			<archive>https://mail-archives.apache.org/mod_mbox/creadur-commits/</archive>
-		</mailingList>
-	</mailingLists>
-	<developers>
-		<developer>
-			<id>bodewig</id>
-			<name>Stefan Bodewig</name>
-			<email>bodewig@apache.org</email>
-		</developer>
-		<developer>
-			<id>rdonkin</id>
-			<name>Robert Burrell Donkin</name>
-			<email>rdonkin@apache.org</email>
-		</developer>
-		<developer>
-			<id>jochen</id>
-			<name>Jochen Wiedmann</name>
-			<email>jochen@apache.org</email>
-		</developer>
-		<developer>
-			<id>gmcdonald</id>
-			<name>Gavin</name>
-			<email>gmcdonald@apache.org</email>
-		</developer>
-		<developer>
-			<id>brianf</id>
-			<name>Brian Fox</name>
-			<email>brianf@apache.org</email>
-		</developer>
-		<developer>
-			<id>dennisl</id>
-			<name>Dennis Lundberg</name>
-			<email>dennisl@apache.org</email>
-		</developer>
-		<developer>
-			<id>rgardler</id>
-			<name>Ross Gardler</name>
-			<email>rgardler@apache.org</email>
-		</developer>
-		<developer>
-			<id>crossley</id>
-			<name>David Crossley</name>
-			<email>crossley@apache.org</email>
-		</developer>
-		<developer>
-			<id>dblevins</id>
-			<name>David Blevins</name>
-			<email>dblevins@apache.org</email>
-		</developer>
-		<developer>
-			<id>pottlinger</id>
-			<name>Philipp Ottlinger</name>
-			<email>pottlinger@apache.org</email>
-		</developer>
-	</developers>
-	<contributors>
-		<contributor>
-			<name>Jukka Zitting</name>
-			<email>jukka@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Todd Volkert</name>
-			<email>tvolkert+apache@gmail.com</email>
-		</contributor>
-		<contributor>
-			<name>Henri Yandell</name>
-			<email>bayard@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Guillaume Nodet</name>
-			<email>gnodet@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Karl Pauls</name>
-			<email>pauls@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Matthieu Riou</name>
-			<email>mriou@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Garrett Rooney</name>
-			<email>rooneg@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Paul Merlin</name>
-			<email>paulmerlin@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Claude Warren</name>
-			<email>claude@apache.org</email>
-		</contributor>
-	</contributors>
-	<scm>
-		<connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>
-		<developerConnection>
-			scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</developerConnection>
-		<url>https://gitbox.apache.org/repos/asf?p=creadur-rat.git</url>
-		<tag>HEAD</tag>
-	</scm>
-	<modules>
-		<module>apache-rat-api</module>
-		<module>apache-rat-core</module>
-		<module>apache-rat-plugin</module>
-		<module>apache-rat-tasks</module>
-		<module>apache-rat</module>
-	</modules>
-	<licenses>
-		<license>
-			<name>Apache License, Version 2</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-			<comments>An OSI approved open source license.</comments>
-		</license>
-	</licenses>
-	<organization>
-		<name>Apache Software Foundation</name>
-		<url>https://www.apache.org</url>
-	</organization>
-	<profiles>
-		<profile>
-			<id>maven.compiler.release</id>
-			<activation>
-				<jdk>[9,)</jdk>
-			</activation>
-			<properties>
-				<!--
+            <id>check-java-1.8-compat</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <signature>
+                <groupId>org.codehaus.mojo.signature</groupId>
+                <artifactId>java18</artifactId>
+                <version>1.0</version>
+              </signature>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <!-- Last version that is compatible with Maven 2 -->
+        <version>3.5.3</version>
+      </extension>
+    </extensions>
+  </build>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.apache.org/jira/browse/RAT</url>
+  </issueManagement>
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://ci-builds.apache.org/job/Creadur/job/Creadur-Rat/</url>
+  </ciManagement>
+  <mailingLists>
+    <mailingList>
+      <name>Rat Development (Apache Creadur project)</name>
+      <subscribe>dev-subscribe@creadur.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@creadur.apache.org</unsubscribe>
+      <post>dev@creadur.apache.org</post>
+      <archive>https://mail-archives.apache.org/mod_mbox/creadur-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Rat Commits (Apache Creadur project)</name>
+      <subscribe>commits-subscribe@creadur.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@creadur.apache.org</unsubscribe>
+      <archive>https://mail-archives.apache.org/mod_mbox/creadur-commits/</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>bodewig</id>
+      <name>Stefan Bodewig</name>
+      <email>bodewig@apache.org</email>
+    </developer>
+    <developer>
+      <id>rdonkin</id>
+      <name>Robert Burrell Donkin</name>
+      <email>rdonkin@apache.org</email>
+    </developer>
+    <developer>
+      <id>jochen</id>
+      <name>Jochen Wiedmann</name>
+      <email>jochen@apache.org</email>
+    </developer>
+    <developer>
+      <id>gmcdonald</id>
+      <name>Gavin</name>
+      <email>gmcdonald@apache.org</email>
+    </developer>
+    <developer>
+      <id>brianf</id>
+      <name>Brian Fox</name>
+      <email>brianf@apache.org</email>
+    </developer>
+    <developer>
+      <id>dennisl</id>
+      <name>Dennis Lundberg</name>
+      <email>dennisl@apache.org</email>
+    </developer>
+    <developer>
+      <id>rgardler</id>
+      <name>Ross Gardler</name>
+      <email>rgardler@apache.org</email>
+    </developer>
+    <developer>
+      <id>crossley</id>
+      <name>David Crossley</name>
+      <email>crossley@apache.org</email>
+    </developer>
+    <developer>
+      <id>dblevins</id>
+      <name>David Blevins</name>
+      <email>dblevins@apache.org</email>
+    </developer>
+    <developer>
+      <id>pottlinger</id>
+      <name>Philipp Ottlinger</name>
+      <email>pottlinger@apache.org</email>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Jukka Zitting</name>
+      <email>jukka@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Todd Volkert</name>
+      <email>tvolkert+apache@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Henri Yandell</name>
+      <email>bayard@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Guillaume Nodet</name>
+      <email>gnodet@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Karl Pauls</name>
+      <email>pauls@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Matthieu Riou</name>
+      <email>mriou@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Garrett Rooney</name>
+      <email>rooneg@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Paul Merlin</name>
+      <email>paulmerlin@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Claude Warren</name>
+      <email>claude@apache.org</email>
+    </contributor>
+  </contributors>
+  <scm>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf?p=creadur-rat.git</url>
+    <tag>HEAD</tag>
+  </scm>
+  <modules>
+    <module>apache-rat-api</module>
+    <module>apache-rat-core</module>
+    <module>apache-rat-plugin</module>
+    <module>apache-rat-tasks</module>
+    <module>apache-rat</module>
+  </modules>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+      <comments>An OSI approved open source license.</comments>
+    </license>
+  </licenses>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>https://www.apache.org</url>
+  </organization>
+  <profiles>
+    <profile>
+      <id>maven.compiler.release</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <!--
           Note that this cannot use our ${javaVersion} property, so it must
           be changed manually when we decide to move to a higher version of
           Java
         -->
-				<maven.compiler.release>8</maven.compiler.release>
-			</properties>
-		</profile>
-		<profile>
-			<id>apache-release</id>
-			<build>
-				<plugins>
-					<!-- Skip the source-release artifact here; we create it
-					under the CLI module -->
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>source-release-assembly</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<skipAssembly>true</skipAssembly>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<!--
+        <maven.compiler.release>8</maven.compiler.release>
+      </properties>
+    </profile>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <!-- Skip the source-release artifact here; we create it under the CLI module -->
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <skipAssembly>true</skipAssembly>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <!--
           Generate release notes in top-level directory from src/changes/changes.xml
           Usage:
           mvn changes:announcement-generate -Prelease-notes [-Dchanges.version=nnn]
 
-          Defining changes.version allows one to create the RN without first removing the
-			SNAPSHOT suffix.
+          Defining changes.version allows one to create the RN without first removing the SNAPSHOT suffix.
 
           Requires file src/changes/release-notes.vm.
        -->
-			<id>release-notes</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-changes-plugin</artifactId>
-						<version>${mavenChangesVersion}</version>
-						<configuration>
-							<template>release-notes.vm</template>
-							<templateDirectory>src/changes</templateDirectory>
-							<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-							<announcementDirectory>.</announcementDirectory>
-							<announcementFile>RELEASE-NOTES.txt</announcementFile>
-							<announceParameters>
-								<releaseVersion>${mavenChangesVersion}</releaseVersion>
-							</announceParameters>
-						</configuration>
-						<executions>
-							<execution>
-								<id>create-release-notes</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>announcement-generate</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	<!-- in order to test new releases this reference can be activated
-	locally-->
-	<pluginRepositories>
-		<pluginRepository>
-			<id>staged-releases-rat-015</id>
-			<url>
-				https://repository.apache.org/content/repositories/orgapachecreadur-1008/</url>
-		</pluginRepository>
-	</pluginRepositories>
+      <id>release-notes</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-changes-plugin</artifactId>
+            <version>${mavenChangesVersion}</version>
+            <configuration>
+              <template>release-notes.vm</template>
+              <templateDirectory>src/changes</templateDirectory>
+              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+              <announcementDirectory>.</announcementDirectory>
+              <announcementFile>RELEASE-NOTES.txt</announcementFile>
+              <announceParameters>
+                <releaseVersion>${mavenChangesVersion}</releaseVersion>
+              </announceParameters>
+            </configuration>
+            <executions>
+              <execution>
+                <id>create-release-notes</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>announcement-generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <!-- in order to test new releases this reference can be activated locally-->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>staged-releases-rat-015</id>
+      <url>https://repository.apache.org/content/repositories/orgapachecreadur-1008/</url>
+    </pluginRepository>
+  </pluginRepositories>
 </project>

From 52cfb7a6fec31edc582a2ddb169a93006cd05868 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 12:29:54 +0200
Subject: [PATCH 115/299] Added javadoc

---
 .../apache/rat/ConfigurationException.java    |   5 +
 .../main/java/org/apache/rat/Defaults.java    |  85 +++++--
 .../src/main/java/org/apache/rat/Report.java  | 230 ++++++++++--------
 .../org/apache/rat/ReportConfiguration.java   | 178 ++++++++------
 .../main/java/org/apache/rat/Reporter.java    |  53 +---
 .../resources/org/apache/rat/default.config   | 113 ---------
 .../apache/rat/ReportConfigurationTest.java   |  11 -
 7 files changed, 312 insertions(+), 363 deletions(-)
 delete mode 100644 apache-rat-core/src/main/resources/org/apache/rat/default.config

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
index 01e27d1ee..c635d245e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ConfigurationException.java
@@ -18,8 +18,13 @@
  */
 package org.apache.rat;
 
+/**
+ * An exception thrown when there is an issue with the Configuration.
+ */
 public class ConfigurationException extends RuntimeException {
 
+    private static final long serialVersionUID = 7257245932787579431L;
+
     public ConfigurationException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index ad39b5a26..c5ead2beb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -25,35 +25,47 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.function.Supplier;
 
-import org.apache.rat.configuration.Format;
 import org.apache.commons.io.function.IOSupplier;
+import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.MatcherReader;
-import org.apache.rat.configuration.MatcherBuilderTracker;
-import org.apache.rat.configuration.builders.AbstractBuilder;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
 /**
- * Utility class that holds constants shared by the CLI tool and the Ant tasks.
+ * A class that holds the list of licenses and approved licences from one or more Configuration file.
  */
 public class Defaults {
 
+    /**
+     * The default configuration file from the package.
+     */
     private static final URL DEFAULT_CONFIG_URL = Defaults.class.getResource("/org/apache/rat/default.xml");
+    /**
+     * The default XSLT stylesheet to produce a text output file.
+     */
     public static final String PLAIN_STYLESHEET = "org/apache/rat/plain-rat.xsl";
+    /**
+     * The default XSLT stylesheet to produce a list of unapproved licenses.
+     */
     public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
 
+    /**
+     * The set of defined licenses.
+     */
     private final SortedSet<ILicense> licenses;
+    /**
+     * The set of approved license ids.
+     */
     private final SortedSet<String> approvedLicenseIds;
-    
+
+    /**
+     * Initialize the system configuration reader..
+     */
     public static void init() {
         Format fmt = Format.fromURL(DEFAULT_CONFIG_URL);
         MatcherReader mReader = fmt.matcherReader();
@@ -69,15 +81,26 @@ private Defaults() {
         approvedLicenseIds = new TreeSet<>();
     }
 
+    /**
+     * Gets a builder for a Defaults object.
+     * @return the Builder.
+     */
     public static Builder builder() {
         return new Builder();
     }
 
+    /**
+     * Clears all licenses and approved licenses.
+     */
     public void clear() {
         licenses.clear();
         approvedLicenseIds.clear();
     }
 
+    /**
+     * Reads the configuration files.
+     * @param urls the URLS to read.
+     */
     private void readConfigFiles(Collection<URL> urls) {
         for (URL url : urls) {
             Format fmt = Format.fromURL(url);
@@ -96,18 +119,34 @@ private void readConfigFiles(Collection<URL> urls) {
         }
     }
 
+    /**
+     * Gets a supplier for the "plain" text styleseet.
+     * @return an IOSupplier for the plain text stylesheet.
+     */
     public static IOSupplier<InputStream> getPlainStyleSheet() {
-        return ()->Defaults.class.getClassLoader().getResourceAsStream(Defaults.PLAIN_STYLESHEET);
+        return () -> Defaults.class.getClassLoader().getResourceAsStream(Defaults.PLAIN_STYLESHEET);
     }
 
+    /**
+     * Gets a supplier for the unapproved licences list stylesheet
+     * @return an IOSupplier for the unapproved licenses list stylesheet.
+     */
     public static IOSupplier<InputStream> getUnapprovedLicensesStyleSheet() {
-        return ()->Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
+        return () -> Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
     }
 
+    /**
+     * @return the sorted set of defined licenses.
+     */
     public SortedSet<ILicense> getLicenses() {
         return Collections.unmodifiableSortedSet(licenses);
     }
 
+    /**
+     * Gets the sorted set of approved license ids.
+     * If not licenses have been explicitly listed as approved all licenses are assumed to be approved.
+     * @return The sorted set of approved licenseIds.
+     */
     public SortedSet<String> getLicenseIds() {
         if (approvedLicenseIds.isEmpty()) {
             SortedSet<String> result = new TreeSet<>();
@@ -117,6 +156,9 @@ public SortedSet<String> getLicenseIds() {
         return Collections.unmodifiableSortedSet(approvedLicenseIds);
     }
 
+    /**
+     * The Defaults builder.
+     */
     public static class Builder {
         private Set<URL> fileNames = new TreeSet<>(new Comparator<URL>() {
 
@@ -131,8 +173,7 @@ private Builder() {
         }
 
         /**
-         * Adds a URL defining the Licenses and which are appoved to the list of files
-         * to read.
+         * Adds a URL to a configuration file to be read.
          * 
          * @param url the URL to add
          * @return this Builder for chaining
@@ -143,10 +184,9 @@ public Builder add(URL url) {
         }
 
         /**
-         * Adds a File defining the Licenses and which are appoved to the list of files
-         * to read.
+         * Adds the name of a configuration file to be read.
          * 
-         * @param fileName the name of the file to add
+         * @param fileName the name of the file to add.
          * @return this Builder for chaining
          */
         public Builder add(String fileName) throws MalformedURLException {
@@ -154,10 +194,9 @@ public Builder add(String fileName) throws MalformedURLException {
         }
 
         /**
-         * Adds a file defining the Licenses and which are appoved to the list of files
-         * to read.
+         * Adds a configuration file to be read.
          * 
-         * @param file the File to add
+         * @param file the File to add.
          * @return this Builder for chaining
          */
         public Builder add(File file) throws MalformedURLException {
@@ -165,7 +204,7 @@ public Builder add(File file) throws MalformedURLException {
         }
 
         /**
-         * Removes a file from the list of files to process.
+         * Removes a file from the list of configuration files to process.
          * 
          * @param url the URL of the file to remove.
          * @return this Builder for chaining
@@ -176,7 +215,7 @@ public Builder remove(URL url) {
         }
 
         /**
-         * Removes a file from the list of files to process.
+         * Removes a file name from the list of configuration files to process.
          * 
          * @param fileName the fileName of the file to remove.
          * @return this Builder for chaining
@@ -186,7 +225,7 @@ public Builder remove(String fileName) throws MalformedURLException {
         }
 
         /**
-         * Removes a file from the list of files to process.
+         * Removes a file from the list of configuration files to process.
          * 
          * @param file the File of the file to remove.
          * @return this Builder for chaining
@@ -196,7 +235,7 @@ public Builder remove(File file) throws MalformedURLException {
         }
 
         /**
-         * Removes the default definitions.
+         * Removes the default definitions from the list of files to process.
          * 
          * @return this Builder for chaining
          */
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 428000118..680649030 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -20,7 +20,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -55,12 +54,15 @@
 import org.apache.rat.walker.ArchiveWalker;
 import org.apache.rat.walker.DirectoryWalker;
 
+/**
+ * The CLI based configuration object for report generation.
+ */
 public class Report {
     /**
      * Adds license headers to files missing headers.
      */
     private static final String ADD = "A";
-    private static final String ADD_OLD="a";
+    private static final String ADD_OLD = "a";
     /**
      * Forces changes to be written to new files.
      */
@@ -74,7 +76,8 @@ public class Report {
      */
     private static final String EXCLUDE_CLI = "e";
     /**
-     * Name of file that contains a list of files to exclude from report consideration.
+     * Name of file that contains a list of files to exclude from report
+     * consideration.
      */
     private static final String EXCLUDE_FILE_CLI = "E";
     /**
@@ -93,7 +96,6 @@ public class Report {
      * Do not use the default files.
      */
     private static final String NO_DEFAULTS = "no-default-licenses";
-    private static final String ALL_DEFAULT_LICENSES = "all-default-licenses";
     /**
      * List the licenses that were used for the run.
      */
@@ -102,108 +104,116 @@ public class Report {
      * List the approved families for the run.
      */
     private static final String LIST_LICENSE_FAMILIES = "list-approved-families";
-    
+
     /**
      * Set unstyled XML output
      */
-    private static final String XML="x";
-    
+    private static final String XML = "x";
+
     /*
      * Format used for listing license families
      */
     private static final String LICENSE_FAMILY_FORMAT = "\t%s: %s\n";
-    
+
     /**
      * Format used for listing licenses.
      */
     private static final String LICENSE_FORMAT = "%s:\t%s\n\t\t%s\n";
 
+    /**
+     * Processes the command line and builds a configuration and executes the report.
+     * @param args the arguments.
+     * @throws Exception on error.
+     */
     public static final void main(String[] args) throws Exception {
         final ReportConfiguration configuration = new ReportConfiguration();
-            Options opts = buildOptions();
+        Options opts = buildOptions();
 
-            CommandLine cl = null;
-            try {
-                cl = new DefaultParser().parse(opts, args);
-            } catch (ParseException e) {
-                System.err.println(e.getMessage());
-                System.err.println("Please use the \"--help\" option to see a list of valid commands and options");
-                System.exit(1);
-                return; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE
-                        // for "cl"
-            }
-
-            if (cl.hasOption(HELP)) {
-                printUsage(opts);
-            }
+        CommandLine cl = null;
+        try {
+            cl = new DefaultParser().parse(opts, args);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            System.err.println("Please use the \"--help\" option to see a list of valid commands and options");
+            System.exit(1);
+            return; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE
+                    // for "cl"
+        }
 
-            args = cl.getArgs();
-            if (args == null || args.length != 1) {
-                printUsage(opts);
-            } else {
+        if (cl.hasOption(HELP)) {
+            printUsage(opts);
+        }
 
-                if (cl.hasOption('a') || cl.hasOption('A')) {
-                    configuration.setAddLicenseHeaders(cl.hasOption('f') ? 
-                        AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
-                    configuration.setCopyrightMessage(cl.getOptionValue("c"));
-                }
+        args = cl.getArgs();
+        if (args == null || args.length != 1) {
+            printUsage(opts);
+        } else {
 
-                if (cl.hasOption(EXCLUDE_CLI)) {
-                    String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
-                    if (excludes != null) {
-                        final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
-                        configuration.setInputFileFilter(filter);
-                    }
-                } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
-                    String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
-                    if (excludeFileName != null) {
-                        final FilenameFilter filter = parseExclusions(
-                                FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
-                        configuration.setInputFileFilter(filter);
-                    }
-                }
+            if (cl.hasOption('a') || cl.hasOption('A')) {
+                configuration
+                        .setAddLicenseHeaders(cl.hasOption('f') ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
+                configuration.setCopyrightMessage(cl.getOptionValue("c"));
+            }
 
-                if (cl.hasOption(NO_DEFAULTS)) {
-                    configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.none);
-                } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
-                    configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
-                } else {
-                    configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.approved);
+            if (cl.hasOption(EXCLUDE_CLI)) {
+                String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
+                if (excludes != null) {
+                    final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
+                    configuration.setInputFileFilter(filter);
                 }
-                if (cl.hasOption(XML)) {
-                    configuration.setStyleReport(false);
-                } else {
-                    configuration.setStyleReport(true);
-                    if (cl.hasOption(STYLESHEET_CLI)) {
-                        String[] style = cl.getOptionValues(STYLESHEET_CLI);
-                        if (style.length != 1) {
-                            System.err.println("please specify a single stylesheet");
-                            System.exit(1);
-                        }
-                        configuration.setStyleSheet(() -> new FileInputStream(style[0]));
-                    }
+            } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
+                String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
+                if (excludeFileName != null) {
+                    final FilenameFilter filter = parseExclusions(
+                            FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
+                    configuration.setInputFileFilter(filter);
                 }
+            }
 
-                Defaults.Builder defaultBuilder = Defaults.builder();
-                if (cl.hasOption(LICENSES)) {
-                    for (String fn : cl.getOptionValues(LICENSES)) {
-                        defaultBuilder.add(fn);
+//            if (cl.hasOption(NO_DEFAULTS)) {
+//                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.none);
+//            } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
+//                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
+//            } else {
+//                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.approved);
+//            }
+            if (cl.hasOption(XML)) {
+                configuration.setStyleReport(false);
+            } else {
+                configuration.setStyleReport(true);
+                if (cl.hasOption(STYLESHEET_CLI)) {
+                    String[] style = cl.getOptionValues(STYLESHEET_CLI);
+                    if (style.length != 1) {
+                        System.err.println("please specify a single stylesheet");
+                        System.exit(1);
                     }
+                    configuration.setStyleSheet(() -> new FileInputStream(style[0]));
                 }
-                Defaults defaults = defaultBuilder.build();
-                configuration.setFrom(defaults);;
-                configuration.setReportable(getDirectory(args[0], configuration));
-                configuration.validate(s -> System.err.println(s));
-                
-                if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-                    listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
-                }
-                if (cl.hasOption(LIST_LICENSES)) {
-                    listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
+            }
+
+            Defaults.Builder defaultBuilder = Defaults.builder();
+            if (cl.hasOption(NO_DEFAULTS)) {
+                defaultBuilder.noDefault();
+            }
+            if (cl.hasOption(LICENSES)) {
+                for (String fn : cl.getOptionValues(LICENSES)) {
+                    defaultBuilder.add(fn);
                 }
-                
-                Reporter.report(configuration);
             }
+            Defaults defaults = defaultBuilder.build();
+            configuration.setFrom(defaults);
+            configuration.setReportable(getDirectory(args[0], configuration));
+            configuration.validate(s -> System.err.println(s));
+
+            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
+                listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
+            }
+            if (cl.hasOption(LIST_LICENSES)) {
+                listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
+            }
+
+            Reporter.report(configuration);
+        }
     }
 
     private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, PrintStream out) {
@@ -220,6 +230,11 @@ private static void listLicenses(SortedSet<ILicense> licenses, PrintStream out)
         out.println();
     }
 
+    /**
+     * Creates a filename filter from patterns to exclude.
+     * @param excludes the list of patterns to exclude.
+     * @return the FilenameFilter tht excludes the patterns
+     */
     static FilenameFilter parseExclusions(List<String> excludes) {
         final OrFileFilter orFilter = new OrFileFilter();
         int ignoredLines = 0;
@@ -251,13 +266,10 @@ private static Options buildOptions() {
         Option help = new Option(HELP, "help", false, "Print help for the RAT command line interface and exit");
         opts.addOption(help);
 
-        OptionGroup defaultHandling = new OptionGroup();
-        String defaultHandlingText=" By default all approved default licenses are used";
-        Option noDefaults = new Option(null, NO_DEFAULTS, false, "Ignore default configuration."+defaultHandlingText);
-        Option allDefaults = new Option(null, ALL_DEFAULT_LICENSES, false, "Approve all default licenses"+defaultHandlingText);
-        defaultHandling.addOption(noDefaults);
-        defaultHandling.addOption(allDefaults);
-        
+        String defaultHandlingText = " By default all approved default licenses are used";
+        Option noDefaults = new Option(null, NO_DEFAULTS, false, "Ignore default configuration." + defaultHandlingText);
+        opts.addOption(noDefaults);
+
         opts.addOption(null, LICENSES, true, "File names or URLs for license definitions");
         opts.addOption(null, LIST_LICENSES, false, "List all active licenses");
         opts.addOption(null, LIST_LICENSE_FAMILIES, false, "List all defined license families");
@@ -331,28 +343,34 @@ private Report() {
         // do not instantiate
     }
 
-    public static IReportable getDirectory(String baseDirectory, ReportConfiguration config) {
+    /**
+     * Creates an IReporatble object from the directory name and ReportConfiguration object.
+     * @param baseDirectory the directory that contains the files to report on.
+     * @param config the ReportConfiguration.
+     * @return the IReportale instance containing the files.
+     */
+    private static IReportable getDirectory(String baseDirectory, ReportConfiguration config) {
         try (PrintStream out = new PrintStream(config.getOutput().get())) {
-        File base = new File(baseDirectory);
-        if (!base.exists()) {
-            out.print("ERROR: ");
-            out.print(baseDirectory);
-            out.print(" does not exist.\n");
-            return null;
-        }
+            File base = new File(baseDirectory);
+            if (!base.exists()) {
+                out.print("ERROR: ");
+                out.print(baseDirectory);
+                out.print(" does not exist.\n");
+                return null;
+            }
 
-        if (base.isDirectory()) {
-            return new DirectoryWalker(base, config.getInputFileFilter());
-        }
+            if (base.isDirectory()) {
+                return new DirectoryWalker(base, config.getInputFileFilter());
+            }
 
-        try {
-            return new ArchiveWalker(base, config.getInputFileFilter());
-        } catch (IOException ex) {
-            out.print("ERROR: ");
-            out.print(baseDirectory);
-            out.print(" is not valid gzip data.\n");
-            return null;
-        }
+            try {
+                return new ArchiveWalker(base, config.getInputFileFilter());
+            } catch (IOException ex) {
+                out.print("ERROR: ");
+                out.print(baseDirectory);
+                out.print(" is not valid gzip data.\n");
+                return null;
+            }
         } catch (IOException e) {
             throw new ConfigurationException("Error opening output", e);
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index edc5277ec..394903530 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -26,8 +26,6 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Collections;
@@ -35,29 +33,31 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
 
 import org.apache.commons.io.function.IOSupplier;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
-import org.apache.rat.policy.DefaultPolicy;
 import org.apache.rat.report.IReportable;
 
 /**
  * A configuration object is used by the front end to invoke the
- * {@link Reporter}. Basically, the sole purpose of the front ends is to create
- * the configuration and invoke the {@link Reporter}.
+ * {@link Reporter}. The sole purpose of the front ends is to create the
+ * configuration and invoke the {@link Reporter}.
  */
 public class ReportConfiguration {
+    /**
+     * An enum that defines the types of License filters.
+     */
     public enum LicenseFilter {
-        all, approved, none
+        /** All defined licenses are returned */
+        all,
+        /** Only approved licenses are returned */
+        approved,
+        /** No licenses are returned */
+        none
     }
 
-    private static final Log logger = LogFactory.getLog(ReportConfiguration.class);
     private SortedSet<ILicense> licenses = new TreeSet<>(ILicense.getComparator());
     private SortedSet<String> approvedLicenseCategories = new TreeSet<>();
     private SortedSet<String> removedLicenseCategories = new TreeSet<>();
@@ -69,7 +69,7 @@ public enum LicenseFilter {
     private IOSupplier<InputStream> styleSheet = null;
     private IReportable reportable = null;
     private FilenameFilter inputFileFilter = null;
-    private LicenseFilter approvalFilter = LicenseFilter.approved;
+    // private LicenseFilter approvalFilter = LicenseFilter.approved;
 
     /**
      * @return The filename filter for the potential input files.
@@ -79,8 +79,7 @@ public FilenameFilter getInputFileFilter() {
     }
 
     /**
-     * @param inputFileFilter the filter to filter the on disk files being
-     * evaluated.
+     * @param inputFileFilter the filename filter to filter the input files.
      */
     public void setInputFileFilter(FilenameFilter inputFileFilter) {
         this.inputFileFilter = inputFileFilter;
@@ -108,13 +107,19 @@ public IOSupplier<InputStream> getStyleSheet() {
     }
 
     /**
-     * 
      * @param styleSheet the XSLT style sheet to style the report with.
      */
     public void setStyleSheet(IOSupplier<InputStream> styleSheet) {
         this.styleSheet = styleSheet;
     }
 
+    /**
+     * Adds the licenses and approved licenses from the defaults object to the
+     * configuration. <em>Side effect: </em> if the report should be styled and no
+     * style sheet has been set the plain stylesheet from the defaults will be used.
+     * 
+     * @param defaults The defaults to set.
+     */
     public void setFrom(Defaults defaults) {
         addLicenses(defaults.getLicenses());
         addApprovedLicenseCategories(defaults.getLicenseIds());
@@ -130,58 +135,65 @@ public void setFrom(Defaults defaults) {
      */
     public void setStyleSheet(File styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
-        setStyleSheet(()->styleSheet.toURI().toURL().openStream());
+        setStyleSheet(() -> styleSheet.toURI().toURL().openStream());
     }
 
     /**
-     * 
-     * @return True if the XML report should be styled.
+     * @return {@code true} if the XML report should be styled.
      */
     public boolean isStyleReport() {
         return styleReport;
     }
 
     /**
-     * 
-     * @param styleReport true if the XML report should be styled
+     * @param styleReport specifies whether or not the XML report should be styled.
      */
     public void setStyleReport(boolean styleReport) {
         this.styleReport = styleReport;
     }
 
     /**
-     * @param out The stream to write the output to.
+     * @param out The OutputStream supplier that provides the output stream to write
+     * the report to. (may be null)
      */
     public void setOut(IOSupplier<OutputStream> out) {
         this.out = out;
     }
-    
+
+    /**
+     * Sets the OutputStream supplier to use the specified file.
+     * 
+     * @see #setOut(IOSupplier)
+     * @param file The file to create the supplier with.
+     */
     public void setOut(File file) {
         Objects.requireNonNull(file, "output file should not be null");
         setOut(() -> new FileOutputStream(file));
     }
 
     /**
-     * Returns the output stream. If no stream has been set returns System.out.
+     * Returns the output stream supplier. If no stream has been set returns a
+     * supplier for System.out.
      * 
-     * @return The output stream to write to.
+     * @return The supplier of the output stream to write the report to.
      */
     public IOSupplier<OutputStream> getOutput() {
-        return out == null ? ()->System.out : out;
+        return out == null ? () -> System.out : out;
     }
 
     /**
-     * 
-     * @return A PrintWriter that wraps the output stream.
+     * @return A supplier for a PrintWriter that wraps the output stream.
+     * @see #getOutput()
      */
     public IOSupplier<PrintWriter> getWriter() {
         return () -> new PrintWriter(new OutputStreamWriter(getOutput().get(), Charset.forName("UTF-8")));
     }
 
     /**
-     * Adds licenses to the list of licenses to be checked.
-     *
-     * @param license The license t oadd.
+     * Adds a license to the list of licenses. Does not add the license to the list
+     * of approved licenses.
+     * 
+     * @param license The license to add to the list of licenses.
      */
     public void addLicense(ILicense license) {
         if (license != null) {
@@ -190,7 +202,8 @@ public void addLicense(ILicense license) {
     }
 
     /**
-     * Adds licenses to the list of licenses to be checked.
+     * Adds multiple licenses to the list of licenses. Does not add the licenses to
+     * the list of approved licenses.
      *
      * @param license The license t oadd.
      */
@@ -199,43 +212,71 @@ public void addLicenses(Collection<ILicense> licenses) {
     }
 
     /**
-     * Adds a license to the list of approved license names.
+     * Adds an ILicenseFamily to the list of approved licenses.
      *
-     * @param approvedLicenseNames set of approved license names.
+     * @param approvedILicenseFamily the LicenseFamily to add..
      */
-    public void addApprovedLicenseCategory(ILicenseFamily approvedLicenseName) {
-        approvedLicenseCategories.add(approvedLicenseName.getFamilyCategory());
+    public void addApprovedLicenseCategory(ILicenseFamily approvedILicenseFamily) {
+        approvedLicenseCategories.add(approvedILicenseFamily.getFamilyCategory());
     }
 
+    /**
+     * Adds a license family category (id) to the list of approved licenses
+     * 
+     * @param familyCategory the category to add.
+     */
     public void addApprovedLicenseCategory(String familyCategory) {
         approvedLicenseCategories.add(ILicenseFamily.makeCategory(familyCategory));
     }
 
     /**
-     * Adds to the set of approved license names (convenience).
+     * Adds a collection of license family categories to the set of approved license
+     * names.
      *
-     * @param approvedLicenseNames set of approved license names.
+     * @param approvedLicenseCategories set of approved license categories..
      */
-    public void addApprovedLicenseCategories(Collection<String> approvedLicenseNames) {
-        approvedLicenseNames.stream().forEach(this::addApprovedLicenseCategory);
+    public void addApprovedLicenseCategories(Collection<String> approvedLicenseCategories) {
+        approvedLicenseCategories.stream().forEach(this::addApprovedLicenseCategory);
     }
 
+    /**
+     * Adds a license family category to the list of approved licenses. <em>Once a
+     * license has been removed from the approved list it can not be re-added</em>
+     * 
+     * @param familyCategory the category to add.
+     */
     public void removeApprovedLicenseCategory(String familyCategory) {
         removedLicenseCategories.add(ILicenseFamily.makeCategory(familyCategory));
     }
 
+    /**
+     * Removes a license family category from the list of approved licenses.
+     * <em>Once a license has been removed from the approved list it can not be
+     * re-added</em>
+     * 
+     * @param familyCategory the family category to remove.
+     */
     public void removeApprovedLicenseCategories(Collection<String> familyCategory) {
         familyCategory.stream().forEach(this::removeApprovedLicenseCategory);
     }
-    
+
+    /**
+     * Gets the SortedSet of approved license categories. <em>Once a license has
+     * been removed from the approved list it can not be re-added</em>
+     * 
+     * @return the Sorted set of approved license categories.
+     */
     public SortedSet<String> getApprovedLicenseCategories() {
         SortedSet<String> result = new TreeSet<>(approvedLicenseCategories);
         result.removeAll(removedLicenseCategories);
         return result;
     }
+
     /**
-     * @return If Rat is adding license headers: Returns the optional copyright
-     * message. This value is ignored, if no license headers are added.
+     * Returns the optional license copyright being added if RAT is adding headers.
+     * This value is ignored, if no license headers are added.
+     * 
+     * @return the optional copyright message.
      * @see #isAddingLicenses()
      */
     public String getCopyrightMessage() {
@@ -243,8 +284,8 @@ public String getCopyrightMessage() {
     }
 
     /**
-     * If Rat is adding license headers: Sets the optional copyright message. This
-     * value is ignored, if no license headers are added.
+     * Sets the optional copyright message used if RAT is adding license headers.
+     * This value is ignored, if no license headers are added.
      *
      * @param copyrightMessage message to set.
      * @see #setAddingLicenses(boolean)
@@ -254,8 +295,9 @@ public void setCopyrightMessage(String copyrightMessage) {
     }
 
     /**
-     * @return If Rat is adding license headers: Returns, whether adding license
-     * headers is enforced. This value is ignored, if no license headers are added.
+     * This value is ignored if RAT is not adding licenses.
+     * 
+     * @return {@code true} if RAT is forcing the adding license headers.
      * @see #isAddingLicenses()
      */
     public boolean isAddingLicensesForced() {
@@ -263,7 +305,7 @@ public boolean isAddingLicensesForced() {
     }
 
     /**
-     * @return Returns, whether Rat should add missing license headers.
+     * @return whether RAT should add missing license headers.
      * @see #isAddingLicensesForced()
      * @see #getCopyrightMessage()
      */
@@ -272,9 +314,11 @@ public boolean isAddingLicenses() {
     }
 
     /**
-     * Returns, whether Rat should add missing license headers.
-     *
-     * @param addingLicenses enables/disables adding of licenses.
+     * Sets whether RAT should enable, disable, or force the adidng of license
+     * headers.
+     * 
+     * @param addLicenseHeaders enables/disables or forces adding of licenses
+     * headers.
      * @see #setAddingLicensesForced(boolean)
      * @see #setCopyrightMessage(String)
      */
@@ -295,14 +339,14 @@ public void setAddLicenseHeaders(AddLicenseHeaders addLicenseHeaders) {
     }
 
     /**
-     * Returns a set Licenses of depending on the approvalFilter setting.
-     * if approvalFilter is set:
+     * Gets a set Licenses of depending on the {@code filter} if filter is set:
      * <ul>
      * <li>{@code all} - All licenses will be returned.</li>
-     * <li>{@code approved} - (default) All approved licenses will be returned</li>
+     * <li>{@code approved} - Only approved licenses will be returned</li>
      * <li>{@code none} - No licenses will be returned</li>
      * </ul>
      * 
+     * @param filter The license filter.
      * @return The set of defined licenses.
      */
     public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
@@ -321,30 +365,28 @@ public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
         }
     }
 
+    /**
+     * Gets a sorted set of ILicenseFamily objects based on {@code filter}. if
+     * filter is set:
+     * <ul>
+     * <li>{@code all} - All licenses families will be returned.</li>
+     * <li>{@code approved} - Only approved license families will be returned</li>
+     * <li>{@code none} - No license families will be returned</li>
+     * </ul>
+     * 
+     * @param filter The license filter.
+     * @return The set of defined licenses.
+     */
     public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
         SortedSet<ILicenseFamily> result = new TreeSet<>();
         getLicenses(filter).stream().map(ILicense::getLicenseFamily).forEach(result::add);
         return result;
     }
 
-    /**
-     * Set which files will be listed as approved.
-     * 
-     * @param filter the fileter type.
-     * @return this Builder for chaining
-     */
-    public void setLicenseFilter(LicenseFilter filter) {
-        approvalFilter = filter;
-    }
-
-    public LicenseFilter getLicenseFilter() {
-        return approvalFilter;
-    }
-    
     /**
      * Validates that the configuration is valid.
      * 
-     * @param logger the system to write warnings to.
+     * @param a String consumer to log warning messages to.
      */
     public void validate(Consumer<String> logger) {
         if (reportable == null) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index b804d4ed3..12ca39e49 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -18,23 +18,13 @@
  */
 package org.apache.rat;
 
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PipedReader;
 import java.io.PipedWriter;
 import java.io.PrintWriter;
 import java.io.Writer;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.io.filefilter.NameFileFilter;
-import org.apache.commons.io.filefilter.NotFileFilter;
-import org.apache.commons.io.filefilter.OrFileFilter;
-import org.apache.commons.io.filefilter.RegexFileFilter;
-import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.api.RatException;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
@@ -42,48 +32,27 @@
 import org.apache.rat.report.xml.writer.IXmlWriter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 
+/**
+ * Class the executes the report as defined in a ReportConfiguration.
+ */
 public class Reporter {
 
-    static FilenameFilter parseExclusions(List<String> excludes) {
-        final OrFileFilter orFilter = new OrFileFilter();
-        int ignoredLines = 0;
-        for (String exclude : excludes) {
-            try {
-                // skip comments
-                if (exclude.startsWith("#") || StringUtils.isEmpty(exclude)) {
-                    ignoredLines++;
-                    continue;
-                }
-
-                String exclusion = exclude.trim();
-                // interpret given patterns as regular expression, direct file names or
-                // wildcards to give users more choices to configure exclusions
-                orFilter.addFileFilter(new RegexFileFilter(exclusion));
-                orFilter.addFileFilter(new NameFileFilter(exclusion));
-                orFilter.addFileFilter(new WildcardFileFilter(exclusion));
-            } catch (PatternSyntaxException e) {
-                System.err.println("Will skip given exclusion '" + exclude + "' due to " + e);
-            }
-        }
-        System.err.println("Ignored " + ignoredLines + " lines in your exclusion files as comments or empty lines.");
-        return new NotFileFilter(orFilter);
-    }
-
     private Reporter() {
         // Do not instantiate
     }
 
     /**
-     * @param out - the output stream to receive the styled report
-     * @param configuration - current configuration options.
+     * Execut the report.
+     * 
+     * @param configuration The report configuration..
      * @return the currently collected numerical statistics.
      * @throws Exception in case of errors.
-     * @since Rat 0.8
      */
     public static ClaimStatistic report(ReportConfiguration configuration) throws Exception {
         if (configuration.getReportable() != null) {
             if (configuration.isStyleReport()) {
-                try (PipedReader reader = new PipedReader(); PipedWriter writer = new PipedWriter(reader);
+                try (PipedReader reader = new PipedReader();
+                        PipedWriter writer = new PipedWriter(reader);
                         InputStream style = configuration.getStyleSheet().get();
                         PrintWriter reportWriter = configuration.getWriter().get();) {
                     ReportTransformer transformer = new ReportTransformer(reportWriter, style, reader);
@@ -104,9 +73,9 @@ public static ClaimStatistic report(ReportConfiguration configuration) throws Ex
     }
 
     /**
-     * @param container the files or directories to report on
-     * @param out the writer to write the report to
-     * @param configuration current report configuration.
+     * Execute the report.
+     * @param coutputWriter the writer to send output to.
+     * @param configuration The report configuration..
      * @return the currently collected numerical statistics.
      * @throws IOException in case of I/O errors.
      * @throws RatException in case of internal errors.
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.config b/apache-rat-core/src/main/resources/org/apache/rat/default.config
deleted file mode 100644
index 849b9f7a0..000000000
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.config
+++ /dev/null
@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-family.GEN=Generated
-family.?????=Unknown
-family.AL=Apache License Version 2.0
-family.OASIS=OASIS Open License
-family.W3CD=W3C Document Copyright
-family.W3C=W3C Software Copyright
-family.GPL1=GNU General Public License, version 1
-family.GPL2=GNU General Public License, version 2
-family.GPL3=GNU General Public License, version 3
-family.MIT=The MIT License
-family.CDDL1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
-family.BSD_m=Modified BSD License
-
-
-/*
-   * license.id.family=famid
-         * license.id.notes=
-         * license.id.fullText=
-         * license.id.copyright=
-         * license.id.text=
-         * license.id.spdx=
-         */
-
-license.ASL2.family=AL
-license.ASL2.text.1=Licensed under the Apache License, Version 2.0 (the "License")
-license.ASL2.text.2=Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
-license.ASL2.text.http=http://www.apache.org/licenses/LICENSE-2.0
-license.ASL2.text.https=https://www.apache.org/licenses/LICENSE-2.0
-license.ASL2.text.html=http://www.apache.org/licenses/LICENSE-2.0.html
-license.ASL2.text.htmls=https://www.apache.org/licenses/LICENSE-2.0.html
-license.ASL2.text.txt=http://www.apache.org/licenses/LICENSE-2.0.txt
-license.ASL2.text.txts=https://www.apache.org/licenses/LICENSE-2.0.txt
-license.ASL2.spdx=Apache-2.0
-
-license.ASL_Applied.family=AL
-license.ASL_Applied.fullText=Licensed under the Apache License, Version 2.0 (the "License")\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an "AS IS" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n
-
-license.CDDL1.family=CDDL1
-license.CDDL1.fullText=The contents of this file are subject to the terms of the Common Development\nand Distribution License("CDDL") (the "License"). You may not use this file\nexcept in compliance with the License.\n\n
-license.CDDL1.spdx=CDDL-1.0
-
-license.CDDL1_ILLUMOS.family=CDDL1
-license.CDDL1_ILLUMOS.fullText=The contents of this file are subject to the terms of the\nCommon Development and Distribution License (the "License")\nYou may not use this file except in compliance with the License.\n
-
-license.DOJO.family=BSD_m
-license.DOJO.notes=Dual license AFL/BSD
-license.DOJO.text.dojo=http://dojotoolkit.org/community/licensing.shtml
-
-license.GEN.family=GEN
-license.GEN.notes=Generated text no license required
-license.GEN.text.1=generated by Cayenne
-license.GEN.text.2=Generated By:JJTree
-license.GEN.text.3=Generated By:JavaCC
-license.GEN.text.4=THIS FILE IS AUTOMATICALLY GENERATED
-license.GEN.text.5=NOTE: this file is autogenerated by XBeans
-license.GEN.text.6=This file was automatically generated by 
-license.GEN.text.7=# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-license.GEN.text.8=# Microsoft Developer Studio Generated NMAKE File
-license.GEN.text.9=# Microsoft Developer Studio Generated Build File
-license.GEN.text.10=Generated from configure.ac by autoheader
-license.GEN.text.11=generated automatically by aclocal
-license.GEN.text.12=build.xml generated by maven from project.xml
-license.GEN.text.13=This file was generated by
-license.GEN.text.14=This file has been automatically generated.
-license.GEN.text.15=Automatically generated - do not modify!
-license.GEN.text.16=Javadoc style sheet
-license.GEN.text.17=SOURCE FILE GENERATATED
-license.GEN.text.18=Generated by the Batik
-license.GEN.text.19=this file is autogenerated
-license.GEN.text.20=This class was autogenerated
-license.GEN.text.21=Generated by Maven
-license.GEN.text.22=Autogenerated by Thrift
-license.GEN.text.23=DO NOT EDIT THIS FILE - it is machine generated
-license.GEN.text.24=This class was generated by"};
-
-license.GPL1.family=GPL1
-license.GPL1.fullText=This program is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 1, or (at your option)\n any later version.
-license.GPL1.spdx=GPL-1.0-only
-
-license.GPL2.family=GPL2
-license.GPL2.fullText=This program is free software; you can redistribute it and/or\n modify it under the terms of the GNU General Public License\n as published by the Free Software Foundation; either version 2\n of the License, or (at your option) any later version.
-license.GPL2.spdx=GPL-2.0-only
-
-license.GPL3.family=GPL3
-license.GPL3.fullText=This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.
-license.GPL3.spdx=GPL-3.0-only
-
-license.JavaDoc.family=GEN
-license.JavaDoc.text.1=Generated by javadoc
-
-license.MIT.family=MIT
-license.MIT.fullText=Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-license.MIT.spdx=MIT
-
-license.OASIS.family=OASIS
-license.OASIS.notes=No modifications allowed
-license.OASIS.copyright=.*Copyright\s.*OASIS Open.*
-license.OASIS.fullText=This document and translations of it may be copied and furnished to others and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared copied published and distributed
-
-license.TMF.family=BSD_m
-license.TMF.notes=BSD
-license.TMF.text.copy=TMF854 Version 1.0 - Copyright TeleManagement Forum
-
-license.W3C.family=W3C
-license.W3C.spdx=W3C
-license.W3C.notes=Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.
-license.W3C.text.copy=http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-license.W3CD.family=W3CD
-license.W3CD.notes=Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.
-license.W3CD.text.copy=http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
-            
\ No newline at end of file
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index a992491d7..006698e9e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -176,17 +176,6 @@ public void licenseFamiliesTest() {
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
     }
 
-    @Test
-    public void testLicenseFilter() {
-        assertEquals(LicenseFilter.approved, underTest.getLicenseFilter());
-        underTest.setLicenseFilter(LicenseFilter.all);
-        assertEquals(LicenseFilter.all, underTest.getLicenseFilter());
-        underTest.setLicenseFilter(LicenseFilter.none);
-        assertEquals(LicenseFilter.none, underTest.getLicenseFilter());
-        underTest.setLicenseFilter(LicenseFilter.approved);
-        assertEquals(LicenseFilter.approved, underTest.getLicenseFilter());
-    }
-
     @Test
     public void licensesTest() {
         assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());

From 954772cdc350439c6f6a4e9d65c3def6b6515cc5 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 15:14:32 +0200
Subject: [PATCH 116/299] added javadoc

---
 .../src/main/java/org/apache/rat/Report.java  |   3 +-
 .../rat/analysis/DefaultAnalyserFactory.java  |  16 ++-
 .../rat/analysis/DocumentHeaderAnalyser.java  |  27 +++--
 .../rat/analysis/HeaderCheckWorker.java       |  50 +++++---
 .../apache/rat/analysis/IHeaderMatcher.java   |  61 ++++++++--
 .../rat/analysis/LicenseCollection.java       |  13 ++-
 .../rat/analysis/license/BaseLicense.java     | 107 ------------------
 .../matchers/AbstractHeaderMatcher.java       |  10 +-
 .../matchers/AbstractMatcherContainer.java    |  22 +++-
 .../matchers/AbstractSimpleMatcher.java       |  17 ++-
 .../rat/analysis/matchers/AndMatcher.java     |  12 ++
 .../analysis/matchers/CopyrightMatcher.java   |  28 +++--
 .../analysis/matchers/FullTextMatcher.java    |  18 +--
 .../rat/analysis/matchers/NotMatcher.java     |  16 ++-
 .../rat/analysis/matchers/OrMatcher.java      |  15 ++-
 .../analysis/matchers/SPDXMatcherFactory.java |  46 ++++++--
 .../analysis/matchers/SimpleRegexMatcher.java |  15 +--
 .../analysis/matchers/SimpleTextMatcher.java  |  15 +--
 .../java/org/apache/rat/api/MetaData.java     |   4 +-
 .../rat/configuration/LicenseReader.java      |   2 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |   1 -
 .../java/org/apache/rat/anttasks/Report.java  |   4 -
 22 files changed, 305 insertions(+), 197 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 680649030..a2fe778a3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -46,7 +46,6 @@
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.ReportConfiguration.LicenseFilter;
-import org.apache.rat.analysis.license.BaseLicense;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
@@ -224,7 +223,7 @@ private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, Prin
 
     private static void listLicenses(SortedSet<ILicense> licenses, PrintStream out) {
         out.println("Licenses:");
-        licenses.stream().filter(lic -> lic instanceof BaseLicense).map(BaseLicense.class::cast)
+        licenses.stream()
                 .forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
                         lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
         out.println();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index f9c6f5e03..eaa38c8e8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -32,10 +32,14 @@
 
 /**
  * Creates default analysers.
- *
  */
 public class DefaultAnalyserFactory {
 
+    /**
+     * Creates a DocumentAnalyser from a collection of ILicenses.
+     * @param licenses The licenses to use in  the Analyser.
+     * @return A document analyser that uses the provides licenses.
+     */
     public static final IDocumentAnalyser createDefaultAnalyser(Collection<ILicense> licenses) {
         if (licenses.size() ==0) {
             throw new ConfigurationException("At least one license must be defined");
@@ -43,10 +47,20 @@ public static final IDocumentAnalyser createDefaultAnalyser(Collection<ILicense>
         return new DefaultAnalyser(new LicenseCollection(licenses));
     }
 
+    /**
+     * A DocumentAnalyser for the license
+     */
     private final static class DefaultAnalyser implements IDocumentAnalyser {
 
+        /**
+         * The license to analyze
+         */
         private final ILicense license;
 
+        /**
+         * Constructs a DocumentAnalyser for the specified license.
+         * @param license The license to analyse
+         */
         public DefaultAnalyser(final ILicense license) {
             this.license = license;
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
index 616fe52d7..944feb39a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
@@ -15,31 +15,40 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.analysis;
 
 import java.io.IOException;
 import java.io.Reader;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.rat.api.Document;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.license.ILicense;
 
-public class DocumentHeaderAnalyser implements IDocumentAnalyser {
+/**
+ * A Document analyzer that analyses document headers for a license.
+ */
+class DocumentHeaderAnalyser implements IDocumentAnalyser {
 
+    /**
+     * The license to analyse
+     */
     private final ILicense license;
-    
+
+    /**
+     * Constructs the HeaderAnalyser for the specific license.
+     * 
+     * @param license The license to analyse
+     */
     public DocumentHeaderAnalyser(final ILicense license) {
         super();
         this.license = license;
     }
 
+    @Override
     public void analyse(Document document) throws RatDocumentAnalysisException {
-        Reader reader = null;
-        try {
-            reader = document.reader();
+        try (Reader reader = document.reader()) {
             // TODO: worker function should be moved into this class
             HeaderCheckWorker worker = new HeaderCheckWorker(reader, license, document);
             worker.read();
@@ -47,9 +56,7 @@ public void analyse(Document document) throws RatDocumentAnalysisException {
             throw new RatDocumentAnalysisException("Cannot read header", e);
         } catch (RatHeaderAnalysisException e) {
             throw new RatDocumentAnalysisException("Cannot analyse header", e);
-        } finally {
-            IOUtils.closeQuietly(reader);
         }
-     }
+    }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index 3e86b88f5..f4ec3832c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -21,22 +21,28 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Objects;
 
-import org.apache.commons.io.IOUtils;
+import org.apache.rat.ConfigurationException;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 
 /**
- * <p>
  * Reads from a stream to check license.
- * </p>
  * <p>
  * <strong>Note</strong> that this class is not thread safe.
  * </p>
  */
 class HeaderCheckWorker {
 
+    /* TODO revisit this class.  It is only used in one place and can be moved inline as the DocumentHeaderAnalyser states.
+     * However, it may also be possible to make the entire set threadsafe so that multiple files can be checked simultaneously.
+     */
+    /**
+     * The default number of header lines to read while looking for the license
+     * information.
+     */
     public static final int DEFAULT_NUMBER_OF_RETAINED_HEADER_LINES = 50;
 
     private final int numberOfRetainedHeaderLines;
@@ -51,29 +57,48 @@ class HeaderCheckWorker {
      * Convenience constructor wraps given <code>Reader</code> in a
      * <code>BufferedReader</code>.
      * 
-     * @param reader a <code>Reader</code> for the content, not null
-     * @param name the name of the checked content, possibly null
+     * @param reader The reader on the document. not null.
+     * @param license The license to check against. not null.
+     * @param name The document that is being checked. possibly null
      */
     public HeaderCheckWorker(Reader reader, final ILicense license, final Document name) {
-        this(new BufferedReader(reader), license, name);
-    }
-
-    public HeaderCheckWorker(BufferedReader reader, final ILicense license, final Document name) {
         this(reader, DEFAULT_NUMBER_OF_RETAINED_HEADER_LINES, license, name);
     }
 
-    public HeaderCheckWorker(BufferedReader reader, int numberOfRetainedHeaderLine, final ILicense license,
+    /**
+     * Constructs a check worker for the license against the specified document.
+     * 
+     * @param reader The reader on the document. not null.
+     * @param numberOfRetainedHeaderLine the maximum number of lines to read to find
+     * the license information.
+     * @param license The license to check against. not null.
+     * @param name The document that is being checked. possibly null
+     */
+    public HeaderCheckWorker(Reader reader, int numberOfRetainedHeaderLine, final ILicense license,
             final Document name) {
-        this.reader = reader;
+        Objects.requireNonNull(reader, "Reader may not be null");
+        Objects.requireNonNull(license, "License may not be null");
+        if (numberOfRetainedHeaderLine < 0) {
+            throw new ConfigurationException("numberOfRetainedHeaderLine may not be less than zero");
+        }
+        this.reader = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
         this.numberOfRetainedHeaderLines = numberOfRetainedHeaderLine;
         this.license = license;
         this.document = name;
     }
 
+    /**
+     * @return {@code true} if the header check is complete.
+     */
     public boolean isFinished() {
         return finished;
     }
 
+    /**
+     * Read the input and perform the header check.
+     * 
+     * @throws RatHeaderAnalysisException on IO Exception.
+     */
     public void read() throws RatHeaderAnalysisException {
         if (!finished) {
             final StringBuilder headers = new StringBuilder();
@@ -95,13 +120,12 @@ public void read() throws RatHeaderAnalysisException {
             } catch (IOException e) {
                 throw new RatHeaderAnalysisException("Cannot read header for " + document, e);
             }
-            IOUtils.closeQuietly(reader);
             license.reset();
         }
         finished = true;
     }
 
-    boolean readLine(StringBuilder headers) throws IOException, RatHeaderAnalysisException {
+    boolean readLine(StringBuilder headers) throws IOException {
         String line = reader.readLine();
         boolean result = line != null;
         if (result) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 85a51ba3d..727426b89 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -28,7 +28,9 @@
 import org.apache.rat.configuration.builders.TextBuilder;
 
 /**
- * Matches text headers to known licenses.
+ * Performs explicit checks against a line from the header of a file.
+ * For implementations that need to check multiple lines the implementation must cache the earlier lines.
+ * 
  */
 public interface IHeaderMatcher {
     /**
@@ -58,78 +60,121 @@ public boolean asBoolean() {
             case i : throw new IllegalStateException( "'asBoolean' should never be called on an indeterminate state");
             }
         }
+        
+        @Override
+        public String toString() {
+            return super.toString()+" "+desc;
+        }
     }
 
     /**
      * Get the identifier for this matcher.
+     * <p>All matchers must have unique identifiers</p>
      * 
      * @return the Identifier for this matcher.
      */
     String getId();
 
     /**
-     * Resets this matches. Subsequent calls to {@link #match} will accumulate new
-     * text.
+     * Resets this state {@code State.i}. 
+     * If text is being cached this method should clear that cache.
      */
     void reset();
 
     /**
-     * Attempts to match the text after adding the line and returns the State after
+     * Attempts to match {@code line} and returns the State after
      * the match is attempted.
      * 
      * @param line next line of text, not null
      * @return the new state after the matching was attempted.
-     * 
-     * @throws RatHeaderAnalysisException in case of internal RAT errors.
      */
     State matches(String line);
 
     /**
      * Gets the final state for this matcher. This is called after the EOF on the
-     * input. At this point there should be no matchers in an indeterminent state.
+     * input. At this point there should be no matchers in an {@code State.i} state.
      */
     State finalizeState();
 
     /**
      * Gets the the current state of the matcher. All matchers should be
-     * indeterminant at the start.
+     * in {@code State.i} at the start.
      * 
      * @return the current state of the matcher.
      */
     State currentState();
 
+    /**
+     * An IHeaderMatcher builder.
+     */
     @FunctionalInterface
     interface Builder {
+        /**
+         * Build the IHeaderMatcher.
+         * @return a new IHeaderMatcher.
+         */
         IHeaderMatcher build();
 
+        /**
+         * @return an instance of the standard TextBuilder.
+         * @see TextBuilder
+         */
         static TextBuilder text() {
             return new TextBuilder();
         }
 
+        /**
+         * @return an instance of the standard AnyBuilder.
+         * @see AnyBuilder
+         */
         static AnyBuilder any() {
             return new AnyBuilder();
         }
 
+        /**
+         * @return an instance of the standard AllBuilder.
+         * @see AllBuilder
+         */
         static AllBuilder all() {
             return new AllBuilder();
         }
 
+        /**
+         * @return an instance of the standard CopyrightBuilder.
+         * @see CopyrightBuilder
+         */
         static CopyrightBuilder copyright() {
             return new CopyrightBuilder();
         }
 
+        /**
+         * @return an instance of the standard SpdxBuilder.
+         * @see SpdxBuilder
+         */
         static SpdxBuilder spdx() {
             return new SpdxBuilder();
         }
 
+        /**
+         * @return an instance of the standard MatcherRefBuilder.
+         * @see MatcherRefBuilder
+         */
         static MatcherRefBuilder matcherRef() {
             return new MatcherRefBuilder();
         }
 
+        /**
+         * @return an instance of the standard NotBuilder.
+         * @see NotBuilder
+         */
         static NotBuilder not() {
             return new NotBuilder();
         }
 
+        /**
+         * @return an instance of the standard RegexBuilder.
+         * @see RegexBuilder
+         */
         static RegexBuilder regex() {
             return new RegexBuilder();
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
index 7427b4057..2948a424d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
@@ -24,13 +24,25 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
+/**
+ * A collection of ILicenses that acts as a single License for purposes of Analysis.
+ * <p>
+ * This class process each license in turn on each {@code matches(String)} call.  When a match is found the 
+ * ILicenseFamily for the matching license is captured and used as the family for this license. If no matching 
+ * license has been found the default {@code dummy} license category is used.
+ */
 class LicenseCollection extends AbstractMatcherContainer implements ILicense {
+
     private static final ILicenseFamily DEFAULT = ILicenseFamily.builder().setLicenseFamilyCategory("Dummy")
             .setLicenseFamilyName("HeaderMatcherCollection default license family").build();
     private Collection<ILicense> enclosed;
     private ILicense matchingLicense;
     private State lastState;
 
+    /**
+     * Constructs the LicenseCollection from the provided ILicense collection.
+     * @param enclosed The collection of ILicenses to compose this License implementation from.  May not be null.
+     */
     public LicenseCollection(Collection<ILicense> enclosed) {
         super(enclosed);
         this.enclosed = enclosed;
@@ -113,5 +125,4 @@ public String getNotes() {
     public String derivedFrom() {
         return matchingLicense == null ? null : matchingLicense.derivedFrom();
     }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
deleted file mode 100644
index ec4eb28d0..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.analysis.license;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.matchers.AbstractHeaderMatcher;
-import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
-
-public abstract class BaseLicense extends AbstractHeaderMatcher implements ILicense {
-    private ILicenseFamily family;
-    private String notes;
-    private String derivedFrom;
-    private IHeaderMatcher matcher;
-
-    public BaseLicense(ILicenseFamily family, String notes, IHeaderMatcher matcher) {
-        this(null, family, notes, matcher);
-    }
-
-    public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher) {
-        this(null, family, notes, matcher, null);
-    }
-
-    public BaseLicense(String idPrefix, ILicenseFamily family, String notes, IHeaderMatcher matcher,
-            String derivedFrom) {
-        super(String.format("%s:%s:%s/%s", idPrefix == null ? "" : idPrefix, family.getFamilyCategory(),
-                matcher.getClass().getSimpleName(), matcher.getId()));
-        this.family = family;
-        this.notes = notes;
-        this.derivedFrom = derivedFrom;
-        this.matcher = matcher;
-    }
-
-    @Override
-    public ILicenseFamily getLicenseFamily() {
-        return family;
-    }
-
-    @Override
-    public int compareTo(ILicense arg0) {
-        return ILicense.getComparator().compare(this, arg0);
-    }
-
-    @Override
-    public String getNotes() {
-        return notes;
-    }
-
-    @Override
-    public State matches(String line) {
-        return matcher.matches(line);
-    }
-
-    @Override
-    public State currentState() {
-        return matcher.currentState();
-    }
-
-    @Override
-    public State finalizeState() {
-        return matcher.finalizeState();
-    }
-
-    @Override
-    public void reset() {
-        matcher.reset();
-    }
-
-    @Override
-    public String derivedFrom() {
-        return derivedFrom;
-    }
-
-    /**
-     * Removes everything except letter or digit from text.
-     * 
-     * @param text The text to remove extra chars from.
-     * @return the pruned text.
-     */
-    protected static final String prune(String text) {
-        final int length = text.length();
-        final StringBuilder buffer = new StringBuilder(length);
-        for (int i = 0; i < length; i++) {
-            char at = text.charAt(i);
-            if (Character.isLetterOrDigit(at)) {
-                buffer.append(at);
-            }
-        }
-        return buffer.toString();
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
index da89bb3b1..7559bf66e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
@@ -20,14 +20,22 @@
 
 import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * An abstract class to simplify IHeaderMatcher creation.  This class ensures that the id is set.
+ */
 public abstract class AbstractHeaderMatcher implements IHeaderMatcher {
 
     private String id;
 
+    /**
+     * Constructs the IHeaderMatcher with an id value.  If {@code id} is null then a unique random id is created.
+     * @param id the Id to use.
+     */
     protected AbstractHeaderMatcher(String id) {
-        this.id = id == null ? UUID.randomUUID().toString() : id;
+        this.id = StringUtils.isBlank(id) ? UUID.randomUUID().toString() : id;
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index 7125a4966..92eeb8fe3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -20,21 +20,39 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Objects;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * A class that implements IHeaderMatcher as a collection of other IHeaderMatchers.
+ */
 public abstract class AbstractMatcherContainer extends AbstractHeaderMatcher {
 
     protected final Collection<IHeaderMatcher> enclosed;
 
+    /**
+     * Constructs the abstract matcher container.
+     * If the {@code id} is not set then a unique random identifier is created.
+     * The {@code enclosed} collection is preserved in a new collection that retains the order of
+     * of the original collection.
+     * @param id The id for the matcher.
+     * @param enclosed the collection of enclosed matchers.  
+     */
     public AbstractMatcherContainer(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id);
+        Objects.requireNonNull(enclosed, "The collection of IHeaderMatcher may not be null");
         this.enclosed = new ArrayList<>(enclosed);
     }
 
+    /**
+     * Constructs the abstract matcher container with a unique random id.
+     * The {@code enclosed} collection is preserved in a new collection that retains the order of
+     * of the original collection.
+     * @param enclosed the collection of enclosed matchers.  
+     */
     public AbstractMatcherContainer(Collection<? extends IHeaderMatcher> enclosed) {
-        super(null);
-        this.enclosed = new ArrayList<>(enclosed);
+        this(null, enclosed);
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
index c5009005f..71852c075 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractSimpleMatcher.java
@@ -18,14 +18,29 @@
  */
 package org.apache.rat.analysis.matchers;
 
+/**
+ * An abstract IHeaderMatcher that does simple matching.  Implementations need to implement the {@code doMatch(String)}
+ * method to perform the actual matching.  All handling of the {@code State} is managed by this class.  By default the 
+ * {@code finalizeState()} method will convert {@code State.i} to {@code State.f}.
+ */
 public abstract class AbstractSimpleMatcher extends AbstractHeaderMatcher {
     private State lastState;
 
-    public AbstractSimpleMatcher(String id) {
+    /**
+     * Constructs the AbstractSimpleMatcher with the specified id.
+     * If the id is null or an empty string a unique random id will be generated.
+     * @param id the Id to use.  May be null.
+     */
+    protected AbstractSimpleMatcher(String id) {
         super(id);
         this.lastState = State.i;
     }
 
+    /**
+     * Performs the actual match test.
+     * @param line the line to check.
+     * @return {@code true} if the line matches, {@code false} otherwise.
+     */
     abstract protected boolean doMatch(String line);
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
index 1bea5ba08..fc64f6e43 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AndMatcher.java
@@ -22,12 +22,24 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * A matcher that performs a logical {@code AND} across all the contained matchers.
+ */
 public class AndMatcher extends AbstractMatcherContainer {
 
+    /**
+     * Constructs the AndMatcher with the specified id and enclosed collection.
+     * @param id the to use.  If null or an empty string a unique random id will be created.
+     * @param enclosed the enclosed collection.
+     */
     public AndMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
     }
 
+    /**
+     * Constructs the AndMatcher with the a unique random id and the enclosed collection.
+     * @param enclosed the enclosed collection.
+     */
     public AndMatcher(Collection<? extends IHeaderMatcher> enclosed) {
         this(null, enclosed);
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index fa4b4ad05..d9fb3899a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -33,18 +33,19 @@
  * Example supported Copyright header lines, using copyright owner
  * &quot;FooBar&quot;
  * <ul>
- * <li>* Copyright 2010 FooBar. *</li>
- * <li>* Copyright 2010-2012 FooBar. *</li>
- * <li>*copyright 2012 foobar*</li>
+ * <li>Copyright 2010 FooBar.</li>
+ * <li>Copyright 2010-2012 FooBar.</li>
+ * <li>copyright 2012 foobar</li>
  * </ul>
  * <p>
- * Note also that the copyright owner is appended to the regex pattern, so can
+ * Note also that the copyright owner is appended to the regex pattern and so can
  * support additional regex but also requires escaping where needed,<br>
- * e.g. use &quot;FooBar \(www\.foobar\.com\)&quot; for matching &quot;FooBar
+ * e.g. use &quot;FooBar \\(www\\.foobar\\.com\\)&quot; or 
+ * &quot;FooBar \\Q(www.foobar.com)\\E&quot; to match &quot;FooBar
  * (www.foobar.com)&quot;
  * </p>
- *
- * @since Rat 0.9
+ * <p>The matcher also accepts "(C)", "(c)", and "©" in place of (or in addition to) the "Copyright" or "copyright" 
+ * keyword</p>
  */
 public class CopyrightMatcher extends AbstractSimpleMatcher {
 
@@ -57,10 +58,23 @@ public class CopyrightMatcher extends AbstractSimpleMatcher {
     private final Pattern dateOwnerPattern;
     private final Pattern ownerDatePattern;
 
+    /**
+     * Constructs the CopyrightMatcher with the specified start, stop and owner strings and a unique random id..
+     * @param start the start date for the copyright may be null.
+     * @param stop the stop date for the copyright, may be null.  May not be specified if start is not specified.
+     * @param owner the owner of the copyright. may be null.
+     */
     public CopyrightMatcher(String start, String stop, String owner) {
         this(null, start, stop, owner);
     }
 
+    /**
+     * Constructs the CopyrightMatcher with the specified start, stop and owner strings.
+     * @param id the id for the matcher.
+     * @param start the start date for the copyright may be null.
+     * @param stop the stop date for the copyright, may be null.  May not be specified if start is not specified.
+     * @param owner the owner of the copyright. may be null.
+     */
     public CopyrightMatcher(String id, String start, String stop, String owner) {
         super(id);
         String dateDefn = "";
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
index 2c2c566e9..11621d641 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -19,6 +19,7 @@
 package org.apache.rat.analysis.matchers;
 
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  * Accumulates all letters and numbers contained inside the header and compares
@@ -29,8 +30,6 @@
  * The text comparison is case insensitive but assumes only characters in the
  * US-ASCII charset are being matched.
  * </p>
- *
- * @since Rat 0.9
  */
 public class FullTextMatcher extends AbstractSimpleMatcher {
 
@@ -45,12 +44,22 @@ public class FullTextMatcher extends AbstractSimpleMatcher {
 
     private final StringBuilder buffer = new StringBuilder();
 
+    /**
+     * Constructs the full text matcher with a unique random id and the specified text to match.
+     * @param fullText the text to match
+     */
     public FullTextMatcher(String fullText) {
         this(null, fullText);
     }
 
+    /**
+     * Constructs the full text matcher for the specified text.
+     * @param id the id for the matcher
+     * @param fullText the text to match
+     */
     public FullTextMatcher(String id, String fullText) {
         super(id);
+        Objects.requireNonNull(fullText, "fullText may not be null");
         int offset = fullText.indexOf('\n');
         if (offset == -1) {
             offset = Math.min(DEFAULT_INITIAL_LINE_LENGTH, fullText.length());
@@ -79,10 +88,6 @@ public static final String prune(String text) {
         return buffer.toString();
     }
 
-    public final boolean hasFullText() {
-        return fullText != null;
-    }
-
     @Override
     public boolean doMatch(String line) {
         final String inputToMatch = prune(line).toLowerCase(Locale.ENGLISH);
@@ -117,7 +122,6 @@ public boolean doMatch(String line) {
         return false;
     }
 
-    // This is called indirectly from a ctor so must be final or private
     @Override
     public void reset() {
         super.reset();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
index dff5ce8a1..8678f9257 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/NotMatcher.java
@@ -18,18 +18,32 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import org.apache.rat.analysis.IHeaderMatcher;
+import java.util.Objects;
 
+import org.apache.rat.analysis.IHeaderMatcher;
+/**
+ * An IHeaderMatcher that reverses the result of an enclosed matcher.
+ */
 public class NotMatcher extends AbstractHeaderMatcher {
 
     private final IHeaderMatcher enclosed;
 
+    /**
+     * Create the matcher with the enclosed matcher.
+     * @param enclosed the enclosed matcher
+     */
     public NotMatcher(IHeaderMatcher enclosed) {
         this(null, enclosed);
     }
 
+    /**
+     * Create the matcher with the enclosed matcher and id.
+     * @param id the id for this matcher.
+     * @param enclosed the enclosed matcher
+     */
     public NotMatcher(String id, IHeaderMatcher enclosed) {
         super(id);
+        Objects.requireNonNull(enclosed, "enclosed matcher may not be null");
         this.enclosed = enclosed;
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
index 60183141d..9b7bbae8a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/OrMatcher.java
@@ -22,17 +22,29 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * A matcher that performs a logical {@code OR} across all the contained matchers.
+ */
 public class OrMatcher extends AbstractMatcherContainer {
 
     private State lastState;
 
+    /**
+     * Constructs the matcher from the enclosed matchers.
+     * @param enclosed the enclosed matchers.
+     */
     public OrMatcher(Collection<? extends IHeaderMatcher> enclosed) {
         this(null, enclosed);
     }
 
+    /**
+     * Constructs the matcher with the specified id from the enclosed matchers.
+     * @param id the id to use.
+     * @param enclosed the enclosed matchers.
+     */
     public OrMatcher(String id, Collection<? extends IHeaderMatcher> enclosed) {
         super(id, enclosed);
-        // lastState = State.i;
+        lastState = State.i;
     }
 
     @Override
@@ -80,5 +92,4 @@ public void reset() {
         super.reset();
         lastState = State.i;
     }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index 1a8e4a2e0..4afaf6305 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -20,6 +20,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -28,7 +29,7 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 
 /**
- * Defines a matcher for an SPDX tag. SPDX tag is of the format
+ * Defines a factory to produce matchers for an SPDX tag. SPDX tag is of the format
  * {@code SPDX-License-Identifier: short-name} where {@code short-name} matches
  * the regex pattern [A-Za-z0-9\.\-]+
  * <p>
@@ -41,30 +42,38 @@
 public class SPDXMatcherFactory {
 
     /**
-     * Creates IHeaderMatcher instances that are a collection of SPDXMatcher
-     * instances. Used in the default matcher construction.
+     * The collectoin of all matchers produced by this factory.
      */
     private static final Map<String, SPDXMatcherFactory.Match> matchers = new HashMap<>();
 
+    /**
+     * The instance of this factory.
+     */
     public static final SPDXMatcherFactory INSTANCE = new SPDXMatcherFactory();
 
+    /**
+     * The regular expression to locate the SPDX license identifer in the text stream
+     */
     private static Pattern groupSelector = Pattern.compile(".*SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)");
 
+    /**
+     * the last line that this factory scanned.
+     */
     private String lastLine;
-    private Match lastMatch;
-
     /**
-     * Constructor.
-     * 
-     * @param spdxId A regular expression that matches the @{short-name} of the SPDX
-     * Identifier.
-     * @param licenseFamilyCategory the RAT license family category for the license.
-     * @param licenseFamilyName the RAT license family name for the license.
+     * The last matcer to match the line.
      */
+    private Match lastMatch;
+
     private SPDXMatcherFactory() {
         lastLine = null;
     };
 
+    /**
+     * Creates the spdx matcher.
+     * @param spdxId the spdx name to match.
+     * @return and spdx matcher.
+     */
     public IHeaderMatcher create(String spdxId) {
         if (StringUtils.isBlank(spdxId)) {
             throw new ConfigurationException("'spdx' type matcher requires a name");
@@ -77,7 +86,16 @@ public IHeaderMatcher create(String spdxId) {
         return matcher;
     }
 
+    /**
+     * Each matcher calls this method to present the line it is working on.
+     * @param line The line the caller is looking at.
+     * @param caller the Match that is calling this method.
+     * @return true if the caller matches the text.
+     */
     private boolean check(String line, Match caller) {
+        // if the line is has not been seen yet see if we can extract the SPDX id from the line.
+        // if so then see if that name has been registered.  If so then we have a match and set 
+        // lastMatch.
         if (lastLine == null || !lastLine.equals(line)) {
             Matcher matcher = groupSelector.matcher(line);
             if (matcher.find()) {
@@ -86,11 +104,13 @@ private boolean check(String line, Match caller) {
                 lastMatch = null;
             }
         }
-        return caller == lastMatch;
+        // see if the caller matches lastMatch.
+        return (lastMatch != null) && caller.spdxId.equals(lastMatch.spdxId);
     }
 
     public class Match extends AbstractSimpleMatcher {
 
+        String spdxId;
         /**
          * Constructor.
          * 
@@ -102,6 +122,8 @@ public class Match extends AbstractSimpleMatcher {
          */
         Match(final String spdxId) {
             super("SPDX:" + spdxId);
+            Objects.requireNonNull(spdxId, "SpdxId is required");
+            this.spdxId = spdxId;
         }
 
         @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
index 960a1d704..abe2362d6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
@@ -21,23 +21,24 @@
 import java.util.regex.Pattern;
 
 /**
- * @since Rat 0.8
+ * A simple regular expression matching IHeaderMatcher
  */
 public class SimpleRegexMatcher extends AbstractSimpleMatcher {
     private Pattern pattern;
 
     /**
-     * Creates a pattern based license with full documentation.
-     * 
-     * @param pLicenseFamilyCategory
-     * @param pLicenseFamilyName
-     * @param pNotes
-     * @param pPatterns
+     * Constructs a regex pattern matcher with a unique random id and the specified Regex pattern.
+     * @param pattern the pattern to match.  Pattern will only match a single line from the input stream.
      */
     public SimpleRegexMatcher(Pattern pattern) {
         this(null, pattern);
     }
 
+    /**
+     * Constructs a regex pattern matcher with a unique random id and the specified Regex pattern.
+     * @param id the id for this matcher
+     * @param pattern the pattern to match.  Pattern will only match a single line from the input stream.
+     */
     public SimpleRegexMatcher(String id, Pattern pattern) {
         super(id);
         this.pattern = pattern;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index 5533b0c79..75afd8ac1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -21,23 +21,24 @@
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * @since Rat 0.8
+ * A simple text matching IHeaderMatcher implementation.
  */
 public class SimpleTextMatcher extends AbstractSimpleMatcher {
     private String pattern;
 
     /**
-     * Creates a pattern based license with full documentation.
-     * 
-     * @param pLicenseFamilyCategory
-     * @param pLicenseFamilyName
-     * @param pNotes
-     * @param pPatterns
+     * Constructs the simple text matcher for the simple string.
+     * @param pattern The pattern to match.  Will only match a single line from the input stream.
      */
     public SimpleTextMatcher(String pattern) {
         this(null, pattern);
     }
 
+    /**
+     * Constructs the simple text matcher for the simple string.
+     * @param id The id for this matcher.
+     * @param pattern The pattern to match.  Will only match a single line from the input stream.
+     */
     public SimpleTextMatcher(String id, String pattern) {
         super(id);
         if (StringUtils.isBlank(pattern)) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index 2c9f78a46..db602e099 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -134,7 +134,7 @@ public class MetaData {
             "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
     @Deprecated
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1 = "Academic Free License, Version 2.1";
-    @Deprecated
+
     public static final String RAT_LICENSE_FAMILY_NAME_VALUE_UNKNOWN = "?????";
     @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_W3C_SOFTWARE_COPYRIGHT 
@@ -169,7 +169,7 @@ public class MetaData {
     @Deprecated
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_ACADEMIC_FREE_LICENSE_VERSION_2_1
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1);
-    @Deprecated
+
     public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN
         = new Datum(RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_UNKNOWN); 
     
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index 4faedb21c..f64fa76a6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -32,7 +32,7 @@ public interface LicenseReader {
     void addLicenses(URL url);
 
     /**
-     * Reads the configuration and extracts the BaseLicenses.
+     * Reads the configuration and extracts instances of ILicense.
      * 
      * @return A collection of Base licenses.
      */
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index cde7130c7..ddc6e004c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -79,7 +79,6 @@ public void standardReport() throws Exception {
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.addLicense(mockLicense);
-        configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
         report(directory, report);
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 7303df527..55c9ad5d5 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -165,10 +165,6 @@ public void setUseDefaultLicenses(boolean useDefaultLicenses) {
         }
     }
 
-    public void setApprovalFilter(ApprovalFilter filter) {
-        configuration.setLicenseFilter(filter.internalFilter());
-    }
-
     public void setAddApprovedLicense(String familyCategory) {
         configuration.addApprovedLicenseCategory(familyCategory);
     }

From 89930c71d1b411c8cdc938750629612a592b65be Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 15:58:02 +0200
Subject: [PATCH 117/299] added javadocs

---
 .../java/org/apache/rat/api/MetaData.java     |  35 ++---
 .../org/apache/rat/configuration/Format.java  |  78 +++++++----
 .../rat/configuration/LicenseReader.java      |   3 +
 .../configuration/MatcherBuilderTracker.java  |  16 ++-
 .../rat/configuration/MatcherReader.java      |   3 +
 .../configuration/XMLConfigurationReader.java | 127 ++++++++++--------
 .../rat/report/xml/writer/XmlWriterUtils.java |  29 ----
 .../report/xml/writer/XmlWriterUtilsTest.java |   5 +-
 .../org/apache/rat/testhelpers/XmlUtils.java  |  85 +++++++++---
 9 files changed, 220 insertions(+), 161 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriterUtils.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index db602e099..d3dd7bfb8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -28,7 +28,7 @@
 import org.apache.rat.license.ILicense;
 
 /**
- * Data about the subject.
+ * Data about the document under test..
  */
 public class MetaData {
 
@@ -182,23 +182,24 @@ public class MetaData {
     public static final String RAT_APPROVED_LICENSE_VALUE_FALSE = Boolean.FALSE.toString();
     public static final Datum RAT_APPROVED_LICENSE_DATIM_TRUE = new Datum(RAT_URL_APPROVED_LICENSE, RAT_APPROVED_LICENSE_VALUE_TRUE);
     public static final Datum RAT_APPROVED_LICENSE_DATIM_FALSE = new Datum(RAT_URL_APPROVED_LICENSE, RAT_APPROVED_LICENSE_VALUE_FALSE);
-    
-    private ContentType contentType;
+
     /** 
      * Only likely to be a small quantity of data 
      * so trade some performance for simplicity.
      */
     private final List<Datum> data;
 
+    /**
+     * Create metadata without a content type.
+     */
     public MetaData() {
-        this(null);
-    }
-    
-    public MetaData(final ContentType contentType) {
-        this.contentType = contentType;
         this.data = new ArrayList<>(16);
     }
     
+    /**
+     * Add the license information to the metadata.
+     * @param license the license to add metadata for.
+     */
     public void reportOnLicense(ILicense license) {
         if (StringUtils.isNotBlank(license.getNotes())) {
             set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, license.getNotes()));
@@ -209,23 +210,6 @@ public void reportOnLicense(ILicense license) {
     }
 
     
-    /**
-     * Gets the content type for the subject.
-     * @return or null when the type is unknown
-     */
-    public ContentType getContentType() {
-        return contentType;
-    }
-    
-    /**
-     * Sets the content type for this subject.
-     * @param contentType <code>ContentType</code>,
-     * or null when the content type is unknown
-     */
-    public void setContentType(final ContentType contentType) {
-        this.contentType = contentType;
-    }
-    
     /**
      * Gets all data.
      * @return unmodifiable view of the meta data.
@@ -311,7 +295,6 @@ public boolean clear(final String name) {
      */
     public void clear() {
         data.clear();
-        this.contentType = null;
     }
     
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index 862e3320b..a6df9262b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -18,7 +18,6 @@
  */
 package org.apache.rat.configuration;
 
-
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -28,64 +27,93 @@
 
 import org.apache.rat.ConfigurationException;
 
+/**
+ * An enumeration of the types of files that can contain the configurtion
+ * information.
+ */
 public enum Format {
-    XML( XMLConfigurationReader.class, "xml"),
-    TXT ( null, "txt","text");
-    
+    /** an XML file */
+    XML(XMLConfigurationReader.class, "xml"),
+    /** A plain text file */
+    TXT(null, "txt", "text");
+
     private String[] suffix;
-    
+
     private Constructor<MatcherReader> matcherReader;
     private Constructor<LicenseReader> licenseReader;
-    
+
     @SuppressWarnings("unchecked")
     Format(Class<?> reader, String... suffix) {
-        if (reader != null)
-        {
-        try {
-            matcherReader =  MatcherReader.class.isAssignableFrom(reader) ? (Constructor<MatcherReader>) reader.getConstructor() : null;
-            licenseReader = LicenseReader.class.isAssignableFrom(reader) ? (Constructor<LicenseReader>) reader.getConstructor() : null;
-        } catch (NoSuchMethodException | SecurityException e) {
-            throw new ConfigurationException( "Error retrieving no argument constructor for "+reader.getName(), e);
-        }
+        if (reader != null) {
+            try {
+                matcherReader = MatcherReader.class.isAssignableFrom(reader)
+                        ? (Constructor<MatcherReader>) reader.getConstructor()
+                        : null;
+                licenseReader = LicenseReader.class.isAssignableFrom(reader)
+                        ? (Constructor<LicenseReader>) reader.getConstructor()
+                        : null;
+            } catch (NoSuchMethodException | SecurityException e) {
+                throw new ConfigurationException("Error retrieving no argument constructor for " + reader.getName(), e);
+            }
         }
         this.suffix = suffix;
     }
-    
+
+    /**
+     * @return a new instance of MatcherReader for this format.
+     */
     public MatcherReader matcherReader() {
         try {
             return matcherReader == null ? null : matcherReader.newInstance();
         } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
                 | InvocationTargetException e) {
-            throw new ConfigurationException( "Can not instantiate MatcherReader for "+this.name(), e);
+            throw new ConfigurationException("Can not instantiate MatcherReader for " + this.name(), e);
         }
     }
 
+    /**
+     * @return a new instance of the LicenseReader for this format.
+     */
     public LicenseReader licenseReader() {
         try {
             return licenseReader == null ? null : licenseReader.newInstance();
         } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
                 | InvocationTargetException e) {
-            throw new ConfigurationException( "Can not instantiate LicenseReader for "+this.name(), e);
+            throw new ConfigurationException("Can not instantiate LicenseReader for " + this.name(), e);
         }
     }
-    
+
+    /**
+     * Determine the {@code Format} from the file name.
+     * @param name the file name to check.
+     * @return the Format
+     */
     public static Format fromName(String name) {
         String[] parts = name.split("\\.");
-        String suffix = parts[parts.length-1];
-        for (Format f: Format.values()) {
-            if (Arrays.stream(f.suffix).anyMatch( suffix::equals )) {
+        String suffix = parts[parts.length - 1];
+        for (Format f : Format.values()) {
+            if (Arrays.stream(f.suffix).anyMatch(suffix::equals)) {
                 return f;
             }
         }
         throw new IllegalArgumentException(String.format("No such suffix: %s", suffix));
     }
-    
-    public static Format fromURL(URL url) {
+
+   /**
+    * Determine the {@code Format} from a URL.
+    * @param name the URL to check.
+    * @return the Format
+    */
+   public static Format fromURL(URL url) {
         return Format.fromName(url.getFile());
     }
 
-    public static Format fromFile(File file) throws MalformedURLException {
+   /**
+    * Determine the {@code Format} from a File.
+    * @param name the File to check.
+    * @return the Format
+    */
+   public static Format fromFile(File file) throws MalformedURLException {
         return Format.fromURL(file.toURI().toURL());
     }
-
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index f64fa76a6..47d000731 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -23,6 +23,9 @@
 
 import org.apache.rat.license.ILicense;
 
+/**
+ * An interface describing the methods of a LicenseReader.
+ */
 public interface LicenseReader {
     /**
      * Adds a URL to the set of files to be read.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
index f44a34e01..95f9bfe38 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
@@ -28,6 +28,10 @@
 import org.apache.rat.Defaults;
 import org.apache.rat.configuration.builders.AbstractBuilder;
 
+/**
+ * A class to track the Matcher Builders as they are defined.  Matchers may be defined in multiple configuration files
+ * this method tracks them so that they can be referenced across the configuration files.
+ */
 public class MatcherBuilderTracker {
 
     private static MatcherBuilderTracker INSTANCE;
@@ -42,17 +46,27 @@ private static synchronized MatcherBuilderTracker instance() {
         return INSTANCE;
     }
 
+    /**
+     * Adds a builder to the tracker.
+     * If the {@code name} is null then the builder class name simple is used with the "Builder" suffix removed.
+     * @param className the Class name for the builder.
+     * @param name the short name for the builder. 
+     */
     public static void addBuilder(String className, String name) {
         instance().addBuilderImpl(className, name);
     }
 
+    /**
+     * Get the matching builder for the name.
+     * @param name The name of the builder.
+     * @return the builder for that name.
+     */
     public static AbstractBuilder getMatcherBuilder(String name) {
         Class<? extends AbstractBuilder> clazz = instance().matcherBuilders.get(name);
         if (clazz == null) {
             StringBuilder sb = new StringBuilder("\nValid builders\n");
             instance().matcherBuilders.keySet().stream().forEach(x -> sb.append(x).append("\n"));
             sb.append("ERROR MSG\n");
-
             throw new ConfigurationException(sb.append("No matcher builder named " + name).toString());
         }
         try {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
index 6ea63b32d..bb8d2b530 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
@@ -20,6 +20,9 @@
 
 import java.net.URL;
 
+/**
+ * An interface that describes the methods of a Matcher reader.
+ */
 public interface MatcherReader {
     /**
      * Adds a URL to the set of files to be read.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 27701a7ad..6f1828f34 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -19,10 +19,6 @@
 package org.apache.rat.configuration;
 
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -37,12 +33,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.beanutils.MethodUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -63,24 +53,31 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-/*
- *  <licenses> 
- *  <license id=id name=name >
-        <notes></notes>
-        <text>  </text>
-        <copyright start='' end='' owner=''/>
-        <spdx></spdx> 
-        <and> <license>...</and>
-        <or> <license>...</or> 
-        <matcher_ref refid='' />
-    </license>
-    </licenses>
-    <approved>
-        <family refid=''>
-    </approved>
-    <matchers>
-        <matcher className=''/>
-    </matchers>
+/**
+ * A class that reads the XML configuration file format.
+ * <p>
+ * {@code <rat-config>}<br/>
+ * {@code   <licenses>}<br/>
+ * {@code     <license id=id name=name >}<br/>
+ * {@code       <notes></notes>}<br/>
+ * {@code       <text>  </text>}<br/>
+ * {@code       <copyright start='' end='' owner=''/>}<br/>
+ * {@code       <spdx></spdx> }<br/>
+ * {@code       <and> <matcher/>...</and>}<br/>
+ * {@code       <or> <matcher/>...</or> }<br/>
+ * {@code       <matcher_ref refid='' />}<br/>
+ * {@code       <not><matcher /></not>}<br/>
+ * {@code     </license>}<br/>
+ * {@code   </licenses>}<br/>
+ * {@code   <approved>}<br/>
+ * {@code     <family refid=''>}<br/>
+ * {@code   </approved>}<br/>
+ * {@code   <matchers>}<br/>
+ * {@code     <matcher className=''/>}<br/>
+ * {@code     <matcher className=''/>}<br/>
+ * {@code   </matchers>}<br/>
+ * {@code </rat-config>}<br/>
+ * </p>
  */
 
 public class XMLConfigurationReader implements LicenseReader, MatcherReader {
@@ -110,6 +107,9 @@ public class XMLConfigurationReader implements LicenseReader, MatcherReader {
     private final Map<String, IHeaderMatcher> matchers;
     private final SortedSet<String> licenseFamilies;
 
+    /**
+     * Constructs the XML configuration read.
+     */
     public XMLConfigurationReader() {
         try {
             document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
@@ -129,33 +129,16 @@ public XMLConfigurationReader() {
         matchers = new HashMap<>();
     }
 
-    public void printDocument(OutputStream out) {
-        printDocument(out, document);
-    }
-
-    public void printDocument(OutputStream out, Document document) {
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer transformer;
-        try {
-            transformer = tf.newTransformer();
-
-            transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
-            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-
-            transformer.transform(new DOMSource(document), new StreamResult(new OutputStreamWriter(out, "UTF-8")));
-        } catch (TransformerException | UnsupportedEncodingException e) {
-            e.printStackTrace(new PrintStream(out));
-        }
-    }
-
     @Override
     public void addLicenses(URL url) {
         read(url);
     }
 
+    /**
+     * Read the urls and create a single document to process.
+     * 
+     * @param urls The URLs to read.
+     */
     public void read(URL... urls) {
         DocumentBuilder builder;
         try {
@@ -172,12 +155,23 @@ public void read(URL... urls) {
         }
     }
 
+    /**
+     * Applies the {@code consumer} to each node in the {@code list}
+     * 
+     * @param list the NodeList to process
+     * @param consumer the consumer to apply to each node in the list.
+     */
     private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
         for (int i = 0; i < list.getLength(); i++) {
             consumer.accept(list.item(i));
         }
     }
 
+    /**
+     * Merge the new document into the document that this reader processes.
+     * 
+     * @param newDoc the Document to merge.
+     */
     public void add(Document newDoc) {
         List<Node> lst = new ArrayList<>();
         nodeListConsumer(newDoc.getElementsByTagName(LICENSE), lst::add);
@@ -189,6 +183,12 @@ public void add(Document newDoc) {
                 (n) -> matchersElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
     }
 
+    /**
+     * Get a map of Node attribute names to values.
+     * 
+     * @param node The node to process
+     * @return the map of attributes on the node
+     */
     private Map<String, String> attributes(Node node) {
         NamedNodeMap nnm = node.getAttributes();
         Map<String, String> result = new HashMap<>();
@@ -199,6 +199,14 @@ private Map<String, String> attributes(Node node) {
         return result;
     }
 
+    /**
+     * Create a text matcher. Will construct a FullTextMatcher or a
+     * SimpleTextMatcher depending on the complexity of the text.
+     * 
+     * @param id the id for the Matcher.
+     * @param txt the text to match
+     * @return the IHeaderMatcher that matches the text.
+     */
     public static IHeaderMatcher createTextMatcher(String id, String txt) {
         boolean complex = txt.contains(" ") | txt.contains("\\t") | txt.contains("\\n") | txt.contains("\\r")
                 | txt.contains("\\f") | txt.contains("\\v");
@@ -305,14 +313,6 @@ public SortedSet<String> approvedLicenseId() {
         return Collections.unmodifiableSortedSet(licenseFamilies);
     }
 
-    public abstract class DelegatingBuilder extends AbstractBuilder {
-        protected final AbstractBuilder delegate;
-
-        DelegatingBuilder(AbstractBuilder delegate) {
-            this.delegate = delegate;
-        }
-    }
-
     private void parseMatcherBuilder(Node classNode) {
         Map<String, String> attributes = attributes(classNode);
         if (attributes.get(ATT_CLASS_NAME) == null) {
@@ -330,4 +330,15 @@ public void readMatcherBuilders() {
     public void addMatchers(URL url) {
         read(url);
     }
+
+    /**
+     * An abstract builder that delegates to another abstract builder.
+     */
+    abstract class DelegatingBuilder extends AbstractBuilder {
+        protected final AbstractBuilder delegate;
+
+        DelegatingBuilder(AbstractBuilder delegate) {
+            this.delegate = delegate;
+        }
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriterUtils.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriterUtils.java
deleted file mode 100644
index 26f540cd9..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriterUtils.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */ 
-package org.apache.rat.report.xml.writer;
-
-import java.io.IOException;
-
-public class XmlWriterUtils {
-
-    public static final void writeAttribute(final IXmlWriter writer, final String name, final boolean booleanValue) throws IOException {
-        final String value = Boolean.toString(booleanValue);
-        writer.attribute(name, value);
-    }
-}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
index 69ef2c40c..f45ed7d29 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
@@ -19,6 +19,7 @@
 package org.apache.rat.report.xml.writer;
 
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
+import org.apache.rat.testhelpers.XmlUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -40,13 +41,13 @@ public void setUp() throws Exception {
 
     @Test
     public void writeTrue() throws Exception {
-        XmlWriterUtils.writeAttribute(writer, "name", true);
+        XmlUtils.writeAttribute(writer, "name", true);
         assertEquals("Attribute written as True", "<alpha name='true'", out.toString());
     }
 
     @Test
     public void writeFalse() throws Exception {
-        XmlWriterUtils.writeAttribute(writer, "name", false);
+        XmlUtils.writeAttribute(writer, "name", false);
         assertEquals("Attribute written as False", "<alpha name='false'", out.toString());
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
index e5ad20278..6e130aeb2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
@@ -15,32 +15,43 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.testhelpers;
 
-import org.apache.rat.license.ILicenseFamily;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.UndeclaredThrowableException;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.lang.reflect.UndeclaredThrowableException;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.report.xml.writer.IXmlWriter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
 
 public final class XmlUtils {
     /**
@@ -72,9 +83,11 @@ public static final boolean isWellFormedXml(final InputSource isource) {
             throw new UndeclaredThrowableException(e);
         }
     }
-    
+
     /**
-     * Finds a node via xpath on the document.  And then checks family, approval and type of elements of the node.
+     * Finds a node via xpath on the document. And then checks family, approval and
+     * type of elements of the node.
+     * 
      * @param doc The document to check/
      * @param xpath the XPath instance to use.
      * @param resource the xpath statement to locate the node.
@@ -84,8 +97,8 @@ public static final boolean isWellFormedXml(final InputSource isource) {
      * @return The node that was located
      * @throws Exception on XPath error.
      */
-    public static Node checkNode(Document doc, XPath xpath, String resource, String family, String approval, String type)
-            throws Exception {
+    public static Node checkNode(Document doc, XPath xpath, String resource, String family, String approval,
+            String type) throws Exception {
         Node root = getNode(doc, xpath, String.format("/rat-report/resource[@name='%s']", resource));
         if (family != null) {
             getNode(root, xpath, String.format("header-type[@name='%s']", ILicenseFamily.makeCategory(family)));
@@ -110,11 +123,43 @@ public static Node getNode(Object source, XPath xPath, String xpath) throws XPat
     public static final boolean isWellFormedXml(final InputStream in) throws Exception {
         return isWellFormedXml(new InputSource(in));
     }
-    
-    public static final Document toDom(final InputStream in) throws SAXException, IOException, ParserConfigurationException, FactoryConfigurationError {
+
+    public static final Document toDom(final InputStream in)
+            throws SAXException, IOException, ParserConfigurationException, FactoryConfigurationError {
         final DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
         Document result;
         result = builder.parse(in);
         return result;
     }
+
+    public static final void writeAttribute(final IXmlWriter writer, final String name, final boolean booleanValue)
+            throws IOException {
+        final String value = Boolean.toString(booleanValue);
+        writer.attribute(name, value);
+    }
+
+    /**
+     * Print the and XML document to the output stream
+     * 
+     * @param out the OutputStream to print the document to.
+     * @param document The XML DOM document to print
+     */
+    public static void printDocument(OutputStream out, Document document) {
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer;
+        try {
+            transformer = tf.newTransformer();
+
+            transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
+            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+
+            transformer.transform(new DOMSource(document), new StreamResult(new OutputStreamWriter(out, "UTF-8")));
+        } catch (TransformerException | UnsupportedEncodingException e) {
+            e.printStackTrace(new PrintStream(out));
+        }
+    }
+
 }

From f180af569e84a92d0359890e1e02ac902cb7db96 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 17:09:30 +0200
Subject: [PATCH 118/299] added javadocs

---
 .../builders/AbstractBuilder.java             | 17 ++++-
 .../configuration/builders/AllBuilder.java    |  3 +
 .../configuration/builders/AnyBuilder.java    |  3 +
 .../builders/ChildContainerBuilder.java       | 19 +++++
 .../builders/CopyrightBuilder.java            | 18 +++++
 .../builders/DelegatingBuilder.java           | 30 --------
 .../builders/MatcherRefBuilder.java           | 24 ++++++
 .../configuration/builders/NotBuilder.java    |  3 +
 .../configuration/builders/RegexBuilder.java  | 11 +++
 .../configuration/builders/SpdxBuilder.java   | 11 +++
 .../configuration/builders/TextBuilder.java   |  6 ++
 .../builders/TextCaptureBuilder.java          |  3 +
 .../java/org/apache/rat/license/ILicense.java | 73 ++++++++++++++++++-
 .../apache/rat/license/ILicenseBuilder.java   |  3 +
 .../apache/rat/license/ILicenseFamily.java    | 66 ++++++++++++-----
 .../rat/license/ILicenseFamilyBuilder.java    |  3 +
 .../org/apache/rat/license/SimpleLicense.java |  7 +-
 .../rat/license/SimpleLicenseFamily.java      |  6 +-
 18 files changed, 244 insertions(+), 62 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
index 6336eb01b..ba6334ebc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
@@ -18,8 +18,12 @@
  */
 package org.apache.rat.configuration.builders;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * An abstract IHeaderMatcher.Builder.
+ */
 public abstract class AbstractBuilder implements IHeaderMatcher.Builder {
 
     private String id;
@@ -27,15 +31,26 @@ public abstract class AbstractBuilder implements IHeaderMatcher.Builder {
     protected AbstractBuilder() {
     }
 
+    /**
+     * Set the id for the matcher.
+     * @param id the id to use.
+     * @return this builder for chaining.
+     */
     public final AbstractBuilder setId(String id) {
         this.id = id;
         return this;
     }
 
+    /**
+     * @return {@code true} if the id is not null and not blank.
+     */
     public final boolean hasId() {
-        return id != null;
+        return !StringUtils.isBlank(id);
     }
     
+    /**
+     * @return the id as specified in the builder.
+     */
     protected String getId() {
         return id;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java
index f5161e3fb..9c0980e5f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AllBuilder.java
@@ -21,6 +21,9 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.AndMatcher;
 
+/**
+ * Constructs a All matcher.
+ */
 public class AllBuilder extends ChildContainerBuilder {
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java
index 0a8a882cc..6ecb73e97 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AnyBuilder.java
@@ -21,6 +21,9 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.OrMatcher;
 
+/**
+ * Constructs an Any matcher.
+ */
 public class AnyBuilder extends ChildContainerBuilder {
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
index 411232887..60f21201b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
@@ -33,8 +33,14 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.Builder;
 
+/**
+ * Constructs a builder that contains other builders.
+ */
 public abstract class ChildContainerBuilder extends AbstractBuilder {
 
+    /**
+     * The list of builders that will build the enclosed matchers.
+     */
     protected final List<IHeaderMatcher.Builder> children = new ArrayList<IHeaderMatcher.Builder>();
 
     protected ChildContainerBuilder() {
@@ -63,16 +69,29 @@ public AbstractBuilder setResource(String resourceName) {
             }
     }
     
+    /**
+     * Adds a builder to the list of builders.
+     * @param child the child builder to add.
+     * @return this for chaining.
+     */
     public AbstractBuilder add(IHeaderMatcher.Builder child) {
         children.add(child);
         return this;
     }
     
+    /**
+     * Adds a collection of builders to the list of child builders.
+     * @param children the children to add.
+     * @return this for chaining.
+     */
     public AbstractBuilder add(Collection<IHeaderMatcher.Builder> children) {
         this.children.addAll(children);
         return this;
     }
 
+    /**
+     * @return the list of child builders for this builder.
+     */
     public List<IHeaderMatcher> getChildren() {
         return children.stream().map(IHeaderMatcher.Builder::build).collect(Collectors.toList());
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
index 6bc46d5d8..f38220ade 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/CopyrightBuilder.java
@@ -21,21 +21,39 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.CopyrightMatcher;
 
+/**
+ * A copyright builder.
+ */
 public class CopyrightBuilder extends AbstractBuilder {
     private String start;
     private String end;
     private String owner;
 
+    /**
+     * Sets the start date.
+     * @param start the start date for the copyright
+     * @return this for chaining
+     */
     public CopyrightBuilder setStart(String start) {
         this.start = start;
         return this;
     }
 
+    /**
+     * Sets the end date.
+     * @param end the End data for the copyright.
+     * @return this for chaining.
+     */
     public CopyrightBuilder setEnd(String end) {
         this.end = end;
         return this;
     }
 
+    /**
+     * Sets the owner.
+     * @param owner the owner for the copyright
+     * @return this for chaining.
+     */
     public CopyrightBuilder setOwner(String owner) {
         this.owner = owner;
         return this;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java
deleted file mode 100644
index 6e8a76db2..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/DelegatingBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.configuration.builders;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-
-public class DelegatingBuilder extends AbstractBuilder {
-    private AbstractBuilder delegate;
-
-    @Override
-    public IHeaderMatcher build() {
-        return delegate.build();
-    }
-}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
index c3f80923d..17918096a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/MatcherRefBuilder.java
@@ -22,15 +22,33 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * A reference matching Matcher builder.
+ * <p>
+ * This class stores a matcher id as a reference to the matcher.  It also has a map of matcher ids to the matcher
+ * instances.  When build is called the matcher reference is looked up in the map.  If it is found then it is returned
+ * value from the {@code build()} call.  If the reference is not located then a IHeaderMatcherProxy is returned.
+ * the IHeaderMatcherProxy is resolved in a later configuration construction phase.
+ */
 public class MatcherRefBuilder extends AbstractBuilder {
     private String referenceId;
     private Map<String, IHeaderMatcher> matchers;
 
+    /**
+     * Constructs the MatcherReferenceBuilder using the provided reference id.
+     * @param refId the reverence to the matcher id.
+     * @return this builder for chaining.
+     */
     public MatcherRefBuilder setRefId(String refId) {
         this.referenceId = refId;
         return this;
     }
 
+    /**
+     * Set the Map of matcher ids to matcher instances.
+     * @param matchers the Map of ids to instances.
+     * @return this builder for chaining.
+     */
     public MatcherRefBuilder setMatchers(Map<String, IHeaderMatcher> matchers) {
         this.matchers = matchers;
         return this;
@@ -47,6 +65,12 @@ public String toString() {
         return "MathcerRefBuilder: "+referenceId;
     }
     
+    /**
+     * A class that is a proxy to the actual matcher.  It retrieves the actual matcher from the map of
+     * matcher ids to matcher instances one the first use of the matcher.  This allows earlier read matchers
+     * to reference later constructed matchers as long as all the matchers are constructed before the earlier one is 
+     * used.
+     */
     private class IHeaderMatcherProxy implements IHeaderMatcher {
         private final String proxyId;
         private IHeaderMatcher wrapped;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
index 7297cadfe..57aec79cf 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
@@ -22,6 +22,9 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.NotMatcher;
 
+/**
+ * A builder for the NotMatcher.
+ */
 public class NotBuilder extends ChildContainerBuilder {
     
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
index dac1309d4..a132ba6c6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/RegexBuilder.java
@@ -24,10 +24,21 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.SimpleRegexMatcher;
 
+/**
+ * A builder for the regex matcher.
+ */
 public class RegexBuilder extends AbstractBuilder {
 
     private Pattern pattern;
 
+    /**
+     * Sets the regex expression. 
+     * This method compiles the string into a pattern and may throw any exception thrown by the 
+     * {@code Pattern.compile(String)} method.
+     * @param exp the expression as a string.
+     * @return this builder for chaining.
+     * @see Pattern#compile(String)
+     */
     public RegexBuilder setExpr(String exp) {
         this.pattern = exp == null ? null : Pattern.compile(exp);
         return this;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
index f2ffda3cc..42530147d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/SpdxBuilder.java
@@ -18,14 +18,25 @@
  */
 package org.apache.rat.configuration.builders;
 
+import java.util.Objects;
+
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.SPDXMatcherFactory;
 
+/**
+ * A build for SPDX matchers.
+ */
 public class SpdxBuilder extends AbstractBuilder {
 
     private String name;
 
+    /**
+     * sets the name for the SPDX matcher
+     * @param name
+     * @return
+     */
     public SpdxBuilder setName(String name) {
+        Objects.requireNonNull(name, "name must not be null");
         this.name = name;
         return this;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
index 89f893eb2..456afe03b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextBuilder.java
@@ -18,12 +18,17 @@
  */
 package org.apache.rat.configuration.builders;
 
+import java.util.Objects;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.FullTextMatcher;
 import org.apache.rat.analysis.matchers.SimpleTextMatcher;
 
+/**
+ * Builds text based matcher based on the complexity of the text to match.
+ */
 public class TextBuilder extends AbstractBuilder implements TextCaptureBuilder {
 
     private String text;
@@ -31,6 +36,7 @@ public class TextBuilder extends AbstractBuilder implements TextCaptureBuilder {
     @SuppressWarnings("unchecked")
     @Override
     public TextBuilder setText(String text) {
+        Objects.requireNonNull(text, "text may not be null");
         this.text = text;
         return this;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java
index 3844e8175..8ad765974 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/TextCaptureBuilder.java
@@ -18,6 +18,9 @@
  */
 package org.apache.rat.configuration.builders;
 
+/**
+ * A marker interface for builders that accept text plain text to match.
+ */
 public interface TextCaptureBuilder {
     <T extends TextCaptureBuilder> T setText(String text);
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index a84abd6e4..ee8e872de 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -23,23 +23,38 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * The definition of a License.
+ */
 public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
+    /**
+     * @return the ILicenseFamily implementation for this license.
+     */
     ILicenseFamily getLicenseFamily();
 
+    /**
+     * @return the notes associated with this license.  May be null or empty.
+     */
     String getNotes();
 
+    /**
+     * @return the id of a licens that this license is derived from. May be null.
+     */
     String derivedFrom();
 
+    /**
+     * @return An ILicense.Builder instance.
+     */
     public static ILicense.Builder builder() {
         return new ILicenseBuilder();
     }
 
     /**
-     * Search a set
+     * Search a SortedSet of licenses for the matching license id.
      * 
-     * @param licenseId
-     * @param licenses
-     * @return
+     * @param licenseId the id to search for.
+     * @param licenses the SortedSet of licenses to search.
+     * @return the matching license or {@code null} if not found.
      */
     static ILicense search(String licenseId, SortedSet<ILicense> licenses) {
         ILicenseFamily searchFamily = ILicenseFamily.builder().setLicenseFamilyCategory(licenseId)
@@ -95,28 +110,78 @@ public State currentState() {
         return search(target, licenses);
     }
 
+    /**
+     * Search a SortedSet of licenses for the matching license.
+     * 
+     * @param target the license to search for.
+     * @param licenses the SortedSet of licenses to search.
+     * @return the matching license or {@code null} if not found.
+     */
     static ILicense search(ILicense target, SortedSet<ILicense> licenses) {
         SortedSet<ILicense> part = licenses.tailSet(target);
         return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
 
+    /**
+     * @return The comparator for used to sort Licenses. 
+     */
     static Comparator<ILicense> getComparator() {
         return (x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily());
     }
 
+    /**
+     * The definition of a ILicense Builder.
+     */
     interface Builder {
+        /**
+         * @return A new License implementatin.
+         */
         ILicense build();
         
+        /**
+         * Sets the matcher from a builder.
+         * @param matcher the builder for the matcher for the license.
+         * @return this builder for chaining.
+         */
         Builder setMatcher(IHeaderMatcher.Builder matcher);
         
+        /**
+         * Sets the matcher.
+         * @param matcher the matcher for the license.
+         * @return this builder for chaining.
+         */
         Builder setMatcher(IHeaderMatcher matcher);
 
+        /**
+         * Sets the notes for the license.
+         * If called multiple times the notes are concatenated to create a single note.
+         * @param notes the notes for the license.
+         * @return this builder for chaining.
+         */
         Builder setNotes(String notes);
 
+        /**
+         * Sets the derived from fields in the license.
+         * @param derivedFrom the family category of the license this license was derived from.
+         * @return this builder for chaining.
+         */
         Builder setDerivedFrom(String derivedFrom);
 
+        /**
+         * Set the family category for this license.
+         * The category must be unique across all licenses and must be 5 characters. If more than 
+         * 5 characters are provided then only the first 5 are taken.  If fewer than 5 characters are provided
+         * the category is padded with spaces.
+         * @param licenseFamilyCategory the family category for the license.
+         * @return this builder for chaining.
+         */
         Builder setLicenseFamilyCategory(String licenseFamilyCategory);
 
+        /**
+         * Set the family name for this license.
+         * @param licenseFamilyName the family name for the license.
+         * @return this builder for chaining.
+         */
         Builder setLicenseFamilyName(String licenseFamilyName);
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
index 8a3e69f66..8f9210cb8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
@@ -21,6 +21,9 @@
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.license.ILicense.Builder;
 
+/**
+ * An implementation of the ILicense Builder.
+ */
 class ILicenseBuilder implements Builder {
 
     private IHeaderMatcher.Builder matcher;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index cdef95b76..e1369752f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -20,15 +20,33 @@
 
 import java.util.SortedSet;
 
+/**
+ * The definition of the license family.
+ */
 public interface ILicenseFamily extends Comparable<ILicenseFamily> {
+    /**
+     * @return the license family name.
+     */
     String getFamilyName();
 
+    /**
+     * @return the license family category.
+     */
     String getFamilyCategory();
 
+    /**
+     * @return A builder for an ILicenseFamily.
+     */
     static ILicenseFamily.Builder builder() {
         return new ILicenseFamilyBuilder();
     }
 
+    /**
+     * Convert a potential category string into a category string of exactly 5 characters either buy truncating
+     * the string or appending spaces as necessary.
+     * @param cat the string to convert.
+     * @return a string of exactly 5 characters.
+     */
     static String makeCategory(String cat) {
         return cat == null ? "     " : cat.concat("     ").substring(0, 5);
     }
@@ -38,32 +56,40 @@ default int compareTo(ILicenseFamily other) {
         return getFamilyCategory().compareTo(other.getFamilyCategory());
     }
 
-//    does not work -- revisit if needed
-//    static ILicenseFamily search(String licenseCategory, SortedSet<ILicenseFamily> licenses) {
-//        ILicenseFamily target = new ILicenseFamily() {
-//            @Override
-//            public String getFamilyName() {
-//                return licenseCategory;
-//            }
-//
-//            @Override
-//            public String getFamilyCategory() {
-//                return "Searching family";
-//            }
-//        };
-//        return search(target, licenses);
-//    }
 
-    static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenses) {
-        SortedSet<ILicenseFamily> part = licenses.tailSet(target);
+    /**
+     * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
+     * @param target The instance to serch  for.
+     * @param licenseFamilies the license families to search
+     * @return
+     */
+    static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenseFamilies) {
+        SortedSet<ILicenseFamily> part = licenseFamilies.tailSet(target);
         return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
 
+    /**
+     * The definition of an ILicenseFamily builder.
+     */
     interface Builder {
-        public Builder setLicenseFamilyCategory(String licenseFamilyCategory);
+        /**
+         * Sets the license family category.  Will trim or extends the string with spaces to ensure that it is
+         * exactly 5 characters.
+         * @param licenseFamilyCategory the category string
+         * @return this builder for chaining.
+         */
+        Builder setLicenseFamilyCategory(String licenseFamilyCategory);
 
-        public Builder setLicenseFamilyName(String licenseFamilyName);
+        /**
+         * Sets the license family name. 
+         * @param licenseFamilyName the name string
+         * @return this builder for chaining.
+         */
+        Builder setLicenseFamilyName(String licenseFamilyName);
 
-        public ILicenseFamily build();
+        /**
+         * @return a new ILicenseFamily instance.
+         */
+        ILicenseFamily build();
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
index 41d2e15da..917bdfbf3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
@@ -22,6 +22,9 @@
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.license.ILicenseFamily.Builder;
 
+/**
+ * An instance of the ILicenseFamily Builder.
+ */
 public class ILicenseFamilyBuilder implements Builder {
 
     private String licenseFamilyCategory;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index da392b410..4d9da9764 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -20,6 +20,9 @@
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
+/**
+ * A simple implementation of ILicense.
+ */
 class SimpleLicense implements ILicense {
 
     private ILicenseFamily family;
@@ -27,7 +30,7 @@ class SimpleLicense implements ILicense {
     private String derivedFrom;
     private String notes;
 
-    public SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, String derivedFrom, String notes) {
+    SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, String derivedFrom, String notes) {
         this.family = family;
         this.matcher = matcher;
         this.derivedFrom = derivedFrom;
@@ -103,6 +106,4 @@ public String getNotes() {
     public String derivedFrom() {
         return derivedFrom;
     }
-
-    
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
index 0a6300c63..75d9064b2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
@@ -19,15 +19,13 @@
 package org.apache.rat.license;
 
 /**
- * Trivial bean implementing ILicenseFamily
- * 
- * @since Rat 0.8
+ * An implementation of the ILicenseFamily.
  */
 class SimpleLicenseFamily implements ILicenseFamily {
     private String familyName;
     private String familyCategory;
 
-    public SimpleLicenseFamily(String familyId, String familyName) {
+    SimpleLicenseFamily(String familyId, String familyName) {
         this.familyCategory = ILicenseFamily.makeCategory(familyId);
         this.familyName = familyName;
     }

From 1ff0c4c16ea23c21e2707a36d7480bca21732ed6 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 19:06:00 +0200
Subject: [PATCH 119/299] added javadoc

---
 .../org/apache/rat/policy/DefaultPolicy.java  | 38 ++++++++++++++-----
 .../rat/report/xml/XmlReportFactory.java      | 11 +++++-
 .../rat/report/xml/writer/IXmlWriter.java     |  6 +--
 .../apache/rat/policy/DefaultPolicyTest.java  | 10 -----
 4 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 5989f060b..33883edcc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -28,16 +28,27 @@
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicenseFamily;
 
+/**
+ * A default Document Analyser that determines if the matched license is in the set of approved licenses.
+ */
 public class DefaultPolicy implements IDocumentAnalyser {
-    private SortedSet<ILicenseFamily> approvedLicenseNames;
+    private SortedSet<ILicenseFamily> approvedLicenseFamilies;
 
-    public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseNames) {
-        this.approvedLicenseNames = new TreeSet<>();
-        this.approvedLicenseNames.addAll(approvedLicenseNames);
+    /**
+     * Constructor with the list of approved license families.
+     * @param approvedLicenseFamilies the approved license families.
+     */
+    public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseFamilies) {
+        this.approvedLicenseFamilies = new TreeSet<>();
+        this.approvedLicenseFamilies.addAll(approvedLicenseFamilies);
     }
 
+    /**
+     * adds an ILicenseFamily to the list of approved licenses.
+     * @param approvedLicense
+     */
     public void add(ILicenseFamily approvedLicense) {
-        this.approvedLicenseNames.add(approvedLicense);
+        this.approvedLicenseFamilies.add(approvedLicense);
     }
 
     @Override
@@ -50,18 +61,27 @@ public void analyse(final Document document) {
                                 document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY))
                         .setLicenseFamilyName(document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME))
                         .build();
-                approval = approvedLicenseNames.contains(licenseFamily);
+                approval = approvedLicenseFamilies.contains(licenseFamily);
             }
             reportLicenseApprovalClaim(document, approval);
         }
     }
 
-    public void reportLicenseApprovalClaim(final Document subject, final boolean isAcceptable) {
-        subject.getMetaData().set(//
+    /**
+     * Report if the document as either having approved license or not.
+     * @param document the document to approve.
+     * @param isAcceptable {@code true} if the license is an approved one, {@code false} otherwise.
+     */
+    public void reportLicenseApprovalClaim(final Document document, final boolean isAcceptable) {
+        document.getMetaData().set(
                 isAcceptable ? MetaData.RAT_APPROVED_LICENSE_DATIM_TRUE : MetaData.RAT_APPROVED_LICENSE_DATIM_FALSE);
     }
 
+    /**
+     * Gets and unmodifiable reference to the SortedSet of approved licenses that this policy is holding.
+     * @return
+     */
     public SortedSet<ILicenseFamily> getApprovedLicenseNames() {
-        return Collections.unmodifiableSortedSet(approvedLicenseNames);
+        return Collections.unmodifiableSortedSet(approvedLicenseFamilies);
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
index ebef2de21..8e9fe8ee8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
@@ -36,10 +36,19 @@
 import java.util.List;
 
 /**
- * Creates reports.
+ * A factory to create reports from a writer and a configuration.
  *
  */
 public class XmlReportFactory {
+    /**
+     * Creates a RatReport from the arguments.
+     * The {@code statistic} is used to create a ClaimAggregator.
+     * If the {@code configuration} indicates that licenses should be added a LicenseAddingReport is added.
+     * @param writer The XML writer to send output to.
+     * @param statistic the ClaimStatistics for the report. may be null.
+     * @param configuration The report configuration.
+     * @return a RatReport instance.
+     */
     public static final RatReport createStandardReport(IXmlWriter writer,
             final ClaimStatistic statistic, ReportConfiguration configuration) {
         final List<RatReport> reporters = new ArrayList<>();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java
index 48e1ab7e4..cad0768cc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/IXmlWriter.java
@@ -21,11 +21,11 @@
 import java.io.IOException;
 
 /**
- * Simple interface for creating basic xml documents.
+ * Simple interface for creating basic XML documents.
  * Performs basic validation and escaping.
- * Not namespace aware (may reconsider this later).
+ * Not namespace aware.
  */
-public interface IXmlWriter extends AutoCloseable{
+public interface IXmlWriter extends AutoCloseable {
 
     /**
      * Starts a document by writing a prolog.
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 8ed209cdd..fdcda06e2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -124,16 +124,6 @@ public void testUnknownFamily() throws Exception {
         assertApproval(false);
     }
 
-//    @Test
-//    public void testNullAsMarkerOfDefaults() {
-//        // without defaults and no additions == 0
-//        for (DefaultPolicy policy : new DefaultPolicy[] { //
-//                new DefaultPolicy(new ArrayList<ILicenseFamily>(0)), //
-//                new DefaultPolicy(new ILicenseFamily[] {}), }) {
-//            assertEquals(0, policy.getApprovedLicenseNames().size());
-//        }
-//    }
-
     @Test
     public void testAddNewApprovedLicenseAndDefaults() {
         ILicenseFamily testingFamily = makeFamily("test", "Testing License Family");

From 1406fe7d229313997b82e2735dcf8c0557ad89ab Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 8 Oct 2023 22:52:08 +0200
Subject: [PATCH 120/299] updated javadocs

---
 .../org/apache/rat/report/xml/writer/impl/base/XmlWriter.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
index e71c4c674..36365a024 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
@@ -411,6 +411,10 @@ public final class XmlWriter implements IXmlWriter {
     boolean inElement = false;
     boolean prologWritten = false;
 
+    /**
+     * Constructs an XmlWriter with the specified writer for output.
+     * @param writer the writer to write to.
+     */
     public XmlWriter(final Writer writer) {
         this.writer = writer;
         this.elementNames = new ArrayDeque<>();

From 524bcf5b80750aeb3f25ab3770b7f22d78bffc42 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 18 Oct 2023 22:06:38 +0200
Subject: [PATCH 121/299] RAT-311: Remove misleading comment about JDK version
 that is easily forgotten

---
 apache-rat/README-ANT.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apache-rat/README-ANT.txt b/apache-rat/README-ANT.txt
index f47bd9798..658c7bc63 100644
--- a/apache-rat/README-ANT.txt
+++ b/apache-rat/README-ANT.txt
@@ -11,7 +11,6 @@ Requirements
 ------------
 
 The Rat Ant Task Library requires Apache Ant 1.7.1 or higher (it works well with 1.8.x)
-It also requires at least Java 1.5.
 
 Installation
 ------------

From b40357b4b08cae8424e55e3cecb61ebd651b8bbd Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 18 Oct 2023 22:06:57 +0200
Subject: [PATCH 122/299] RAT-311: Streamline project name in JAR and use same
 java check as main project

---
 apache-rat/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index 16cd10aff..4134d5715 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -94,11 +94,11 @@
             <manifestEntries>
               <Main-Class>org.apache.rat.Report</Main-Class>
               <Extension-Name>rat</Extension-Name>
-              <Specification-Title>Apache Rat</Specification-Title>
+              <Specification-Title>Apache Creadur RAT</Specification-Title>
               <Specification-Vendor>apache.org</Specification-Vendor>
               <Specification-Version>${project.version}</Specification-Version>
               <Implementation-Vendor-Id>apache.org</Implementation-Vendor-Id>
-              <Implementation-Title>Apache Rat</Implementation-Title>
+              <Implementation-Title>Apache Creadur RAT</Implementation-Title>
               <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
               <Implementation-Version>${project.version}</Implementation-Version>
             </manifestEntries>
@@ -112,7 +112,7 @@
         <executions>
           <execution>
             <!-- This sub project has no source code, so we need to skip animal sniffer -->
-            <id>check-java-1.5-compat</id>
+            <id>check-java-1.8-compat</id>
             <configuration>
               <skip>true</skip>
             </configuration>

From b1685f8dcbff47c3bdbc05b76a6536c8ae9c6320 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 20 Oct 2023 21:35:28 +0200
Subject: [PATCH 123/299] RAT-321: Add changelog about new XML configuration

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 855a462ed..f149743ba 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-321" type="add" dev="pottlinger" due-to="Claude Warren">
+         Allow text-based XML configuration of RAT.
+      </action>
       <action issue="RAT-311" type="fix" dev="pottlinger">
          Update commons-compress to 1.24.0 in order to circumvent CVE-2023-42503.
       </action>

From 9e171b68617e7285918fc35e781ffa4f99d4ec81 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 20 Oct 2023 21:39:39 +0200
Subject: [PATCH 124/299] Use last release in examples

---
 ant-task-examples.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ant-task-examples.xml b/ant-task-examples.xml
index 2a2ee699a..8f0cb03cd 100644
--- a/ant-task-examples.xml
+++ b/ant-task-examples.xml
@@ -25,7 +25,7 @@
   </description>
 
   <property name="src-dir" location="apache-rat-core/src/main/java"/>
-  <property name="version" value="0.13"/>
+  <property name="version" value="0.15"/>
   <property name="src-jar"
             location="apache-rat-core/target/apache-rat-core-${version}-sources.jar"/>
 

From c96982bef8a2276bb611d39108af9683f9606672 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sat, 21 Oct 2023 22:40:56 +0200
Subject: [PATCH 125/299] RAT-316: Add default exclusion of MANIFEST.MF as it
 must not contain comment lines to include a license

---
 .../main/java/org/apache/rat/mp/util/ExclusionHelper.java   | 1 +
 .../java/org/apache/rat/mp/util/ExclusionHelperTest.java    | 6 +++---
 src/changes/changes.xml                                     | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
index fa7c74b9c..0ab75e903 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
@@ -40,6 +40,7 @@ public final class ExclusionHelper {
             .unmodifiableList(Arrays.asList(//
                     "target/**/*", //
                     "cobertura.ser", //
+                    "**/MANIFEST.MF", // a MANIFEST.MF file cannot contain comment lines. In other words: It is not possible, to include a license.
                     "release.properties", //
                     ".repository", // Used by Jenkins when a Maven job uses a private repository that is "Local to the workspace"
                     "build.log", // RAT-160: until now maven-invoker-plugin runs create a build.log that is not part of a release
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
index e1fd9c5d0..ff31723b2 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
@@ -49,7 +49,7 @@ public void testNumberOfExclusions() {
                 ECLIPSE_DEFAULT_EXCLUDES.size());
         assertEquals("Did you change the number of idea excludes?", 4,
                 IDEA_DEFAULT_EXCLUDES.size());
-        assertEquals("Did you change the number of mvn excludes?", 7,
+        assertEquals("Did you change the number of mvn excludes?", 8,
                 MAVEN_DEFAULT_EXCLUDES.size());
     }
 
@@ -81,9 +81,9 @@ public void testAddingMavenExclusions() {
         addMavenDefaults(log, false, exclusion);
         assertTrue(exclusion.isEmpty());
         addMavenDefaults(log, true, exclusion);
-        assertEquals(7, exclusion.size());
+        assertEquals(8, exclusion.size());
         addMavenDefaults(log, true, exclusion);
-        assertEquals(7, exclusion.size());
+        assertEquals(8, exclusion.size());
     }
 
     @Test
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f149743ba..becfd5d34 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-316" type="add" dev="pottlinger">
+         Add default exclusion of MANIFEST.MF as it must not contain comment lines to include a license.
+      </action>
       <action issue="RAT-321" type="add" dev="pottlinger" due-to="Claude Warren">
          Allow text-based XML configuration of RAT.
       </action>

From 6034936f7a63e8a8d98558ccf654e0a338d37cd4 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 22 Oct 2023 13:53:12 +0200
Subject: [PATCH 126/299] Fix for bad reporting of license status for non
 standard documents (e.g. binary).

Collected license filtering into new LicenseSetFactory class and applied it where expected.
Added more tests to DefaultsTests
Added more tests to ReportConfigurtionTest
---
 .../main/java/org/apache/rat/Defaults.java    |  61 ++---
 .../src/main/java/org/apache/rat/Report.java  |   2 +-
 .../org/apache/rat/ReportConfiguration.java   |  33 +--
 .../rat/analysis/HeaderCheckWorker.java       |   8 +-
 .../apache/rat/analysis/UnknownLicense.java   |  92 +++++++
 .../java/org/apache/rat/api/MetaData.java     |   8 +-
 .../java/org/apache/rat/license/ILicense.java |  74 ------
 .../apache/rat/license/ILicenseFamily.java    |  14 --
 .../apache/rat/license/LicenseSetFactory.java | 228 ++++++++++++++++++
 .../org/apache/rat/policy/DefaultPolicy.java  |  12 +-
 .../rat/report/xml/XmlReportFactory.java      |   2 +-
 .../main/resources/org/apache/rat/default.xml |   6 +-
 .../java/org/apache/rat/DefaultsTest.java     |   3 +-
 .../apache/rat/ReportConfigurationTest.java   |  46 +++-
 .../java/org/apache/rat/ReporterTest.java     |  30 +--
 .../analysis/license/AbstractLicenseTest.java |  21 +-
 .../AppliedApacheSoftwareLicenseTest.java     |   2 +-
 .../apache/rat/policy/DefaultPolicyTest.java  | 169 ++++++++-----
 .../rat/testhelpers/TestingLicense.java       |  64 ++++-
 .../rat/testhelpers/TestingMatcher.java       |  17 ++
 .../java/org/apache/rat/mp/RatCheckMojo.java  |   4 +-
 .../java/org/apache/rat/mp/RatReportMojo.java |  22 +-
 .../java/org/apache/rat/anttasks/Report.java  |   9 +-
 23 files changed, 619 insertions(+), 308 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index c5ead2beb..84885c366 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -23,7 +23,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Set;
 import java.util.SortedSet;
@@ -35,6 +34,8 @@
 import org.apache.rat.configuration.MatcherReader;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 
 /**
  * A class that holds the list of licenses and approved licences from one or more Configuration file.
@@ -54,15 +55,8 @@ public class Defaults {
      */
     public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
 
-    /**
-     * The set of defined licenses.
-     */
-    private final SortedSet<ILicense> licenses;
-    /**
-     * The set of approved license ids.
-     */
-    private final SortedSet<String> approvedLicenseIds;
-
+    private LicenseSetFactory setFactory;
+    
     /**
      * Initialize the system configuration reader..
      */
@@ -76,9 +70,8 @@ public static void init() {
     /**
      * Builder constructs instances.
      */
-    private Defaults() {
-        licenses = new TreeSet<>(ILicense.getComparator());
-        approvedLicenseIds = new TreeSet<>();
+    private Defaults(Set<URL> urls) {
+        this.setFactory = Defaults.readConfigFiles(urls);
     }
 
     /**
@@ -89,19 +82,16 @@ public static Builder builder() {
         return new Builder();
     }
 
-    /**
-     * Clears all licenses and approved licenses.
-     */
-    public void clear() {
-        licenses.clear();
-        approvedLicenseIds.clear();
-    }
-
     /**
      * Reads the configuration files.
      * @param urls the URLS to read.
      */
-    private void readConfigFiles(Collection<URL> urls) {
+    private static LicenseSetFactory readConfigFiles(Collection<URL> urls) {
+
+        SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
+
+        SortedSet<String> approvedLicenseIds = new TreeSet<String>();
+
         for (URL url : urls) {
             Format fmt = Format.fromURL(url);
             MatcherReader mReader = fmt.matcherReader();
@@ -117,6 +107,7 @@ private void readConfigFiles(Collection<URL> urls) {
                 lReader.approvedLicenseId().stream().map(ILicenseFamily::makeCategory).forEach(approvedLicenseIds::add);
             }
         }
+        return new LicenseSetFactory(licenses, approvedLicenseIds);
     }
 
     /**
@@ -135,11 +126,12 @@ public static IOSupplier<InputStream> getUnapprovedLicensesStyleSheet() {
         return () -> Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
     }
 
-    /**
-     * @return the sorted set of defined licenses.
-     */
-    public SortedSet<ILicense> getLicenses() {
-        return Collections.unmodifiableSortedSet(licenses);
+    public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
+        return setFactory.getLicenses(filter);
+    }
+    
+    public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
+        return setFactory.getLicenseFamilies(filter);
     }
 
     /**
@@ -147,15 +139,10 @@ public SortedSet<ILicense> getLicenses() {
      * If not licenses have been explicitly listed as approved all licenses are assumed to be approved.
      * @return The sorted set of approved licenseIds.
      */
-    public SortedSet<String> getLicenseIds() {
-        if (approvedLicenseIds.isEmpty()) {
-            SortedSet<String> result = new TreeSet<>();
-            licenses.stream().map(x -> x.getLicenseFamily().getFamilyCategory()).forEach(result::add);
-            return result;
-        }
-        return Collections.unmodifiableSortedSet(approvedLicenseIds);
+    public SortedSet<String> getLicenseIds(LicenseFilter filter) {
+        return setFactory.getLicenseFamilyIds(filter);
     }
-
+    
     /**
      * The Defaults builder.
      */
@@ -247,9 +234,7 @@ public Builder noDefault() {
          * Builds the defaults object.
          */
         public Defaults build() {
-            Defaults result = new Defaults();
-            result.readConfigFiles(fileNames);
-            return result;
+            return new Defaults(fileNames);
         }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index a2fe778a3..2ce2be02c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -45,10 +45,10 @@
 import org.apache.commons.io.filefilter.RegexFileFilter;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.walker.ArchiveWalker;
 import org.apache.rat.walker.DirectoryWalker;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 394903530..c3dbff3c0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -38,6 +38,8 @@
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 
 /**
@@ -46,19 +48,7 @@
  * configuration and invoke the {@link Reporter}.
  */
 public class ReportConfiguration {
-    /**
-     * An enum that defines the types of License filters.
-     */
-    public enum LicenseFilter {
-        /** All defined licenses are returned */
-        all,
-        /** Only approved licenses are returned */
-        approved,
-        /** No licenses are returned */
-        none
-    }
-
-    private SortedSet<ILicense> licenses = new TreeSet<>(ILicense.getComparator());
+    private SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
     private SortedSet<String> approvedLicenseCategories = new TreeSet<>();
     private SortedSet<String> removedLicenseCategories = new TreeSet<>();
     private boolean addingLicenses;
@@ -69,7 +59,6 @@ public enum LicenseFilter {
     private IOSupplier<InputStream> styleSheet = null;
     private IReportable reportable = null;
     private FilenameFilter inputFileFilter = null;
-    // private LicenseFilter approvalFilter = LicenseFilter.approved;
 
     /**
      * @return The filename filter for the potential input files.
@@ -121,8 +110,8 @@ public void setStyleSheet(IOSupplier<InputStream> styleSheet) {
      * @param defaults The defaults to set.
      */
     public void setFrom(Defaults defaults) {
-        addLicenses(defaults.getLicenses());
-        addApprovedLicenseCategories(defaults.getLicenseIds());
+        addLicenses(defaults.getLicenses(LicenseFilter.all));
+        addApprovedLicenseCategories(defaults.getLicenseIds(LicenseFilter.approved));
         if (isStyleReport() && getStyleSheet() == null) {
             setStyleSheet(Defaults.getPlainStyleSheet());
         }
@@ -354,14 +343,10 @@ public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
         case all:
             return Collections.unmodifiableSortedSet(licenses);
         case approved:
-            SortedSet<String> approvedLicenses = getApprovedLicenseCategories();
-            SortedSet<ILicense> result = new TreeSet<>(ILicense.getComparator());
-            licenses.stream().filter(x -> approvedLicenses.contains(x.getLicenseFamily().getFamilyCategory()))
-                    .forEach(result::add);
-            return result;
+            return new LicenseSetFactory(licenses, getApprovedLicenseCategories()).getLicenses(filter);
         case none:
         default:
-            return Collections.emptySortedSet();
+            return LicenseSetFactory.emptyLicenseSet();
         }
     }
 
@@ -378,9 +363,7 @@ public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
      * @return The set of defined licenses.
      */
     public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
-        SortedSet<ILicenseFamily> result = new TreeSet<>();
-        getLicenses(filter).stream().map(ILicense::getLicenseFamily).forEach(result::add);
-        return result;
+        return new LicenseSetFactory(licenses, getApprovedLicenseCategories()).getLicenseFamilies(filter);
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
index f4ec3832c..01ef13b71 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
@@ -110,12 +110,8 @@ public void read() throws RatHeaderAnalysisException {
                 if (license.finalizeState().asBoolean()) {
                     document.getMetaData().reportOnLicense(license);
                 } else {
-                    final String notes = headers.toString();
-                    final MetaData metaData = document.getMetaData();
-                    metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, notes));
-                    metaData.set(new MetaData.Datum(MetaData.RAT_URL_HEADER_CATEGORY,
-                            MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN));
-                    metaData.set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN);
+                    document.getMetaData().reportOnLicense(UnknownLicense.INSTANCE);
+                    document.getMetaData().set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, headers.toString()));
                 }
             } catch (IOException e) {
                 throw new RatHeaderAnalysisException("Cannot read header for " + document, e);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java
new file mode 100644
index 000000000..259a5ea9c
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.analysis;
+
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.ILicenseFamilyBuilder;
+
+/**
+ * An ILicense implementation that represents an unknown license.
+ * <p>
+ * The UnknownLicense is used during processing to report that a document license can not be determined.
+ * </p>
+ */
+public class UnknownLicense implements ILicense {
+    
+    /**
+     * The single instance of this class.
+     */
+    static final UnknownLicense INSTANCE = new UnknownLicense();
+    
+    private final ILicenseFamily family ;
+    
+    /**
+     * Do not allow other constructions.
+     */
+    private UnknownLicense() {
+        family = new ILicenseFamilyBuilder().setLicenseFamilyCategory("?????")
+                .setLicenseFamilyName("?????").build();
+    }
+    
+    @Override
+    public String getId() {
+        return "?????";
+    }
+
+    @Override
+    public void reset() {
+        // do nothing
+    }
+
+    @Override
+    public State matches(String line) {
+        return State.f;
+    }
+
+    @Override
+    public State finalizeState() {
+        return State.f;
+    }
+
+    @Override
+    public State currentState() {
+        return State.f;
+    }
+
+    @Override
+    public int compareTo(ILicense arg0) {
+        return getLicenseFamily().compareTo(arg0.getLicenseFamily());
+    }
+
+    @Override
+    public ILicenseFamily getLicenseFamily() {
+        return family;
+    }
+
+    @Override
+    public String getNotes() {
+        return null;
+    }
+
+    @Override
+    public String derivedFrom() {
+        return null;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index d3dd7bfb8..830722b6a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -180,8 +180,12 @@ public class MetaData {
     public static final String RAT_URL_APPROVED_LICENSE = RAT_BASE_URL + "#ApprovedLicense";
     public static final String RAT_APPROVED_LICENSE_VALUE_TRUE = Boolean.TRUE.toString();
     public static final String RAT_APPROVED_LICENSE_VALUE_FALSE = Boolean.FALSE.toString();
-    public static final Datum RAT_APPROVED_LICENSE_DATIM_TRUE = new Datum(RAT_URL_APPROVED_LICENSE, RAT_APPROVED_LICENSE_VALUE_TRUE);
-    public static final Datum RAT_APPROVED_LICENSE_DATIM_FALSE = new Datum(RAT_URL_APPROVED_LICENSE, RAT_APPROVED_LICENSE_VALUE_FALSE);
+    public static final Datum RAT_APPROVED_LICENSE_DATUM_TRUE = new Datum(RAT_URL_APPROVED_LICENSE, RAT_APPROVED_LICENSE_VALUE_TRUE);
+    public static final Datum RAT_APPROVED_LICENSE_DATUM_FALSE = new Datum(RAT_URL_APPROVED_LICENSE, RAT_APPROVED_LICENSE_VALUE_FALSE);
+    @Deprecated
+    public static final Datum RAT_APPROVED_LICENSE_DATIM_TRUE = RAT_APPROVED_LICENSE_DATUM_TRUE;
+    @Deprecated
+    public static final Datum RAT_APPROVED_LICENSE_DATIM_FALSE = RAT_APPROVED_LICENSE_DATUM_FALSE;
 
     /** 
      * Only likely to be a small quantity of data 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index ee8e872de..c0f3c55c5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -19,7 +19,6 @@
 package org.apache.rat.license;
 
 import java.util.Comparator;
-import java.util.SortedSet;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
@@ -49,79 +48,6 @@ public static ILicense.Builder builder() {
         return new ILicenseBuilder();
     }
 
-    /**
-     * Search a SortedSet of licenses for the matching license id.
-     * 
-     * @param licenseId the id to search for.
-     * @param licenses the SortedSet of licenses to search.
-     * @return the matching license or {@code null} if not found.
-     */
-    static ILicense search(String licenseId, SortedSet<ILicense> licenses) {
-        ILicenseFamily searchFamily = ILicenseFamily.builder().setLicenseFamilyCategory(licenseId)
-                .setLicenseFamilyCategory("searching proxy").build();
-        ILicense target = new ILicense() {
-
-            @Override
-            public String getId() {
-                return licenseId;
-            }
-
-            @Override
-            public void reset() {
-                // do nothing
-            }
-
-            @Override
-            public State matches(String line) {
-                return State.f;
-            }
-
-            @Override
-            public int compareTo(ILicense arg0) {
-                return searchFamily.compareTo(arg0.getLicenseFamily());
-            }
-
-            @Override
-            public ILicenseFamily getLicenseFamily() {
-                return searchFamily;
-            }
-
-            @Override
-            public String getNotes() {
-                return null;
-            }
-
-            @Override
-            public String derivedFrom() {
-                return null;
-            }
-
-            @Override
-            public State finalizeState() {
-                return State.f;
-            }
-
-            @Override
-            public State currentState() {
-                return State.f;
-            }
-
-        };
-        return search(target, licenses);
-    }
-
-    /**
-     * Search a SortedSet of licenses for the matching license.
-     * 
-     * @param target the license to search for.
-     * @param licenses the SortedSet of licenses to search.
-     * @return the matching license or {@code null} if not found.
-     */
-    static ILicense search(ILicense target, SortedSet<ILicense> licenses) {
-        SortedSet<ILicense> part = licenses.tailSet(target);
-        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
-    }
-
     /**
      * @return The comparator for used to sort Licenses. 
      */
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index e1369752f..d331223bb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -18,8 +18,6 @@
  */
 package org.apache.rat.license;
 
-import java.util.SortedSet;
-
 /**
  * The definition of the license family.
  */
@@ -56,18 +54,6 @@ default int compareTo(ILicenseFamily other) {
         return getFamilyCategory().compareTo(other.getFamilyCategory());
     }
 
-
-    /**
-     * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
-     * @param target The instance to serch  for.
-     * @param licenseFamilies the license families to search
-     * @return
-     */
-    static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenseFamilies) {
-        SortedSet<ILicenseFamily> part = licenseFamilies.tailSet(target);
-        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
-    }
-
     /**
      * The definition of an ILicenseFamily builder.
      */
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
new file mode 100644
index 000000000..a097733a0
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */package org.apache.rat.license;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+/**
+ * Class to take a set of ILicenses and collecton of approved license categories and extract Subsets.
+ */
+public class LicenseSetFactory {
+    
+    /**
+     * An enum that defines the types of Licenses to extract.
+     */
+    public enum LicenseFilter {
+        /** All defined licenses are returned */
+        all,
+        /** Only approved licenses are returned */
+        approved,
+        /** No licenses are returned */
+        none
+    }
+
+    private final SortedSet<ILicense> licenses;
+    private final Collection<String> approvedLicenses;
+    
+    /**
+     * Constructs a factory with the specified set of Licenses and the approved license collection.
+     * @param licenses the set of defined licenses.
+     * @param approvedLicenses the list of approved licenses.
+     */
+    public LicenseSetFactory(SortedSet<ILicense> licenses, Collection<String> approvedLicenses) {
+        this.licenses = licenses;
+        this.approvedLicenses = approvedLicenses;
+    }
+    
+    /**
+     * Create an empty sorted Set with proper comparator.
+     * @return An empty sorted set of ILicense objects.
+     */
+    public static SortedSet<ILicense> emptyLicenseSet() {
+        return new TreeSet<>(ILicense.getComparator());
+    }
+    
+    /**
+     * Create an empty sorted Set with proper comparator.
+     * @return An empty sorted set of ILicenseFamily objects.
+     */
+    public static SortedSet<ILicenseFamily> emptyLicenseFamilySet() {
+        return new TreeSet<>();
+    }
+
+    /**
+     * Create a sorted set of licenses families from the collection.
+     * @param licenses the collection of all licenses.
+     * @return a SortedSet of license families from the collection.
+     */
+    private static SortedSet<ILicenseFamily> extractFamily(Collection<ILicense> licenses) {
+        SortedSet<ILicenseFamily> result = new TreeSet<>();
+        licenses.stream().map( ILicense::getLicenseFamily ).forEach(result::add);
+        return result;
+    }
+
+    /**
+     * Gets the License objects based on the filter.
+     * @param filter the types of LicenseFamily objects to return.
+     * @return a SortedSet of ILicense objects.
+     */
+    public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
+        switch (filter) {
+        case all:
+            return Collections.unmodifiableSortedSet(licenses);
+        case approved:
+            SortedSet<ILicense> result = LicenseSetFactory.emptyLicenseSet();
+            licenses.stream().filter(x -> approvedLicenses.contains(x.getLicenseFamily().getFamilyCategory()))
+                    .forEach(result::add);
+            return result;
+        case none:
+        default:
+            return Collections.emptySortedSet();
+        }
+    }
+    
+    /**
+     * Gets the LicenseFamily objects based on the filter.
+     * @param filter the types of LicenseFamily objects to return.
+     * @return a SortedSet of ILicenseFamily objects.
+     */
+    public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
+        switch (filter) {
+        case all:
+            return extractFamily(licenses);
+        case approved:
+            SortedSet<ILicenseFamily> result = LicenseSetFactory.emptyLicenseFamilySet();
+            licenses.stream().map(ILicense::getLicenseFamily)
+            .filter(x -> approvedLicenses.contains(x.getFamilyCategory()))
+                    .forEach(result::add);
+            return result;
+        case none:
+        default:
+            return Collections.emptySortedSet();
+        }
+    }
+    
+    /**
+     * Gets the categories fof LicenseFamily objects based on the filter.
+     * @param filter the types of LicenseFamily objects to return.
+     * @return a SortedSet of ILicenseFamily categories.
+     */
+    public SortedSet<String> getLicenseFamilyIds(LicenseFilter filter) {
+        SortedSet<String> result = new TreeSet<>();
+        switch (filter) {
+        case all:
+            licenses.stream().map(x -> x.getLicenseFamily().getFamilyCategory())
+                    .forEach(result::add);
+            break;
+        case approved:
+            result.addAll(approvedLicenses);
+            break;
+        case none:
+        default:
+            // do nothing
+        }
+        return result;
+    }
+
+    /**
+     * Search a SortedSet of licenses for the matching license id.
+     * 
+     * @param licenseId the id to search for.
+     * @param licenses the SortedSet of licenses to search.
+     * @return the matching license or {@code null} if not found.
+     */
+    public static ILicense search(String licenseId, SortedSet<ILicense> licenses) {
+        ILicenseFamily searchFamily = ILicenseFamily.builder().setLicenseFamilyCategory(licenseId)
+                .setLicenseFamilyCategory("searching proxy").build();
+        ILicense target = new ILicense() {
+    
+            @Override
+            public String getId() {
+                return licenseId;
+            }
+    
+            @Override
+            public void reset() {
+                // do nothing
+            }
+    
+            @Override
+            public State matches(String line) {
+                return State.f;
+            }
+    
+            @Override
+            public int compareTo(ILicense arg0) {
+                return searchFamily.compareTo(arg0.getLicenseFamily());
+            }
+    
+            @Override
+            public ILicenseFamily getLicenseFamily() {
+                return searchFamily;
+            }
+    
+            @Override
+            public String getNotes() {
+                return null;
+            }
+    
+            @Override
+            public String derivedFrom() {
+                return null;
+            }
+    
+            @Override
+            public State finalizeState() {
+                return State.f;
+            }
+    
+            @Override
+            public State currentState() {
+                return State.f;
+            }
+    
+        };
+        return search(target, licenses);
+    }
+
+    /**
+     * Search a SortedSet of licenses for the matching license.
+     * 
+     * @param target the license to search for.
+     * @param licenses the SortedSet of licenses to search.
+     * @return the matching license or {@code null} if not found.
+     */
+    public static ILicense search(ILicense target, SortedSet<ILicense> licenses) {
+        SortedSet<ILicense> part = licenses.tailSet(target);
+        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
+    }
+
+    /**
+     * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
+     * @param target The instance to serch  for.
+     * @param licenseFamilies the license families to search
+     * @return
+     */
+    public static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenseFamilies) {
+        SortedSet<ILicenseFamily> part = licenseFamilies.tailSet(target);
+        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 33883edcc..af45a18d5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -21,12 +21,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.SortedSet;
-import java.util.TreeSet;
 
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory;
 
 /**
  * A default Document Analyser that determines if the matched license is in the set of approved licenses.
@@ -39,7 +39,7 @@ public class DefaultPolicy implements IDocumentAnalyser {
      * @param approvedLicenseFamilies the approved license families.
      */
     public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseFamilies) {
-        this.approvedLicenseFamilies = new TreeSet<>();
+        this.approvedLicenseFamilies = LicenseSetFactory.emptyLicenseFamilySet();
         this.approvedLicenseFamilies.addAll(approvedLicenseFamilies);
     }
 
@@ -55,15 +55,15 @@ public void add(ILicenseFamily approvedLicense) {
     public void analyse(final Document document) {
         if (document != null) {
             boolean approval = false;
-            if (document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY) != null) {
+            if (document.getMetaData().value(MetaData.RAT_URL_HEADER_CATEGORY) != null) {
                 ILicenseFamily licenseFamily = ILicenseFamily.builder()
                         .setLicenseFamilyCategory(
-                                document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY))
+                                document.getMetaData().value(MetaData.RAT_URL_HEADER_CATEGORY))
                         .setLicenseFamilyName(document.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME))
                         .build();
                 approval = approvedLicenseFamilies.contains(licenseFamily);
+                reportLicenseApprovalClaim(document, approval);
             }
-            reportLicenseApprovalClaim(document, approval);
         }
     }
 
@@ -74,7 +74,7 @@ public void analyse(final Document document) {
      */
     public void reportLicenseApprovalClaim(final Document document, final boolean isAcceptable) {
         document.getMetaData().set(
-                isAcceptable ? MetaData.RAT_APPROVED_LICENSE_DATIM_TRUE : MetaData.RAT_APPROVED_LICENSE_DATIM_FALSE);
+                isAcceptable ? MetaData.RAT_APPROVED_LICENSE_DATUM_TRUE : MetaData.RAT_APPROVED_LICENSE_DATUM_FALSE);
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
index 8e9fe8ee8..78bb9d171 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
@@ -19,10 +19,10 @@
 package org.apache.rat.report.xml;
 
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.analysis.DefaultAnalyserFactory;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.impl.util.DocumentAnalyserMultiplexer;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.policy.DefaultPolicy;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index 156a8ce6a..89fa786c2 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -25,7 +25,7 @@
 			</all>
 		</license>
 
-		<license id="ASL" name="Applied Apahce License Version 2.0">
+		<license id="ASL" name="Applied Apache License Version 2.0">
 			<all>
 				<matcherRef refId="ALStandard" />
 				<copyright />
@@ -229,15 +229,15 @@
 		</license>
 	</licenses>
 	<approved>
-		<family license_ref="BSD-3" />
 		<family license_ref='AL' />
 		<family license_ref='ASL' />
+		<family license_ref="BSD-3" />
 		<family license_ref='CDDL1' />
 		<family license_ref='DOJO' />
+		<family license_ref='GEN' />
 		<family license_ref='GPL1' />
 		<family license_ref='GPL2' />
 		<family license_ref='GPL3' />
-		<family license_ref='GEN' />
 		<family license_ref='MIT' />
 		<family license_ref='OASIS' />
 		<family license_ref='W3C' />
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index 7153fe89d..87cd6687c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -26,6 +26,7 @@
 import java.util.TreeSet;
 
 import org.apache.rat.license.ILicense;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.junit.Test;
 
 public class DefaultsTest {
@@ -36,7 +37,7 @@ public class DefaultsTest {
     public void defaultConfigTest() {
         Defaults defaults = Defaults.builder().build();
 
-        Set<ILicense> licenses = defaults.getLicenses();
+        Set<ILicense> licenses = defaults.getLicenses(LicenseFilter.all);
 
         Set<String> names = new TreeSet<>();
         licenses.forEach(x -> names.add(x.getLicenseFamily().getFamilyCategory()));
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 006698e9e..329de54a4 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -43,11 +43,12 @@
 import java.util.SortedSet;
 
 import org.apache.commons.io.function.IOSupplier;
-import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
+import org.apache.rat.testhelpers.TestingLicense;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -63,33 +64,56 @@ public void setup() {
     @Test
     public void testAddAndRemoveApproveLicenseCategories() {
         List<String> expected = new ArrayList<>();
+        underTest.addLicense( new TestingLicense("Unapproved"));
+        
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
 
-        underTest.addApprovedLicenseCategory(
-                ILicenseFamily.builder().setLicenseFamilyCategory("TheCat").setLicenseFamilyName("TheName").build());
+        TestingLicense license = new TestingLicense("TheCat");
+        underTest.addLicense(license);
+        underTest.addApprovedLicenseCategory(license.getFamily());
         expected.add("TheCa");
         SortedSet<String> result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
+        SortedSet<ILicenseFamily> families = underTest.getLicenseFamilies(LicenseFilter.approved);
+        assertEquals(expected.size(), families.size());
+        SortedSet<ILicense> licenses = underTest.getLicenses(LicenseFilter.approved);
+        assertEquals(expected.size(), licenses.size());
 
+        underTest.addLicense(new TestingLicense("ACat"));
         underTest.addApprovedLicenseCategory("ACat");
         expected.add("ACat ");
         result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
+        families = underTest.getLicenseFamilies(LicenseFilter.approved);
+        assertEquals(expected.size(), families.size());
+        licenses = underTest.getLicenses(LicenseFilter.approved);
+        assertEquals(expected.size(), licenses.size());
 
         String[] cats = { "Spot ", "Felix" };
+        underTest.addLicense(new TestingLicense("Spot"));
+        underTest.addLicense(new TestingLicense("Felix"));
         underTest.addApprovedLicenseCategories(Arrays.asList(cats));
         expected.addAll(Arrays.asList(cats));
         result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
-
+        families = underTest.getLicenseFamilies(LicenseFilter.approved);
+        assertEquals(expected.size(), families.size());
+        licenses = underTest.getLicenses(LicenseFilter.approved);
+        assertEquals(expected.size(), licenses.size());
+        
         underTest.removeApprovedLicenseCategory("Spot ");
         expected.remove("Spot ");
         result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
+        families = underTest.getLicenseFamilies(LicenseFilter.approved);
+        assertEquals(expected.size(), families.size());
+        licenses = underTest.getLicenses(LicenseFilter.approved);
+        assertEquals(expected.size(), licenses.size());
+
 
         cats[0] = "TheCa";
         underTest.removeApprovedLicenseCategories(Arrays.asList(cats));
@@ -97,17 +121,27 @@ public void testAddAndRemoveApproveLicenseCategories() {
         result = underTest.getApprovedLicenseCategories();
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
-    }
+        families = underTest.getLicenseFamilies(LicenseFilter.approved);
+        assertEquals(expected.size(), families.size());
+        licenses = underTest.getLicenses(LicenseFilter.approved);
+        assertEquals(expected.size(), licenses.size());    }
 
     @Test
     public void testRemoveBeforeAddApproveLicenseCategories() {
+        underTest.addLicense( new TestingLicense("TheCat"));
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
-
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
+        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
+        
         underTest.removeApprovedLicenseCategory("TheCat");
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
+        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
 
         underTest.addApprovedLicenseCategory("TheCat");
         assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
+        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
+        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
     }
 
     private ILicense mockLicense(String category, String name) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index 993a8b6e1..dd15ad1e6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -37,6 +37,9 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
+/**
+ * Tests the output of the Reporter.
+ */
 public class ReporterTest {
 
     @Test
@@ -57,16 +60,16 @@ public void xmlReportTest() throws Exception {
         XmlUtils.getNode(doc, xPath, "/rat-report[@timestamp]");
 
         XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/ILoggerFactory.java", "MIT", "true", "standard");
-        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Image.png", null, "false", "binary");
-        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/LICENSE", null, "false", "notice");
-        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/NOTICE", null, "false", "notice");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Image.png", null, null, "binary");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/LICENSE", null, null, "notice");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/NOTICE", null, null, "notice");
         XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Source.java", "?????", "false", "standard");
         XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Text.txt", "AL", "true", "standard");
         XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/TextHttps.txt", "AL", "true", "standard");
         XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/Xml.xml", "AL", "true", "standard");
         XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/buildr.rb", "AL", "true", "standard");
-        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/dummy.jar", null, "false", "archive");
-        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/plain.json", null, "false", "binary");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/dummy.jar", null, null, "archive");
+        XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/plain.json", null, null, "binary");
         XmlUtils.checkNode(doc, xPath, "src/test/resources/elements/sub/Empty.txt", "?????", "false", "standard");
 
         NodeList nodeList = (NodeList) xPath.compile("/rat-report/resource").evaluate(doc, XPathConstants.NODESET);
@@ -104,23 +107,22 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         find("^Apache Licensed: 4$", document);
         find("^Generated Documents: 0$", document);
         find("^2 Unknown Licenses$", document);
-        find("^Files with unapproved licenses:\\s+" + "src/test/resources/elements/Image.png\\s+"
-                + "src/test/resources/elements/LICENSE\\s+" + "src/test/resources/elements/NOTICE\\s+"
-                + "src/test/resources/elements/Source.java\\s+" + "src/test/resources/elements/dummy.jar\\s+"
-                + "src/test/resources/elements/plain.json\\s+" + "src/test/resources/elements/sub/Empty.txt\\s",
+        find("^Files with unapproved licenses:\\s+"
+                + "src/test/resources/elements/Source.java\\s+" 
+                + "src/test/resources/elements/sub/Empty.txt\\s",
                 document);
         find("^Archives:\\s+" + "\\+ src/test/resources/elements/dummy.jar\\s*", document);
         find("MIT\\s+src/test/resources/elements/ILoggerFactory.java", document);
-        find("!B\\s+src/test/resources/elements/Image.png", document);
-        find("!N\\s+src/test/resources/elements/LICENSE", document);
-        find("!N\\s+src/test/resources/elements/NOTICE", document);
+        find("B\\s+src/test/resources/elements/Image.png", document);
+        find("N\\s+src/test/resources/elements/LICENSE", document);
+        find("N\\s+src/test/resources/elements/NOTICE", document);
         find("!\\Q?????\\E\\s+src/test/resources/elements/Source.java", document);
         find("AL\\s+src/test/resources/elements/Text.txt", document);
         find("AL\\s+src/test/resources/elements/TextHttps.txt", document);
         find("AL\\s+src/test/resources/elements/Xml.xml", document);
         find("AL\\s+src/test/resources/elements/buildr.rb", document);
-        find("!A\\s+src/test/resources/elements/dummy.jar", document);
-        find("!B\\s+src/test/resources/elements/plain.json", document);
+        find("A\\s+src/test/resources/elements/dummy.jar", document);
+        find("B\\s+src/test/resources/elements/plain.json", document);
         find("!\\Q?????\\E\\s+src/test/resources/elements/sub/Empty.txt", document);
         find("== File: src/test/resources/elements/sub/Empty.txt", document);
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index 1e21b72b4..ca608602d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -37,9 +37,8 @@
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
-import org.junit.AfterClass;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -49,7 +48,8 @@
 abstract public class AbstractLicenseTest {
     private static int NAME = 0;
     private static int TEXT = 1;
-    private static Defaults DEFAULTS;
+    
+    private Defaults defaults;
     protected MetaData data;
 
     private final String category;
@@ -58,16 +58,6 @@ abstract public class AbstractLicenseTest {
     private final String[][] targets;
     
 
-    @BeforeClass
-    public static void init() {
-        DEFAULTS = Defaults.builder().build();
-    }
-
-    @AfterClass
-    public static void shutdown() {
-        DEFAULTS.clear();
-    }
-
     protected AbstractLicenseTest(String cat, String name, String notes, String[][] targets) {
         this.category = ILicenseFamily.makeCategory(cat);
         this.name = name;
@@ -78,14 +68,15 @@ protected AbstractLicenseTest(String cat, String name, String notes, String[][]
     @Before
     public void setup() {
         data = new MetaData();
+        defaults = Defaults.builder().build();
     }
 
-    protected static ILicense extractCategory(String category) {
+    protected ILicense extractCategory(String category) {
         ILicenseFamily testingFamily = ILicenseFamily.builder()
                 .setLicenseFamilyCategory(category)
                 .setLicenseFamilyName("Testing category").build();
         List<ILicense> matchers = new ArrayList<>();
-        DEFAULTS.getLicenses().stream().filter(x -> x.getLicenseFamily().compareTo(testingFamily) == 0)
+        defaults.getLicenses(LicenseFilter.all).stream().filter(x -> x.getLicenseFamily().compareTo(testingFamily) == 0)
                 .forEach(matchers::add);
         if (matchers.isEmpty()) {
             fail("No machers for category: " + category);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
index b87862878..abda9f67d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
@@ -21,7 +21,7 @@
 public class AppliedApacheSoftwareLicenseTest extends AbstractLicenseTest {
 
     private static String CATEGORY = "ASL";
-    private static String NAME = "Applied Apahce License Version 2.0";
+    private static String NAME = "Applied Apache License Version 2.0";
     private static String[][] targets = { { "simple", "/*\n" + " *  Copyright 2012-2013 FooBar.\n" + " *\n"
             + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
             + " *  you may not use this file except in compliance with the License.\n" + " *\n"
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index fdcda06e2..675d528a4 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -20,107 +20,110 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.util.Collections;
-import java.util.stream.Collectors;
+import java.util.SortedSet;
 
 import org.apache.rat.Defaults;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.MetaData;
 import org.apache.rat.api.MetaData.Datum;
-import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
+import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.TestingLocation;
 import org.junit.Before;
 import org.junit.Test;
 
+/**
+ * Tests the Default policy imlementatin.
+ */
 public class DefaultPolicyTest {
-    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 15;
-
-    private Document subject;
+    /**
+     * This is the number of accepted licenses in the default license file : /org/apache/rat/default.xml
+     */
+    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 13;
+    
+    private static final ILicenseFamily[] APPROVED_FAMILIES = {
+            makeFamily("AL", "Apache License Version 2.0"),
+            makeFamily("ASL", "Applied Apache License Version 2.0"),
+            makeFamily("BSD-3", "BSD 3 clause"),
+            makeFamily("CDDL1", "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"),
+            makeFamily("DOJO", "DOJO License"),
+            makeFamily("GEN", "Generated Files"),
+            makeFamily("GPL1", "GNU General Public License, version 1"),
+            makeFamily("GPL2", "GNU General Public License, version 2"),
+            makeFamily("GPL3", "GNU General Public License, version 3"),
+            makeFamily("MIT", "The MIT License"),
+            makeFamily("OASIS", "OASIS Open License"),
+            makeFamily("W3CD", "W3C Document Copyright"),
+            makeFamily("W3C", "W3C Software Copyright"),
+    };
+
+    private Document document;
     private DefaultPolicy policy;
+    private Defaults defaults;
+
 
     @Before
     public void setUp() throws Exception {
-        Defaults defaults = Defaults.builder().build();
-
-        policy = new DefaultPolicy(
-                defaults.getLicenses().stream().map(ILicense::getLicenseFamily).collect(Collectors.toList()));
-        subject = new TestingLocation("subject");
+        defaults = Defaults.builder().build();
+        policy = new DefaultPolicy(defaults.getLicenseFamilies(LicenseFilter.approved));
+        document = new TestingLocation("subject");
     }
 
     private void assertApproval(boolean pApproved) {
         assertEquals(pApproved, MetaData.RAT_APPROVED_LICENSE_VALUE_TRUE
-                .equals(subject.getMetaData().value(MetaData.RAT_URL_APPROVED_LICENSE)));
+                .equals(document.getMetaData().value(MetaData.RAT_URL_APPROVED_LICENSE)));
     }
 
     private void setMetadata(ILicenseFamily family) {
-        subject.getMetaData().add(new Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, family.getFamilyName()));
-        subject.getMetaData().add(new Datum(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY, family.getFamilyCategory()));
+        document.getMetaData().reportOnLicense(new TestingLicense(family));
     }
 
-    private ILicenseFamily makeFamily(String category, String name) {
+    private static ILicenseFamily makeFamily(String category, String name) {
         return ILicenseFamily.builder().setLicenseFamilyCategory(category)
                 .setLicenseFamilyName(name).build();
     }
+    
     @Test
     public void testCount() {
         assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, policy.getApprovedLicenseNames().size());
     }
 
     @Test
-    public void testALFamily() throws Exception {
-        setMetadata(makeFamily("AL", "Apache License Version 2.0"));
-        policy.analyse(subject);
-        assertApproval(true);
-    }
-
-    @Test
-    public void testOASISFamily() throws Exception {
-        setMetadata(makeFamily("OASIS", "OASIS Open License"));
-        policy.analyse(subject);
-        assertApproval(true);
-    }
-
-    @Test
-    public void testW3CFamily() throws Exception {
-        setMetadata(makeFamily("W3C", "W3C Software Copyright"));
-        policy.analyse(subject);
-        assertApproval(true);
-    }
-
-    @Test
-    public void testW3CDocFamily() throws Exception {
-        setMetadata(makeFamily("W3CD", "W3C Document Copyright"));
-        policy.analyse(subject);
-        assertApproval(true);
-    }
-
-    @Test
-    public void testModifiedBSDFamily() throws Exception {
-        setMetadata(makeFamily("TMF", "The Telemanagement Forum License"));
-        policy.analyse(subject);
-        assertApproval(true);
+    public void testApprovedLicenses() {
+        
+        assertEquals("Approved license count mismatch", NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, APPROVED_FAMILIES.length);
+        for (ILicenseFamily family : APPROVED_FAMILIES) {
+            setMetadata(family);
+            policy.analyse(document);
+            assertApproval(true);
+        }
     }
-
+    
     @Test
-    public void testMITFamily() throws Exception {
-        setMetadata(makeFamily("MIT", "The MIT License"));
-        policy.analyse(subject);
-        assertApproval(true);
-    }
-
-    @Test
-    public void testCDDL1Family() throws Exception {
-        setMetadata(makeFamily("CDDL1", "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"));
-        policy.analyse(subject);
-        assertApproval(true);
+    public void testUnApprovedLicenses() {
+        SortedSet<ILicenseFamily> all = defaults.getLicenseFamilies(LicenseFilter.all);
+        SortedSet<ILicenseFamily> unapproved = LicenseSetFactory.emptyLicenseFamilySet();
+        unapproved.addAll(all);
+        unapproved.removeAll(defaults.getLicenseFamilies(LicenseFilter.approved));
+
+        assertEquals("Unapproved license count mismatch", all.size()-NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, unapproved.size());
+        for (ILicenseFamily family : unapproved) {
+            setMetadata(family);
+            policy.analyse(document);
+            assertApproval(false);
+        }
     }
+    
 
     @Test
     public void testUnknownFamily() throws Exception {
         setMetadata(makeFamily("?????", "Unknown document"));
-        policy.analyse(subject);
+        policy.analyse(document);
         assertApproval(false);
     }
 
@@ -128,13 +131,13 @@ public void testUnknownFamily() throws Exception {
     public void testAddNewApprovedLicenseAndDefaults() {
         ILicenseFamily testingFamily = makeFamily("test", "Testing License Family");
         setMetadata(testingFamily);
-        policy.analyse(subject);
+        policy.analyse(document);
         assertApproval(false);
 
         policy.add(testingFamily);
         assertNotNull("Did not properly add ILicenseFamily",
-                ILicenseFamily.search(testingFamily, policy.getApprovedLicenseNames()));
-        policy.analyse(subject);
+                LicenseSetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
+        policy.analyse(document);
         assertApproval(true);
     }
 
@@ -144,14 +147,50 @@ public void testAddNewApprovedLicenseNoDefaults() {
         assertEquals(0, policy.getApprovedLicenseNames().size());
         ILicenseFamily testingFamily = makeFamily("test", "Testing License Family");
         setMetadata(testingFamily);
-        policy.analyse(subject);
+        policy.analyse(document);
         assertApproval(false);
 
         policy.add(testingFamily);
         assertEquals(1, policy.getApprovedLicenseNames().size());
         assertNotNull("Did not properly add ILicenseFamily",
-                ILicenseFamily.search(testingFamily, policy.getApprovedLicenseNames()));
-        policy.analyse(subject);
+                LicenseSetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
+        policy.analyse(document);
         assertApproval(true);
     }
+    
+    @Test
+    public void testNonStandardDocumentsDoNotFailLicenseTests() {
+        Datum[] nonStandardDocuments = {
+                MetaData.RAT_DOCUMENT_CATEGORY_DATUM_NOTICE,
+                MetaData.RAT_DOCUMENT_CATEGORY_DATUM_ARCHIVE,
+                MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY
+        };
+        
+        for (Datum d : nonStandardDocuments) {
+            document = new TestingLocation("subject");
+            document.getMetaData().set(d);
+            policy.analyse(document);
+            assertNull( "failed on "+d.getValue(), document.getMetaData().get(MetaData.RAT_URL_APPROVED_LICENSE) );
+        }
+    }
+
+    @Test
+    public void testUnclassifiedDocumentsDoNotFailLicenseTests() {
+        document.getMetaData().set(MetaData.RAT_DOCUMENT_CATEGORY_DATUM_STANDARD);
+        policy.analyse(document);
+        assertApproval( false );
+    }
+    
+    @Test
+    public void testReportLicenseApprovalClaim() {
+        assertNull( document.getMetaData().get(MetaData.RAT_URL_APPROVED_LICENSE));
+        
+        
+        policy.reportLicenseApprovalClaim(document, false);
+        assertEquals( MetaData.RAT_APPROVED_LICENSE_DATUM_FALSE, document.getMetaData().get(MetaData.RAT_URL_APPROVED_LICENSE));
+        
+        policy.reportLicenseApprovalClaim(document, true);
+        assertEquals( MetaData.RAT_APPROVED_LICENSE_DATUM_TRUE, document.getMetaData().get(MetaData.RAT_URL_APPROVED_LICENSE));
+        
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
index 275fbc09d..980d6db8b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
@@ -22,42 +22,90 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
+/**
+ * A class to quickly build testing licenses.
+ */
 public class TestingLicense implements ILicense {
 
     private final ILicenseFamily family;
-    IHeaderMatcher matcher;
+    private IHeaderMatcher matcher;
     private String derivedFrom;
     private String notes;
 
+    /**
+     * Creates a testing license named "DfltTst" with category of "DfltT" and a default 
+     * TestingMatcher.
+     * @see TestingMatcher
+     */
     public TestingLicense() {
         this("DfltTst", new TestingMatcher());
     }
-
+    
+    /**
+     * Creates a testing license with the specified id and a default TestingMatcher
+     * @param id The ID to use.
+     * @see TestingMatcher
+     */
+    public TestingLicense(String id) {
+        this(id, new TestingMatcher());
+    }
+
+    /**
+     * Creates a testing license wit the specified id and matcher.
+     * @param id the ID to use
+     * @param matcher the matcher to execute.
+     */
     public TestingLicense(String id, IHeaderMatcher matcher) {
-        this.family = ILicenseFamily.builder().setLicenseFamilyCategory(id)
-                .setLicenseFamilyName("TestingLicense: " + id).build();
+        this(matcher, ILicenseFamily.builder().setLicenseFamilyCategory(id)
+                .setLicenseFamilyName("TestingLicense: " + id).build());
+    }
+    
+    /**
+     * Creates a testing license with the specified matcher and family.
+     * @param matcher the matcher to use.
+     * @param family the family for this license.
+     */
+    public TestingLicense(IHeaderMatcher matcher, ILicenseFamily family) {
+        this.family = family;
         this.matcher = matcher;
         this.derivedFrom = null;
         this.notes = null;
     }
+    
+    /**
+     * Create a testing license for the specified family using a default TestingMatcher
+     * @param family the family for the license.
+     * @see TestingMatcher
+     */
+    public TestingLicense(ILicenseFamily family) {
+        this(new TestingMatcher(), family );
+    }
 
     @Override
     public String toString() {
         return family.toString();
     }
 
+    /**
+     * Gets the family from  the license
+     * @return the license family.
+     */
     public ILicenseFamily getFamily() {
         return family;
     }
 
+    /**
+     * Gets the matcher from the license
+     * @return the matcher.
+     */
     public IHeaderMatcher getMatcher() {
         return matcher;
     }
 
-    public void setMatcher(IHeaderMatcher matcher) {
-        this.matcher = matcher;
-    }
-
+    /**
+     * Sets the derived from value for this license.
+     * @param derivedFrom the license this license is derived from.
+     */
     public void setDerivedFrom(String derivedFrom) {
         this.derivedFrom = derivedFrom;
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
index 2d6d0b26e..af3a5903d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
@@ -23,20 +23,37 @@
 
 import org.apache.rat.analysis.matchers.AbstractHeaderMatcher;
 
+/**
+ * An Matcher for testing.
+ */
 public class TestingMatcher extends AbstractHeaderMatcher {
     private State lastState;
     private final boolean[] initialResults;
     private Queue<Boolean> results;
     public State finalState = State.f;
 
+    /**
+     * Constructs a matcher with an ID of "dfltMtch" that does not match anyting.
+     */
     public TestingMatcher() {
         this("dfltMtch", false);
     }
 
+    /**
+     * Constructs a matcher with the specified id and matching result.
+     * @param id the ID for this matcher
+     * @param result if {@code true} will match everything, otherwise it matches nothing.
+     */
     public TestingMatcher(String id, boolean result) {
         this(id, new boolean[] { result });
     }
 
+    /**
+     * Constructs a matcher with the specified ID that returns the matching values in order.
+     * Will throw NPE if more {@code matches()} are called than there are results.
+     * @param id the id of the matcher.
+     * @param results the result for each call to match.
+     */
     public TestingMatcher(String id, boolean... results) {
         super(id);
         initialResults = results;
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index a8811056b..7a1945cee 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -21,8 +21,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -32,9 +30,9 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.Reporter;
 import org.apache.rat.config.AddLicenseHeaders;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.claim.ClaimStatistic;
 
 /**
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index b6ee9ce18..11d328e1b 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -32,26 +32,6 @@
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.nio.charset.StandardCharsets;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.doxia.sink.Sink;
@@ -74,8 +54,8 @@
 import org.apache.maven.reporting.MavenMultiPageReport;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.ReportConfiguration.LicenseFilter;
 import org.apache.rat.Reporter;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.codehaus.plexus.util.ReaderFactory;
 
 /**
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 55c9ad5d5..3606ec78e 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -37,6 +37,7 @@
 import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.MatcherReader;
+import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.configuration.MatcherBuilderTracker;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -270,12 +271,12 @@ public ApprovalFilter(String s) {
 
         @Override
         public String[] getValues() {
-            return Arrays.stream(ReportConfiguration.LicenseFilter.values()).map(ReportConfiguration.LicenseFilter::name).collect(Collectors.toList())
-                    .toArray(new String[ReportConfiguration.LicenseFilter.values().length]);
+            return Arrays.stream(LicenseSetFactory.LicenseFilter.values()).map(LicenseSetFactory.LicenseFilter::name).collect(Collectors.toList())
+                    .toArray(new String[LicenseSetFactory.LicenseFilter.values().length]);
         }
 
-        public ReportConfiguration.LicenseFilter internalFilter() {
-            return ReportConfiguration.LicenseFilter.valueOf(getValue());
+        public LicenseSetFactory.LicenseFilter internalFilter() {
+            return LicenseSetFactory.LicenseFilter.valueOf(getValue());
         }
     }
 }

From 2c3d31363badbc3a02e4332a72cc1fc7f7699c06 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 22 Oct 2023 18:56:49 +0200
Subject: [PATCH 127/299] split Family from License

---
 .../org/apache/rat/ReportConfiguration.java   |   3 +-
 .../rat/analysis/LicenseCollection.java       |   5 +
 .../apache/rat/analysis/UnknownLicense.java   |   7 +-
 .../configuration/XMLConfigurationReader.java |  80 +++++++++----
 .../java/org/apache/rat/license/ILicense.java |  31 ++++--
 .../apache/rat/license/ILicenseBuilder.java   |  22 +++-
 .../apache/rat/license/LicenseSetFactory.java |   6 +
 .../org/apache/rat/license/SimpleLicense.java |  16 ++-
 .../main/resources/org/apache/rat/default.xml |  49 ++++----
 .../java/org/apache/rat/DefaultsTest.java     |   4 +-
 .../apache/rat/ReportConfigurationTest.java   |  20 ++--
 .../rat/analysis/AnalyserFactoryTest.java     |   2 +-
 .../analysis/license/AbstractLicenseTest.java | 105 +++++++++---------
 .../license/ApacheSoftwareLicenseTest.java    |   6 +-
 .../AppliedApacheSoftwareLicenseTest.java     |   4 +-
 .../analysis/license/CDDL1LicenseTest.java    |   6 +-
 .../rat/analysis/license/GPLLicenseTest.java  |   4 +-
 .../license/GeneratedLicenseTest.java         |   4 +-
 .../analysis/license/IllumosLicenseTest.java  |   5 +-
 .../rat/analysis/license/MITLicenseTest.java  |   4 +-
 .../analysis/license/OASISLicenseTest.java    |   4 +-
 .../rat/analysis/license/W3CLicenseTest.java  |   4 +-
 .../ConfigurationReaderTest.java              |  12 +-
 .../apache/rat/policy/DefaultPolicyTest.java  |   4 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |   9 +-
 .../rat/testhelpers/TestingLicense.java       |  21 +++-
 .../rat/testhelpers/TestingMatcher.java       |   8 ++
 27 files changed, 292 insertions(+), 153 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index c3dbff3c0..42186ac52 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -47,7 +47,8 @@
  * {@link Reporter}. The sole purpose of the front ends is to create the
  * configuration and invoke the {@link Reporter}.
  */
-public class ReportConfiguration {
+public class ReportConfiguration {    
+    private SortedSet<ILicenseFamily> families = LicenseSetFactory.emptyLicenseFamilySet();
     private SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
     private SortedSet<String> approvedLicenseCategories = new TreeSet<>();
     private SortedSet<String> removedLicenseCategories = new TreeSet<>();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
index 2948a424d..5bb0a42d7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
@@ -125,4 +125,9 @@ public String getNotes() {
     public String derivedFrom() {
         return matchingLicense == null ? null : matchingLicense.derivedFrom();
     }
+    
+    @Override
+    public String getName() {
+        return getLicenseFamily().getFamilyName();
+    }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java
index 259a5ea9c..113771b09 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/UnknownLicense.java
@@ -42,7 +42,7 @@ public class UnknownLicense implements ILicense {
      */
     private UnknownLicense() {
         family = new ILicenseFamilyBuilder().setLicenseFamilyCategory("?????")
-                .setLicenseFamilyName("?????").build();
+                .setLicenseFamilyName("Unknown license").build();
     }
     
     @Override
@@ -85,6 +85,11 @@ public String getNotes() {
         return null;
     }
 
+    @Override
+    public String getName() {
+        return family.getFamilyName();
+    }
+
     @Override
     public String derivedFrom() {
         return null;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 6f1828f34..75e897eef 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -45,6 +45,8 @@
 import org.apache.rat.configuration.builders.MatcherRefBuilder;
 import org.apache.rat.configuration.builders.TextCaptureBuilder;
 import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -89,6 +91,7 @@ public class XMLConfigurationReader implements LicenseReader, MatcherReader {
     private final static String ATT_CLASS_NAME = "class";
 
     private final static String ROOT = "rat-config";
+    private final static String FAMILIES = "families";
     private final static String LICENSES = "licenses";
     private final static String LICENSE = "license";
     private final static String APPROVED = "approved";
@@ -99,13 +102,15 @@ public class XMLConfigurationReader implements LicenseReader, MatcherReader {
 
     private Document document;
     private final Element rootElement;
+    private final Element familiesElement;
     private final Element licensesElement;
     private final Element approvedElement;
     private final Element matchersElement;
 
     private final SortedSet<ILicense> licenses;
     private final Map<String, IHeaderMatcher> matchers;
-    private final SortedSet<String> licenseFamilies;
+    private final SortedSet<ILicenseFamily> licenseFamilies;
+    private final SortedSet<String> approvedFamilies;
 
     /**
      * Constructs the XML configuration read.
@@ -118,14 +123,17 @@ public XMLConfigurationReader() {
         }
         rootElement = document.createElement(ROOT);
         document.appendChild(rootElement);
+        familiesElement = document.createElement(FAMILIES);
+        rootElement.appendChild(familiesElement);
         licensesElement = document.createElement(LICENSES);
         rootElement.appendChild(licensesElement);
         approvedElement = document.createElement(APPROVED);
         rootElement.appendChild(approvedElement);
         matchersElement = document.createElement(MATCHERS);
         rootElement.appendChild(matchersElement);
-        licenses = new TreeSet<>((x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily()));
-        licenseFamilies = new TreeSet<>();
+        licenses = LicenseSetFactory.emptyLicenseSet();
+        licenseFamilies = LicenseSetFactory.emptyLicenseFamilySet();
+        approvedFamilies = new TreeSet<>();
         matchers = new HashMap<>();
     }
 
@@ -173,14 +181,16 @@ private void nodeListConsumer(NodeList list, Consumer<Node> consumer) {
      * @param newDoc the Document to merge.
      */
     public void add(Document newDoc) {
-        List<Node> lst = new ArrayList<>();
-        nodeListConsumer(newDoc.getElementsByTagName(LICENSE), lst::add);
+        nodeListConsumer(newDoc.getElementsByTagName(FAMILIES),
+                nl -> nodeListConsumer( nl.getChildNodes(), 
+                n -> familiesElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true)))));
         nodeListConsumer(newDoc.getElementsByTagName(LICENSE),
-                (n) -> licensesElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
+                n -> licensesElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
         nodeListConsumer(newDoc.getElementsByTagName(APPROVED),
-                (n) -> approvedElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
+                nl -> nodeListConsumer( nl.getChildNodes(),
+                n -> approvedElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true)))));
         nodeListConsumer(newDoc.getElementsByTagName(MATCHERS),
-                (n) -> matchersElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
+                n -> matchersElement.appendChild(rootElement.getOwnerDocument().adoptNode(n.cloneNode(true))));
     }
 
     /**
@@ -263,8 +273,9 @@ private ILicense parseLicense(Node licenseNode) {
         Map<String, String> attributes = attributes(licenseNode);
         ILicense.Builder builder = ILicense.builder();
 
-        builder.setLicenseFamilyCategory(attributes.get(ATT_ID));
-        builder.setLicenseFamilyName(attributes.get(ATT_NAME));
+        builder.setLicenseFamilyCategory(attributes.get(FAMILY));
+        builder.setName(attributes.get(ATT_NAME));
+        builder.setId(attributes.get(ATT_ID));
 
         StringBuilder notesBuilder = new StringBuilder();
         nodeListConsumer(licenseNode.getChildNodes(), x -> {
@@ -278,26 +289,57 @@ private ILicense parseLicense(Node licenseNode) {
         });
         builder.setDerivedFrom(StringUtils.defaultIfBlank(attributes.get(ATT_DERIVED_FROM), null));
         builder.setNotes(StringUtils.defaultIfBlank(notesBuilder.toString().trim(), null));
-        return builder.build();
+        return builder.build(licenseFamilies);
     }
 
     @Override
     public SortedSet<ILicense> readLicenses() {
         readMatcherBuilders();
         if (licenses.size() == 0) {
+            nodeListConsumer(document.getElementsByTagName(FAMILIES),
+                    x -> nodeListConsumer(x.getChildNodes(), y -> parseFamily(y)));
+            nodeListConsumer(document.getElementsByTagName(APPROVED),
+                    x -> nodeListConsumer(x.getChildNodes(), y -> parseApproved(y)));
             nodeListConsumer(document.getElementsByTagName(LICENSE), x -> licenses.add(parseLicense(x)));
-            nodeListConsumer(document.getElementsByTagName(FAMILY), x -> licenseFamilies.add(parseFamily(x)));
             document = null;
         }
         return Collections.unmodifiableSortedSet(licenses);
     }
 
-    private String parseFamily(Node familyNode) {
-        Map<String, String> attributes = attributes(familyNode);
-        if (attributes.containsKey(ATT_LICENSE_REF)) {
-            return attributes.get(ATT_LICENSE_REF);
+    private ILicenseFamily parseFamily(Map<String, String> attributes) {
+        if (attributes.containsKey(ATT_ID)) {
+            ILicenseFamily.Builder builder = ILicenseFamily.builder();
+            builder.setLicenseFamilyCategory(attributes.get(ATT_ID));
+            builder.setLicenseFamilyName(StringUtils.defaultIfBlank(attributes.get(ATT_NAME), attributes.get(ATT_ID)));
+            return builder.build();
+        }
+        return null;
+    }
+
+    private void parseFamily(Node familyNode) {
+        if (FAMILY.equals(familyNode.getNodeName())) {
+            ILicenseFamily result = parseFamily(attributes(familyNode));
+            if (result == null) {
+                throw new ConfigurationException(String.format("families/family tag requires %s attribute", ATT_ID));
+            }
+            licenseFamilies.add(result);
+        }
+    }
+
+    private void parseApproved(Node approvedNode) {
+        if (FAMILY.equals(approvedNode.getNodeName())) {
+            Map<String, String> attributes = attributes(approvedNode);
+            if (attributes.containsKey(ATT_LICENSE_REF)) {
+                approvedFamilies.add(attributes.get(ATT_LICENSE_REF));
+            } else if (attributes.containsKey(ATT_ID)) {
+                ILicenseFamily target = parseFamily(attributes);
+                licenseFamilies.add(target);
+                approvedFamilies.add(target.getFamilyCategory());
+            } else {
+                throw new ConfigurationException(
+                        String.format("family tag requires %s or %s attribute", ATT_LICENSE_REF, ATT_ID));
+            }
         }
-        throw new ConfigurationException("family tag requires " + ATT_LICENSE_REF + " attribute");
     }
 
     @Override
@@ -305,12 +347,12 @@ public SortedSet<String> approvedLicenseId() {
         if (licenses.isEmpty()) {
             this.readLicenses();
         }
-        if (licenseFamilies.isEmpty()) {
+        if (approvedFamilies.isEmpty()) {
             SortedSet<String> result = new TreeSet<>();
             licenses.stream().map(x -> x.getLicenseFamily().getFamilyCategory()).forEach(result::add);
             return result;
         }
-        return Collections.unmodifiableSortedSet(licenseFamilies);
+        return Collections.unmodifiableSortedSet(approvedFamilies);
     }
 
     private void parseMatcherBuilder(Node classNode) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index c0f3c55c5..91e1ae511 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -19,6 +19,7 @@
 package org.apache.rat.license;
 
 import java.util.Comparator;
+import java.util.SortedSet;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 
@@ -37,9 +38,15 @@ public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
     String getNotes();
 
     /**
-     * @return the id of a licens that this license is derived from. May be null.
+     * @return the id of a license that this license is derived from. May be null.
      */
     String derivedFrom();
+    
+    /**
+     * Returns the name of this license.  If no name was specified then the name of the family is returned.
+     * @return the name of this license.
+     */
+    String getName();
 
     /**
      * @return An ILicense.Builder instance.
@@ -52,7 +59,7 @@ public static ILicense.Builder builder() {
      * @return The comparator for used to sort Licenses. 
      */
     static Comparator<ILicense> getComparator() {
-        return (x, y) -> x.getLicenseFamily().compareTo(y.getLicenseFamily());
+        return (x, y) ->  x.getId().compareTo( y.getId() );
     }
 
     /**
@@ -60,9 +67,10 @@ static Comparator<ILicense> getComparator() {
      */
     interface Builder {
         /**
-         * @return A new License implementatin.
+         * @param families the set of defined license families.
+         * @return A new License implementation.
          */
-        ILicense build();
+        ILicense build(SortedSet<ILicenseFamily> families);
         
         /**
          * Sets the matcher from a builder.
@@ -104,11 +112,20 @@ interface Builder {
         Builder setLicenseFamilyCategory(String licenseFamilyCategory);
 
         /**
-         * Set the family name for this license.
-         * @param licenseFamilyName the family name for the license.
+         * Sets the name of the license.
+         * If the name is not set then the name of the license family is used.
+         * @param name the name for the license
+         * @return this builder for chaining.
+         */
+        Builder setName(String name);
+        
+        /**
+         * Sets the ID of the license.
+         * If the ID is not set then the ID of the license family is used.
+         * @param id the ID for the license
          * @return this builder for chaining.
          */
-        Builder setLicenseFamilyName(String licenseFamilyName);
+        Builder setId(String id);
     }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
index 8f9210cb8..6427d42c8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
@@ -18,6 +18,8 @@
  */
 package org.apache.rat.license;
 
+import java.util.SortedSet;
+
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.license.ILicense.Builder;
 
@@ -31,6 +33,10 @@ class ILicenseBuilder implements Builder {
     private String notes;
 
     private String derivedFrom;
+    
+    private String name;
+    
+    private String id;
 
     private final ILicenseFamily.Builder licenseFamily = ILicenseFamily.builder();
 
@@ -52,6 +58,12 @@ public Builder setNotes(String notes) {
         return this;
     }
 
+    @Override
+    public Builder setId(String id) {
+        this.id = id;
+        return this;
+    }
+    
     @Override
     public Builder setDerivedFrom(String derivedFrom) {
         this.derivedFrom = derivedFrom;
@@ -61,17 +73,19 @@ public Builder setDerivedFrom(String derivedFrom) {
     @Override
     public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
         this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
+        this.licenseFamily.setLicenseFamilyName("License Family for searching");
         return this;
     }
 
     @Override
-    public Builder setLicenseFamilyName(String licenseFamilyName) {
-        this.licenseFamily.setLicenseFamilyName(licenseFamilyName);
+    public Builder setName(String name) {
+        this.name = name;
         return this;
     }
 
     @Override
-    public ILicense build() {
-        return new SimpleLicense(licenseFamily.build(), matcher.build(), derivedFrom, notes);
+    public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
+        ILicenseFamily family = LicenseSetFactory.search(licenseFamily.build(), licenseFamilies);
+        return new SimpleLicense(family, matcher.build(), derivedFrom, notes, name, id);
     }
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
index a097733a0..35b9e3ef0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -188,6 +188,11 @@ public String getNotes() {
             public String derivedFrom() {
                 return null;
             }
+            
+            @Override
+            public String getName() {
+                return searchFamily.getFamilyName();
+            }
     
             @Override
             public State finalizeState() {
@@ -225,4 +230,5 @@ public static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFam
         SortedSet<ILicenseFamily> part = licenseFamilies.tailSet(target);
         return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
+    
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index 4d9da9764..6a28dfe7a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.license;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
 
 /**
@@ -29,17 +30,21 @@ class SimpleLicense implements ILicense {
     private IHeaderMatcher matcher;
     private String derivedFrom;
     private String notes;
+    private String name;
+    private String id;
 
-    SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, String derivedFrom, String notes) {
+    SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, String derivedFrom, String notes, String name, String id) {
         this.family = family;
         this.matcher = matcher;
         this.derivedFrom = derivedFrom;
         this.notes = notes;
+        this.name = name;
+        this.id = id;
     }
 
     @Override
     public String toString() {
-        return family.toString();
+        return String.format( "%s:%s", getId(), getName());
     }
 
     public ILicenseFamily getFamily() {
@@ -64,7 +69,7 @@ public void setDerivedFrom(String derivedFrom) {
 
     @Override
     public String getId() {
-        return matcher.getId();
+        return StringUtils.defaultIfBlank(id, family.getFamilyCategory().trim());
     }
 
     @Override
@@ -106,4 +111,9 @@ public String getNotes() {
     public String derivedFrom() {
         return derivedFrom;
     }
+    
+    @Override
+    public String getName() {
+        return StringUtils.defaultIfBlank(name, family.getFamilyName());
+    }
 }
diff --git a/apache-rat-core/src/main/resources/org/apache/rat/default.xml b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
index 89fa786c2..9041f7495 100644
--- a/apache-rat-core/src/main/resources/org/apache/rat/default.xml
+++ b/apache-rat-core/src/main/resources/org/apache/rat/default.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rat-config>
+	<families>
+		<family id="AL" name="Apache License Version 2.0" />
+		<family id="CDDL1"
+			name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0" />
+		<family id="GEN" name="Generated Files" />
+		<family id="GPL1" name="GNU General Public License, version 1" />
+		<family id="GPL2" name="GNU General Public License, version 2" />
+		<family id="GPL3" name="GNU General Public License, version 3" />
+		<family id="MIT" name="The MIT License" />
+		<family id="OASIS" name="OASIS Open License" />
+		<family id="W3C" name="W3C Software Copyright" />
+		<family id="W3CD" name="W3C Document Copyright" />
+		<family id='BSD-3' name="BSD 3 clause" />
+	</families>
 	<licenses>
-		<license id="AL" name="Apache License Version 2.0">
+		<license family="AL">
 			<all>
 				<any id="ALStandard">
 					<text>Licensed under the Apache License, Version 2.0 (the
@@ -25,15 +39,14 @@
 			</all>
 		</license>
 
-		<license id="ASL" name="Applied Apache License Version 2.0">
+		<license family="AL" id="ASL" name="Applied Apache License Version 2.0">
 			<all>
 				<matcherRef refId="ALStandard" />
 				<copyright />
 			</all>
 		</license>
 
-		<license id="CDDL1"
-			name="COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0">
+		<license family="CDDL1">
 			<any>
 				<text>The contents of this file are subject to the terms of the
 					Common Development and Distribution License("CDDL") (the
@@ -43,7 +56,7 @@
 			</any>
 		</license>
 
-		<license id="ILLUMOS" name="ILLUMOS CDDL1 Derived license"
+		<license family="CDDL1" id="ILLUMOS" name="ILLUMOS CDDL1 Derived license"
 			derived_from='CDDL1'>
 			<note>Modified CDDL1 license</note>
 			<any>
@@ -54,17 +67,17 @@
 			</any>
 		</license>
 
-		<license id="DOJO" name="DOJO License" derived_from="BSD-3">
+		<license family="BSD-3" id="DOJO" name="DOJO License" derived_from="BSD-3">
 			<text>http://dojotoolkit.org/community/licensing.shtml</text>
 		</license>
 
-		<license id="GEN" name="Generated Files">
+		<license family="GEN">
 			<note>
 				Files that are autmoatically generated.</note>
 			<any resource="/org/apache/rat/generation-keywords.txt" />
 		</license>
 
-		<license id="GPL1" name="GNU General Public License, version 1">
+		<license family="GPL1">
 			<any>
 				<text>This program is free software; you can redistribute it
 					and/or modify
@@ -78,7 +91,7 @@
 			</any>
 		</license>
 
-		<license id="GPL2" name="GNU General Public License, version 2">
+		<license family="GPL2">
 			<any>
 				<text>This program is free software; you can
 					redistribute it and/or modify it under the terms of the
@@ -91,7 +104,7 @@
 			</any>
 		</license>
 
-		<license id="GPL3" name="GNU General Public License, version 3">
+		<license family="GPL3">
 			<any>
 				<text>This program is free software: you can
 					redistribute it and/or modify it under the terms of the
@@ -104,7 +117,7 @@
 			</any>
 		</license>
 
-		<license id="MIT" name="The MIT License">
+		<license family="MIT">
 			<any>
 				<text>Permission is hereby granted, free of charge, to
 					any person obtaining a copy of this software and associated
@@ -135,7 +148,7 @@
 			</any>
 		</license>
 
-		<license id="OASIS" name="OASIS Open License">
+		<license family="OASIS">
 			<note>No modifications allowed</note>
 			<all>
 				<text>This document and translations of it may be
@@ -149,7 +162,7 @@
 			</all>
 		</license>
 
-		<license id="TMF" name="The Telemanagement Forum License"
+		<license family="BSD-3" id="TMF" name="The Telemanagement Forum License"
 			derived_from="BSD-3">
 			<all>
 				<text>TMF854 Version 1.0</text>
@@ -159,7 +172,7 @@
 			</all>
 		</license>
 
-		<license id="W3C" name="W3C Software Copyright">
+		<license family="W3C">
 			<note>Note that W3C requires a NOTICE.</note>
 			<note>All modifications require notes.</note>
 			<note>
@@ -173,7 +186,7 @@
 			</any>
 		</license>
 
-		<license id="W3CD" name="W3C Document Copyright">
+		<license family="W3CD">
 			<note>
 				Note that W3CD does not allow modifications.</note>
 			<note>
@@ -183,7 +196,7 @@
 				http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</text>
 		</license>
 
-		<license id='BSD-3' name="BSD 3 clause">
+		<license family='BSD-3'>
 			<any>
 				<all>
 					<copyright />
@@ -230,10 +243,8 @@
 	</licenses>
 	<approved>
 		<family license_ref='AL' />
-		<family license_ref='ASL' />
 		<family license_ref="BSD-3" />
 		<family license_ref='CDDL1' />
-		<family license_ref='DOJO' />
 		<family license_ref='GEN' />
 		<family license_ref='GPL1' />
 		<family license_ref='GPL2' />
@@ -247,7 +258,7 @@
 		<matcher class="org.apache.rat.configuration.builders.AllBuilder" />
 		<matcher class="org.apache.rat.configuration.builders.AnyBuilder" />
 		<matcher class="org.apache.rat.configuration.builders.CopyrightBuilder" />
-		<matcher class="org.apache.rat.configuration.builders.MatcherRefBuilder"/>
+		<matcher class="org.apache.rat.configuration.builders.MatcherRefBuilder" />
 		<matcher class="org.apache.rat.configuration.builders.NotBuilder" />
 		<matcher class="org.apache.rat.configuration.builders.RegexBuilder" />
 		<matcher class="org.apache.rat.configuration.builders.SpdxBuilder" />
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index 87cd6687c..478e1bcb8 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -30,8 +30,8 @@
 import org.junit.Test;
 
 public class DefaultsTest {
-    private static final String[] FAMILIES = { "BSD-3", "GEN  ", "ASL  ", "AL   ", "DOJO ", "OASIS", "W3CD ", "W3C  ", "GPL1 ",
-            "GPL2 ", "GPL3 ", "MIT  ", "CDDL1", "ILLUM", "TMF  " };
+    private static final String[] FAMILIES = { "BSD-3", "GEN  ", "AL   ", "OASIS", "W3CD ", "W3C  ", "GPL1 ",
+            "GPL2 ", "GPL3 ", "MIT  ", "CDDL1" };
 
     @Test
     public void defaultConfigTest() {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 329de54a4..704cb4283 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -144,12 +144,10 @@ public void testRemoveBeforeAddApproveLicenseCategories() {
         assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
     }
 
-    private ILicense mockLicense(String category, String name) {
+    private ILicense testingLicense(String category, String name) {
         ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory(category).setLicenseFamilyName(name)
                 .build();
-        ILicense result = mock(ILicense.class);
-        when(result.getLicenseFamily()).thenReturn(family);
-        return result;
+        return new TestingLicense( family );
     }
 
     @Test
@@ -158,14 +156,14 @@ public void testAddLicense() {
         List<ILicense> expected = new ArrayList<>();
         assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());
 
-        ILicense lic1 = mockLicense("TheCat", "TheName");
+        ILicense lic1 = testingLicense("TheCat", "TheName");
         expected.add(lic1);
         underTest.addLicense(lic1);
         SortedSet<ILicense> result = underTest.getLicenses(LicenseFilter.all);
         assertEquals(expected.size(), result.size());
         assertTrue(result.containsAll(expected));
 
-        ILicense[] lics = { mockLicense("Spot", "Data's cat"), mockLicense("Felix", "Cartoon cat") };
+        ILicense[] lics = { testingLicense("Spot", "Data's cat"), testingLicense("Felix", "Cartoon cat") };
         expected.addAll(Arrays.asList(lics));
         underTest.addLicenses(Arrays.asList(lics));
         result = underTest.getLicenses(LicenseFilter.all);
@@ -194,8 +192,8 @@ public void licenseFamiliesTest() {
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
         assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
 
-        ILicense[] lics = { mockLicense("TheCat", "TheName"), mockLicense("Spot", "Data's cat"),
-                mockLicense("Felix", "Cartoon cat") };
+        ILicense[] lics = { testingLicense("TheCat", "TheName"), testingLicense("Spot", "Data's cat"),
+                testingLicense("Felix", "Cartoon cat") };
         underTest.addLicenses(Arrays.asList(lics));
 
         assertEquals(lics.length, underTest.getLicenseFamilies(LicenseFilter.all).size());
@@ -216,8 +214,8 @@ public void licensesTest() {
         assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
         assertTrue(underTest.getLicenses(LicenseFilter.none).isEmpty());
 
-        ILicense[] lics = { mockLicense("TheCat", "TheName"), mockLicense("Spot", "Data's cat"),
-                mockLicense("Felix", "Cartoon cat") };
+        ILicense[] lics = { testingLicense("TheCat", "TheName"), testingLicense("Spot", "Data's cat"),
+                testingLicense("Felix", "Cartoon cat") };
         underTest.addLicenses(Arrays.asList(lics));
 
         assertEquals(lics.length, underTest.getLicenses(LicenseFilter.all).size());
@@ -347,7 +345,7 @@ public void testValidate() {
             assertEquals(0, sb.length());
         }
 
-        underTest.addLicense(mockLicense("valid", "Validation testing license"));
+        underTest.addLicense(testingLicense("valid", "Validation testing license"));
         try {
             underTest.validate(s -> sb.append(s));
             fail("should have thrown ConfigurationException");
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index fb14e5805..18228f5c3 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -80,7 +80,7 @@ public void standardTypeAnalyser() throws Exception {
                         + " * KIND, either express or implied.  See the License for the\n"
                         + " * specific language governing permissions and limitations\n" + " * under the License.    \n"
                         + " */\n" + "\n" + "            \n"
-                        + "</header-sample><header-type name='?????'/><license-family name='?????'/><type name='standard'/>",
+                        + "</header-sample><header-type name='?????'/><license-family name='Unknown license'/><type name='standard'/>",
                 out.toString());
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index ca608602d..bccfbd2db 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -37,7 +38,9 @@
 import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
+import org.apache.rat.testhelpers.TestingLicense;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,18 +51,19 @@
 abstract public class AbstractLicenseTest {
     private static int NAME = 0;
     private static int TEXT = 1;
-    
+
     private Defaults defaults;
     protected MetaData data;
 
-    private final String category;
+    private final String id;
+    private final String family;
     private final String name;
     private final String notes;
     private final String[][] targets;
-    
 
-    protected AbstractLicenseTest(String cat, String name, String notes, String[][] targets) {
-        this.category = ILicenseFamily.makeCategory(cat);
+    protected AbstractLicenseTest(String id, String family, String name, String notes, String[][] targets) {
+        this.id = id;
+        this.family = ILicenseFamily.makeCategory(family);
         this.name = name;
         this.notes = notes;
         this.targets = targets;
@@ -71,52 +75,49 @@ public void setup() {
         defaults = Defaults.builder().build();
     }
 
-    protected ILicense extractCategory(String category) {
-        ILicenseFamily testingFamily = ILicenseFamily.builder()
-                .setLicenseFamilyCategory(category)
-                .setLicenseFamilyName("Testing category").build();
-        List<ILicense> matchers = new ArrayList<>();
-        defaults.getLicenses(LicenseFilter.all).stream().filter(x -> x.getLicenseFamily().compareTo(testingFamily) == 0)
-                .forEach(matchers::add);
-        if (matchers.isEmpty()) {
-            fail("No machers for category: " + category);
-        }
-        if (matchers.size() > 1) {
-            fail("Too many matchers for category: " + category);
+    protected ILicense extractCategory(String id) {
+        TestingLicense testingLicense = new TestingLicense();
+        testingLicense.setId(id);
+        ILicense result = LicenseSetFactory.search(testingLicense, defaults.getLicenses(LicenseFilter.all));
+        if (result == null) {
+            fail("No licenses for id: " + id);
         }
-        return matchers.get(0);
+        return result;
     }
 
     @Test
     public void testMatchProcessing() throws IOException {
-        ILicense license = extractCategory(category);
-        try {
-            for (String[] target : targets) {
-                if (processText(license, target[TEXT])) {
-                    data.reportOnLicense(license);
-                    assertNotNull("No URL HEADER CATEGORY", data.get(MetaData.RAT_URL_HEADER_CATEGORY));
-                    assertEquals(license.toString(), category, data.get(MetaData.RAT_URL_HEADER_CATEGORY).getValue());
-                    assertNotNull("No URL LICENSE FAMILY CATEGORY", data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY));
-                    assertEquals(license.toString(), category,
-                            data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue());
-                    if (StringUtils.isNotBlank(notes)) {
-                        assertNotNull("No URL HEADER SAMPLE", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
-                        assertEquals(license.toString(), FullTextMatcher.prune(notes),
-                                FullTextMatcher.prune(data.get(MetaData.RAT_URL_HEADER_SAMPLE).getValue()));
+        ILicense license = extractCategory(id);
+            try {
+                for (String[] target : targets) {
+                    if (processText(license, target[TEXT])) {
+                        data.reportOnLicense(license);
+                        assertNotNull("No URL HEADER CATEGORY", data.get(MetaData.RAT_URL_HEADER_CATEGORY));
+                        assertEquals(license.toString(), family,
+                                data.get(MetaData.RAT_URL_HEADER_CATEGORY).getValue());
+                        assertNotNull("No URL LICENSE FAMILY CATEGORY",
+                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY));
+                        assertEquals(license.toString(), family,
+                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue());
+                        if (StringUtils.isNotBlank(notes)) {
+                            assertNotNull("No URL HEADER SAMPLE", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
+                            assertEquals(license.toString(), FullTextMatcher.prune(notes),
+                                    FullTextMatcher.prune(data.get(MetaData.RAT_URL_HEADER_SAMPLE).getValue()));
+                        } else {
+                            assertNull("URL HEADER SAMPLE was not null", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
+                        }
+                        assertNotNull("No URL LICENSE FAMILY NAME", data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
+                        assertEquals(license.toString(), name,
+                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue());
+                        data.clear();
                     } else {
-                        assertNull("URL HEADER SAMPLE was not null", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
+                        fail(license + " was not matched by " + target[NAME]);
                     }
-                    assertNotNull("No URL LICENSE FAMILY NAME", data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
-                    assertEquals(license.toString(), name, data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue());
-                    data.clear();
-                } else {
-                    fail(license + " was not matched by " + target[NAME]);
+                    license.reset();
                 }
+            } finally {
                 license.reset();
             }
-        } finally {
-            license.reset();
-        }
 
     }
 
@@ -137,18 +138,18 @@ public void testEmbeddedStrings() throws IOException {
         String formats[] = { "%s", "now is not the time %s for copyright", "#%s", "##%s", "## %s", "##%s##", "## %s ##",
                 "/*%s*/", "/* %s */" };
 
-        ILicense license = extractCategory(category);
-        try {
-            for (String[] target : targets) {
-                for (String fmt : formats) {
-                    boolean found = processText(license, String.format(fmt, target[TEXT]));
-                    license.reset();
-                    assertTrue(String.format("%s %s did not match pattern '%s' for target string %s", category, name,
-                            fmt, target[NAME]), found);
+        ILicense license = extractCategory(id);
+            try {
+                for (String[] target : targets) {
+                    for (String fmt : formats) {
+                        boolean found = processText(license, String.format(fmt, target[TEXT]));
+                        license.reset();
+                        assertTrue(String.format("%s %s did not match pattern '%s' for target string %s", id,
+                                name, fmt, target[NAME]), found);
+                    }
                 }
+            } finally {
+                license.reset();
             }
-        } finally {
-            license.reset();
-        }
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
index 6872610f3..2cee9242e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
@@ -24,8 +24,8 @@
  */
 public class ApacheSoftwareLicenseTest extends AbstractLicenseTest {
 
-    private static String category = "AL";
-    private static String name = "Apache License Version 2.0";
+    public static final String id = "AL";
+    public static final String name = "Apache License Version 2.0";
     private static String[][] targets = {
             { "short", "Licensed under the Apache License, Version 2.0 (the \"License\")" },
             { "short2",
@@ -60,7 +60,7 @@ public class ApacheSoftwareLicenseTest extends AbstractLicenseTest {
     };
 
     public ApacheSoftwareLicenseTest() {
-        super(category, name, null, targets);
+        super(id, id, name, null, targets);
     }
 
 //
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
index abda9f67d..9f122f54c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
@@ -20,7 +20,7 @@
 
 public class AppliedApacheSoftwareLicenseTest extends AbstractLicenseTest {
 
-    private static String CATEGORY = "ASL";
+    private static String ID = "ASL";
     private static String NAME = "Applied Apache License Version 2.0";
     private static String[][] targets = { { "simple", "/*\n" + " *  Copyright 2012-2013 FooBar.\n" + " *\n"
             + " *  Licensed under the Apache License, Version 2.0 (the \"License\");\n"
@@ -33,7 +33,7 @@ public class AppliedApacheSoftwareLicenseTest extends AbstractLicenseTest {
             + " *  limitations under the License.\n" + " */\n" } };
 
     public AppliedApacheSoftwareLicenseTest() {
-        super(CATEGORY, NAME, null, targets);
+        super(ID, ApacheSoftwareLicenseTest.id, ApacheSoftwareLicenseTest.name, null, targets);
     }
     /*
       
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
index 9a5614599..4adc7638e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
@@ -19,8 +19,8 @@
 package org.apache.rat.analysis.license;
 
 public class CDDL1LicenseTest extends AbstractLicenseTest {
-    private static String category = "CDDL1";
-    private static String name = "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
+    public static final String id = "CDDL1";
+    public static final String name = "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
     private static String[][] targets = {
             { "fullTxt",
                     "The contents of this file are subject to the terms of the Common Development "
@@ -39,7 +39,7 @@ public class CDDL1LicenseTest extends AbstractLicenseTest {
             { "spdx-space", "SPDX-License-Identifier: CDDL-1.0" } };
 
     public CDDL1LicenseTest() {
-        super(category, name, null, targets);
+        super(id, id, name, null, targets);
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
index 284e685c5..74b78df6a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
@@ -64,7 +64,7 @@ public static Collection<Object[]> data() {
         return Arrays.asList(GPL1, GPL2, GPL3);
     }
 
-    public GPLLicenseTest(String cat, String name, String[][] targets) {
-        super(cat, name, null, targets);
+    public GPLLicenseTest(String id, String name, String[][] targets) {
+        super(id, id, name, null, targets);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
index 0b772a7d7..a059ebdbd 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
@@ -19,7 +19,7 @@
 package org.apache.rat.analysis.license;
 
 public class GeneratedLicenseTest extends AbstractLicenseTest {
-    private static String category = "GEN";
+    private static String id = "GEN";
     private static String name = "Generated Files";
     private static String notes = "Files that are autmoatically generated.";
     private static String[][] targets = { { "Cayenne", "generated by Cayenne" }, { "JJTree", "Generated By:JJTree" },
@@ -42,6 +42,6 @@ public class GeneratedLicenseTest extends AbstractLicenseTest {
             { "generated by", "This class was generated by" }, { "javadoc", "Generated by javadoc" } };
 
     public GeneratedLicenseTest() {
-        super(category, name, notes, targets);
+        super(id, id, name, notes, targets);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
index 9e2fc7ac6..36abe5864 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
@@ -19,8 +19,7 @@
 package org.apache.rat.analysis.license;
 
 public class IllumosLicenseTest extends AbstractLicenseTest {
-    private static String category = "ILLUMOS";
-    private static String name = "ILLUMOS CDDL1 Derived license";
+    private static String id = "ILLUMOS";
     private static String note = "Modified CDDL1 license";
     private static String[][] targets = { { "illumos",
             "The contents of this file are subject to the terms of the "
@@ -28,7 +27,7 @@ public class IllumosLicenseTest extends AbstractLicenseTest {
                     + "You may not use this file except in compliance with the License. " } };
 
     public IllumosLicenseTest() {
-        super(category, name, note, targets);
+        super(id, CDDL1LicenseTest.id, CDDL1LicenseTest.name, note, targets);
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
index 49c9d68a9..99d0a3550 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
@@ -19,13 +19,13 @@
 package org.apache.rat.analysis.license;
 
 public class MITLicenseTest extends AbstractLicenseTest {
-    private static String cat = "MIT";
+    private static String id = "MIT";
     private static String name = "The MIT License";
     private static String[][] targets = { { "fulltext",
             "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \\\"Software\\\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." },
             { "spdx-tab", "SPDX-License-Identifier:\tMIT" }, { "spdx-space", "SPDX-License-Identifier: MIT" }, };
 
     public MITLicenseTest() {
-        super(cat, name, null, targets);
+        super(id, id, name, null, targets);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
index ea03d8de1..2089cf49a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
@@ -20,7 +20,7 @@
 
 public class OASISLicenseTest extends AbstractLicenseTest {
 
-    private static String category = "OASIS";
+    private static String id = "OASIS";
     private static String name = "OASIS Open License";
     private static String notes = "No modifications allowed";
     private static String[][] targets = { { "fulltext",
@@ -30,7 +30,7 @@ public class OASISLicenseTest extends AbstractLicenseTest {
                     + "\\nCopyright OASIS Open, 1999" }, };
 
     public OASISLicenseTest() {
-        super(category, name, notes, targets);
+        super(id, id, name, notes, targets);
     }
     /*
     @Test(timeout = 2000) // may need to be adjusted if many more files are added
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
index 0f4c51477..00df88350 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
@@ -45,8 +45,8 @@ public static Collection<Object[]> data() {
         return Arrays.asList(W3C, W3CD);
     }
 
-    public W3CLicenseTest(String cat, String name, String note, String[][] targets) {
-        super(cat, name, note, targets);
+    public W3CLicenseTest(String id, String name, String note, String[][] targets) {
+        super(id, id, name, note, targets);
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index 475810acd..c480a36fe 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -33,14 +33,17 @@
 import org.apache.rat.configuration.builders.RegexBuilder;
 import org.apache.rat.configuration.builders.SpdxBuilder;
 import org.apache.rat.configuration.builders.TextBuilder;
+import org.apache.rat.license.ILicenseFamily;
 import org.junit.Test;
 
 public class ConfigurationReaderTest {
 
-    private static String[] EXPECTED_IDS = { "AL", "ASL", "BSD-3", "CDDL1", "DOJO", "GEN", "GPL1", "GPL2", "GPL3",
+    
+    private static String[] EXPECTED_IDS = { "AL", "BSD-3", "CDDL1", "GEN", "GPL1", "GPL2", "GPL3",
             "MIT", "OASIS", "W3C", "W3CD" };
-    private static String[] EXPECTED_LICENSES = { "AL   ", "ASL  ", "BSD-3", "CDDL1", "DOJO ", "GEN  ", "GPL1 ",
-            "GPL2 ", "GPL3 ", "ILLUM", "MIT  ", "OASIS", "TMF  ", "W3C  ", "W3CD " };
+    
+    private static String[] EXPECTED_LICENSES = { "AL", "ASL", "BSD-3", "CDDL1", "DOJO", "GEN", "GPL1",
+            "GPL2", "GPL3", "ILLUMOS", "MIT", "OASIS", "TMF", "W3C", "W3CD" };
 
     @Test
     public void approvedLicenseIdTest() {
@@ -49,6 +52,7 @@ public void approvedLicenseIdTest() {
         reader.read(url);
 
         Collection<String> readCategories = reader.approvedLicenseId();
+        
         assertArrayEquals(EXPECTED_IDS, readCategories.toArray(new String[readCategories.size()]));
     }
 
@@ -59,7 +63,7 @@ public void LicensesTest() {
         reader.read(url);
 
         Collection<String> readCategories = reader.readLicenses().stream()
-                .map(x -> x.getLicenseFamily().getFamilyCategory()).collect(Collectors.toList());
+                .map(x -> x.getId()).collect(Collectors.toList());
         assertArrayEquals(EXPECTED_LICENSES, readCategories.toArray(new String[readCategories.size()]));
     }
     
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 675d528a4..2aa860c76 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -44,14 +44,12 @@ public class DefaultPolicyTest {
     /**
      * This is the number of accepted licenses in the default license file : /org/apache/rat/default.xml
      */
-    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 13;
+    private static final int NUMBER_OF_DEFAULT_ACCEPTED_LICENSES = 11;
     
     private static final ILicenseFamily[] APPROVED_FAMILIES = {
             makeFamily("AL", "Apache License Version 2.0"),
-            makeFamily("ASL", "Applied Apache License Version 2.0"),
             makeFamily("BSD-3", "BSD 3 clause"),
             makeFamily("CDDL1", "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"),
-            makeFamily("DOJO", "DOJO License"),
             makeFamily("GEN", "Generated Files"),
             makeFamily("GPL1", "GNU General Public License, version 1"),
             makeFamily("GPL2", "GNU General Public License, version 2"),
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index ddc6e004c..a422ed3d2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -40,6 +40,8 @@
 import org.apache.rat.report.xml.writer.IXmlWriter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 import org.apache.rat.test.utils.Resources;
+import org.apache.rat.testhelpers.TestingLicense;
+import org.apache.rat.testhelpers.TestingMatcher;
 import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Before;
@@ -71,14 +73,13 @@ public void standardReport() throws Exception {
 
         ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("TEST")
                 .setLicenseFamilyName("Testing family").build();
-        final ILicense mockLicense = mock(ILicense.class);
-        when(mockLicense.matches(any())).thenReturn(State.t);
-        when(mockLicense.getLicenseFamily()).thenReturn(family);
+        
+        final TestingLicense testingLicense = new TestingLicense(new TestingMatcher(true), family);
 
         DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY);
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
-        configuration.addLicense(mockLicense);
+        configuration.addLicense(testingLicense);
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
         report(directory, report);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
index 980d6db8b..53c0844c9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLicense.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.testhelpers;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
@@ -31,6 +32,8 @@ public class TestingLicense implements ILicense {
     private IHeaderMatcher matcher;
     private String derivedFrom;
     private String notes;
+    private String name;
+    private String id;
 
     /**
      * Creates a testing license named "DfltTst" with category of "DfltT" and a default 
@@ -109,10 +112,21 @@ public IHeaderMatcher getMatcher() {
     public void setDerivedFrom(String derivedFrom) {
         this.derivedFrom = derivedFrom;
     }
+    
+    /**
+     * Sets the name from value for this license.
+     * @param name the name of this license.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
 
+    public void setId(String id) {
+        this.id = id;
+    }
     @Override
     public String getId() {
-        return matcher.getId();
+        return StringUtils.defaultIfBlank(id, family.getFamilyCategory().trim());
     }
 
     @Override
@@ -150,6 +164,11 @@ public String getNotes() {
         return notes;
     }
 
+    @Override
+    public String getName() {
+        return StringUtils.defaultIfBlank(name, family.getFamilyName());
+    }
+    
     @Override
     public String derivedFrom() {
         return derivedFrom;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
index af3a5903d..70722000c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingMatcher.java
@@ -39,6 +39,14 @@ public TestingMatcher() {
         this("dfltMtch", false);
     }
 
+    /**
+     * Constructs a matcher with the specified id and matching result.
+     * @param id the ID for this matcher
+     * @param result if {@code true} will match everything, otherwise it matches nothing.
+     */
+    public TestingMatcher(boolean result) {
+        this("dfltMtch", result);
+    }
     /**
      * Constructs a matcher with the specified id and matching result.
      * @param id the ID for this matcher

From 6784eb4917defb38b9a6c07d9b2189ef6924a69c Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 22 Oct 2023 20:31:47 +0200
Subject: [PATCH 128/299] fixed Maven issues

---
 .../org/apache/rat/ReportConfiguration.java   | 28 +++++++++-
 .../rat/configuration/LicenseReader.java      | 10 +++-
 .../configuration/XMLConfigurationReader.java | 17 +++++--
 .../ConfigurationReaderTest.java              | 11 ++++
 .../org/apache/rat/mp/AbstractRatMojo.java    | 21 +++++++-
 ...seFamilySpecification.java => Family.java} | 51 ++++++++-----------
 .../main/java/org/apache/rat/mp/License.java  | 12 +++--
 7 files changed, 109 insertions(+), 41 deletions(-)
 rename apache-rat-plugin/src/main/java/org/apache/rat/mp/{LicenseFamilySpecification.java => Family.java} (54%)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 42186ac52..d04b781cc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -195,12 +195,38 @@ public void addLicense(ILicense license) {
      * Adds multiple licenses to the list of licenses. Does not add the licenses to
      * the list of approved licenses.
      *
-     * @param license The license t oadd.
+     * @param license The license to add.
      */
     public void addLicenses(Collection<ILicense> licenses) {
         this.licenses.addAll(licenses);
     }
+    
+    /**
+     * Adds a license family to the list of families. Does not add the family to the list
+     * of approved licenses.
+     * 
+     * @param family The license to add to the list of licenses.
+     */
+    public void addFamily(ILicenseFamily family) {
+        if (family != null) {
+            this.families.add(family);
+        }
+    }
 
+    /**
+     * Adds multiple families to the list of license families. Does not add the licenses to
+     * the list of approved licenses.
+     *
+     * @param license The license t oadd.
+     */
+    public void addFamilies(Collection<ILicenseFamily> families) {
+        this.families.addAll(families);
+    }
+    
+    public SortedSet<ILicenseFamily> getFamilies() {
+        return Collections.unmodifiableSortedSet(families);
+    }
+    
     /**
      * Adds an ILicenseFamily to the list of approved licenses.
      *
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index 47d000731..d48f613f8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -22,6 +22,7 @@
 import java.util.SortedSet;
 
 import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
 
 /**
  * An interface describing the methods of a LicenseReader.
@@ -37,9 +38,16 @@ public interface LicenseReader {
     /**
      * Reads the configuration and extracts instances of ILicense.
      * 
-     * @return A collection of Base licenses.
+     * @return A collection of ILicense.
      */
     SortedSet<ILicense> readLicenses();
+    
+    /**
+     * Reads the configuration and extracts instances of ILicenseFamily.
+     * 
+     * @return A collection of iLicensFamily.
+     */
+    SortedSet<ILicenseFamily> readFamilies();
 
     /**
      * Reads the configuration and extracts the list of approved licenses.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 75e897eef..9517b329e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -294,18 +294,27 @@ private ILicense parseLicense(Node licenseNode) {
 
     @Override
     public SortedSet<ILicense> readLicenses() {
+        readFamilies();
         readMatcherBuilders();
         if (licenses.size() == 0) {
-            nodeListConsumer(document.getElementsByTagName(FAMILIES),
-                    x -> nodeListConsumer(x.getChildNodes(), y -> parseFamily(y)));
-            nodeListConsumer(document.getElementsByTagName(APPROVED),
-                    x -> nodeListConsumer(x.getChildNodes(), y -> parseApproved(y)));
             nodeListConsumer(document.getElementsByTagName(LICENSE), x -> licenses.add(parseLicense(x)));
             document = null;
         }
         return Collections.unmodifiableSortedSet(licenses);
     }
+    
 
+    @Override
+    public SortedSet<ILicenseFamily> readFamilies() {
+        if (licenseFamilies.isEmpty()) {
+            nodeListConsumer(document.getElementsByTagName(FAMILIES),
+                    x -> nodeListConsumer(x.getChildNodes(), y -> parseFamily(y)));
+            nodeListConsumer(document.getElementsByTagName(APPROVED),
+                    x -> nodeListConsumer(x.getChildNodes(), y -> parseApproved(y)));
+        }
+        return Collections.unmodifiableSortedSet(licenseFamilies);
+    }
+    
     private ILicenseFamily parseFamily(Map<String, String> attributes) {
         if (attributes.containsKey(ATT_ID)) {
             ILicenseFamily.Builder builder = ILicenseFamily.builder();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index c480a36fe..06795e436 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -67,6 +67,17 @@ public void LicensesTest() {
         assertArrayEquals(EXPECTED_LICENSES, readCategories.toArray(new String[readCategories.size()]));
     }
     
+    @Test
+    public void LicenseFamiliesTest() {
+        XMLConfigurationReader reader = new XMLConfigurationReader();
+        URL url = ConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
+        reader.read(url);
+
+        Collection<String> readCategories = reader.readFamilies().stream()
+                .map(x -> x.getFamilyCategory().trim()).collect(Collectors.toList());
+        assertArrayEquals(EXPECTED_IDS, readCategories.toArray(new String[readCategories.size()]));
+    }
+    
     private void checkMatcher( String name, Class<? extends AbstractBuilder> clazz)
     {
         AbstractBuilder builder =  MatcherBuilderTracker.getMatcherBuilder(name);
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 94c5a3492..f66295d9d 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -58,6 +58,8 @@
 import org.apache.rat.configuration.MatcherReader;
 import org.apache.rat.configuration.MatcherBuilderTracker;
 import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.mp.util.ScmIgnoreParser;
 import org.apache.rat.report.IReportable;
 import org.codehaus.plexus.util.DirectoryScanner;
@@ -105,6 +107,9 @@ public abstract class AbstractRatMojo extends AbstractMojo {
 
     @Parameter
     private License[] licenses;
+    
+    @Parameter
+    private Family[] families;
 
     /**
      * Specifies files, which are included in the report. By default, all files are
@@ -247,7 +252,7 @@ protected Defaults.Builder getDefaultsBuilder() {
     }
 
     protected ReportConfiguration getConfiguration() throws MojoExecutionException {
-        @SuppressWarnings("resource")
+        //@SuppressWarnings("resource")
         ReportConfiguration result = new ReportConfiguration();
         
         if (additionalLicenseFiles != null) {
@@ -270,6 +275,18 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                 }
             }
         }
+        if (families != null) {
+            Log log = getLog();
+            if (log.isDebugEnabled()) {
+                log.debug(String.format("%s license families loaded from pom", families.length));
+            }
+            Consumer<ILicenseFamily> logger = log.isDebugEnabled() ? (l) -> log.debug(String.format("Family: %s", l))
+                    : (l) -> {
+                    };
+
+            Consumer<ILicenseFamily> process = logger.andThen(result::addFamily);
+            Arrays.stream(families).map(Family::build).forEach(process);
+        }
         if (licenses != null) {
             Log log = getLog();
             if (log.isDebugEnabled()) {
@@ -284,7 +301,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     };
 
             Consumer<ILicense> process = logger.andThen(result::addLicense).andThen(addApproved);
-            Arrays.stream(licenses).map(License::build).forEach(process);
+            Arrays.stream(licenses).map(x -> x.build(result.getLicenseFamilies(LicenseFilter.all))).forEach(process);
         }
 
         if (approvedLicenses != null && approvedLicenses.length > 0) {
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
similarity index 54%
rename from apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
rename to apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
index 5bd4941ea..9a0d8ff55 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/LicenseFamilySpecification.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
@@ -1,5 +1,3 @@
-package org.apache.rat.mp;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,36 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.rat.mp;
 
-/**
- * Used to specify additional license families. A license family is basically a class, which implements
- * {@link org.apache.rat.license.ILicenseFamily}.
- */
-public class LicenseFamilySpecification
-{
-    /**
-     * The license family's class name.
-     */
-    private String className;
-
-    /**
-     * Returns the license familys class name.
-     * 
-     * @return Class name of the license family.
-     */
-    public String getClassName()
-    {
-        return className;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+public class Family  {
+
+    private ILicenseFamily.Builder builder = ILicenseFamily.builder();
+
+    @Parameter(required = true)
+    private String id;
+
+    @Parameter(required = true)
+    private String name;
+
+    public Family() {
     }
 
-    /**
-     * Sets the license family's class name. Required.
-     * 
-     * @param pClassName
-     *            Class name of the license family.
-     */
-    public void setClassName( String pClassName )
-    {
-        className = pClassName;
+    public ILicenseFamily build() {
+        return builder.setLicenseFamilyCategory(id)
+                .setLicenseFamilyName(name).build();
     }
+
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
index d506faf52..4e44fb90a 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
@@ -18,9 +18,12 @@
  */
 package org.apache.rat.mp;
 
+import java.util.SortedSet;
+
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
 
 public class License extends EnclosingMatcher {
 
@@ -34,6 +37,9 @@ public class License extends EnclosingMatcher {
 
     @Parameter(required = true)
     private String id;
+    
+    @Parameter(required = true)
+    private String family;
 
     @Parameter(required = true)
     private String name;
@@ -46,9 +52,9 @@ protected void setMatcher(IHeaderMatcher.Builder builder) {
         this.builder.setMatcher(builder);
     }
 
-    public ILicense build() {
-        return builder.setDerivedFrom(derivedFrom).setLicenseFamilyCategory(id)
-                .setLicenseFamilyName(name).setNotes(notes).build();
+    public ILicense build(SortedSet<ILicenseFamily> context) {
+        return builder.setDerivedFrom(derivedFrom).setLicenseFamilyCategory(family)
+                .setName(name).setNotes(notes).build(context);
     }
 
 }

From 263c8cd5d7b61e1ad2e2f5b43cfe5861b27392cd Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 23 Oct 2023 00:18:38 +0200
Subject: [PATCH 129/299] fixed ant tasks

---
 .../org/apache/rat/ReportConfiguration.java   | 33 +++++++-
 .../apache/rat/license/ILicenseBuilder.java   |  2 +
 .../apache/rat/license/ILicenseFamily.java    |  6 ++
 .../rat/license/ILicenseFamilyBuilder.java    |  6 ++
 .../java/org/apache/rat/anttasks/Family.java  | 38 ++++++++++
 .../java/org/apache/rat/anttasks/License.java | 22 ++++--
 .../java/org/apache/rat/anttasks/Report.java  | 16 +++-
 .../rat/anttasks/AbstractRatAntTaskTest.java  |  1 -
 .../org/apache/rat/anttasks/ReportTest.java   |  2 +-
 .../test/resources/antunit/customLicense.xml  |  5 +-
 .../antunit/report-bad-configurations.xml     | 13 ++--
 .../test/resources/antunit/report-junit.xml   | 21 +++--
 .../antunit/report-normal-operation.xml       | 76 +++++++++----------
 13 files changed, 171 insertions(+), 70 deletions(-)
 create mode 100644 apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index d04b781cc..61f11f1b8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -188,8 +188,24 @@ public IOSupplier<PrintWriter> getWriter() {
     public void addLicense(ILicense license) {
         if (license != null) {
             this.licenses.add(license);
+            this.families.add(license.getLicenseFamily());
         }
     }
+    
+    /**
+     * Adds a license to the list of licenses. Does not add the license to the list
+     * of approved licenses.
+     * 
+     * @param builder The license builder to build and add to the list of licenses.
+     */
+    public ILicense addLicense(ILicense.Builder builder) {
+        if (builder != null) {
+            ILicense license = builder.build(families);
+            this.licenses.add(license);
+            return license;
+        }
+        return null;
+    }
 
     /**
      * Adds multiple licenses to the list of licenses. Does not add the licenses to
@@ -199,13 +215,14 @@ public void addLicense(ILicense license) {
      */
     public void addLicenses(Collection<ILicense> licenses) {
         this.licenses.addAll(licenses);
+        licenses.stream().map(ILicense::getLicenseFamily).forEach(families::add);
     }
     
     /**
      * Adds a license family to the list of families. Does not add the family to the list
      * of approved licenses.
      * 
-     * @param family The license to add to the list of licenses.
+     * @param family The license family to add to the list of license families.
      */
     public void addFamily(ILicenseFamily family) {
         if (family != null) {
@@ -213,11 +230,23 @@ public void addFamily(ILicenseFamily family) {
         }
     }
 
+    /**
+     * Adds a license family to the list of families. Does not add the family to the list
+     * of approved licenses.
+     * 
+     * @param builder The licenseFamily.Builder to build and add to the list of licenses.
+     */
+    public void addFamily(ILicenseFamily.Builder builder) {
+        if (builder != null) {
+            this.families.add(builder.build());
+        }
+    }
+    
     /**
      * Adds multiple families to the list of license families. Does not add the licenses to
      * the list of approved licenses.
      *
-     * @param license The license t oadd.
+     * @param license The licensefamily to add.
      */
     public void addFamilies(Collection<ILicenseFamily> families) {
         this.families.addAll(families);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
index 6427d42c8..9f0fc93da 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
@@ -18,6 +18,7 @@
  */
 package org.apache.rat.license;
 
+import java.util.Objects;
 import java.util.SortedSet;
 
 import org.apache.rat.analysis.IHeaderMatcher;
@@ -86,6 +87,7 @@ public Builder setName(String name) {
     @Override
     public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
         ILicenseFamily family = LicenseSetFactory.search(licenseFamily.build(), licenseFamilies);
+        Objects.requireNonNull(family, "License family may not be null.  Family "+licenseFamily.getCategory()+" not found.");
         return new SimpleLicense(family, matcher.build(), derivedFrom, notes, name, id);
     }
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index d331223bb..5e301b203 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -72,6 +72,12 @@ interface Builder {
          * @return this builder for chaining.
          */
         Builder setLicenseFamilyName(String licenseFamilyName);
+        
+        /**
+         * Gets the category that this builder is building.
+         * @return the category that this builder is building.
+         */
+        String getCategory();
 
         /**
          * @return a new ILicenseFamily instance.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
index 917bdfbf3..88b6238d2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
@@ -35,6 +35,12 @@ public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
         this.licenseFamilyCategory = licenseFamilyCategory;
         return this;
     }
+    
+
+    @Override
+    public String getCategory() {
+        return licenseFamilyCategory;
+    }
 
     @Override
     public Builder setLicenseFamilyName(String licenseFamilyName) {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java
new file mode 100644
index 000000000..45662fbb8
--- /dev/null
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rat.anttasks;
+
+import org.apache.rat.license.ILicenseFamily;
+
+public class Family {
+
+    private ILicenseFamily.Builder builder = ILicenseFamily.builder();
+
+    public ILicenseFamily build() {
+        return builder.build();
+    }
+
+    public void setId(String id) {
+        builder.setLicenseFamilyCategory(id);
+    }
+
+    public void setName(String name) {
+        builder.setLicenseFamilyName(name);
+    }
+}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
index 0d7aacd28..2ba0db6a2 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
@@ -19,14 +19,22 @@
 package org.apache.rat.anttasks;
 
 import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+import java.util.SortedSet;
+
 import org.apache.rat.analysis.IHeaderMatcher;
 
 public class License {
 
     private ILicense.Builder builder = ILicense.builder();
+    
+    ILicense.Builder asBuilder() {
+        return builder;
+    }
 
-    public ILicense build() {
-        return builder.build();
+    public ILicense build(SortedSet<ILicenseFamily> context) {
+        return builder.build(context);
     }
 
     public void setNotes(String notes) {
@@ -42,12 +50,16 @@ public void setDerivedFrom(String derivedFrom) {
         builder.setDerivedFrom(derivedFrom);
     }
 
-    public void setId(String licenseFamilyCategory) {
+    public void setFamily(String licenseFamilyCategory) {
         builder.setLicenseFamilyCategory(licenseFamilyCategory);
     }
+    
+    public void setId(String id) {
+        builder.setId(id);
+    }
 
-    public void setName(String licenseFamilyName) {
-        builder.setLicenseFamilyName(licenseFamilyName);
+    public void setName(String name) {
+        builder.setName(name);
     }
 
     public void add(IHeaderMatcher.Builder builder) {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 3606ec78e..c58638805 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -37,7 +37,9 @@
 import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.MatcherReader;
+import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.configuration.MatcherBuilderTracker;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -72,6 +74,7 @@ public class Report extends Task {
     private Defaults.Builder defaultsBuilder;
     private final ReportConfiguration configuration;
     private List<License> licenses = new ArrayList<>();
+    private List<Family> families = new ArrayList<>();
     /**
      * will hold any nested resource collection
      */
@@ -106,6 +109,10 @@ public void setReportFile(File reportFile) {
     public void addLicense(License lic) {
         licenses.add(lic);
     }
+    
+    public void addFamily(Family family) {
+        families.add(family);
+    }
 
     /**
      * 
@@ -203,12 +210,13 @@ public void setAddDefaultDefinitions(File fileName) {
     public void execute() {
         try {
             Defaults defaults = defaultsBuilder.build();
+            
             configuration.setFrom(defaults);
             configuration.setReportable(new ResourceCollectionContainer(nestedResources));
-            licenses.stream().map(License::build).forEach((l) -> {
-                configuration.addLicense(l);
-                configuration.addApprovedLicenseCategory(l.getLicenseFamily());
-            });
+            families.stream().map(Family::build).forEach(configuration::addFamily);
+            licenses.stream().map(License::asBuilder).forEach(l -> 
+                configuration.addApprovedLicenseCategory(configuration.addLicense(l).getLicenseFamily())
+            );
             validate();
             Reporter.report(configuration);
         } catch (BuildException e) {
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
index 4db139489..1ac65c051 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
@@ -43,7 +43,6 @@ public void setUp() {
         buildRule.configureProject(getAntFile().getPath());
         buildRule.getProject().setProperty("output.dir", tempDir.getAbsolutePath());
         buildRule.getProject().setProperty("resource.dir", getAntFile().getParent());
-        
     }
 
     protected void assertLogDoesNotMatch(String pPattern) {
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index f1e4c07e7..248914a37 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -80,7 +80,7 @@ public void testWithALUnknown() throws Exception {
     public void testCustomLicense() throws Exception {
         buildRule.executeTarget("testCustomLicense");
         assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
-        assertLogMatches(" EXAMP +\\Q" + getAntFileName() + "\\E");
+        assertLogMatches(" newFa +\\Q" + getAntFileName() + "\\E");
     }
     
     @Test
diff --git a/apache-rat-tasks/src/test/resources/antunit/customLicense.xml b/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
index 9d8dd94c2..e7b4b0139 100644
--- a/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/customLicense.xml
@@ -20,8 +20,11 @@
 
 -->
 <rat-config>
+    <families>
+    	<family id="newFam" name="my new family" />
+    </families>
 	<licenses>
-		<license id="EXAMPLE" name="Example License">
+		<license family="newFam" id="EXAMPLE" name="Example License">
 			<regex expr='.' />
 		</license>
 	</licenses>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
index d0759865a..ac0d6c60c 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
@@ -76,11 +76,11 @@
 
   <target name="testLicenseRequiresFamilyName">
     <au:expectfailure
-        expectedMessage="LicenseFamily Name must be specified">
+        expectedMessage="License family may not be null.  Family YASL1 not found">
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
-            id="YASL1"
+            family="YASL1"
             notes="Interesting License">
           <rat:text>exmpl</rat:text>
         </rat:license>
@@ -94,7 +94,6 @@
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
-            name="Yet Another Software License (YASL) 1.0"
             notes="Interesting License">
           <rat:text text="exampl"/>
         </rat:license>
@@ -107,9 +106,9 @@
         expectedMessage="'regex' type matcher requires an expression">
       <rat:report>
         <file file="${ant.file}"/>
+        <rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
         <rat:license
-            id="YASL1"
-            name="Yet Another Software License (YASL) 1.0"
+            family="YASL1"
             notes="Interesting License">
             <rat:regex />
         </rat:license>
@@ -122,9 +121,9 @@
         expectedMessage="text value is required">
       <rat:report>
         <file file="${ant.file}"/>
+        <rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
         <rat:license
-            id="YASL1"
-            name="Yet Another Software License (YASL) 1.0"
+            family="YASL1"
             notes="Interesting License">
         	<rat:text/>
         </rat:license>
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index f0a1ade07..0ef2e8570 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -62,9 +62,9 @@
 
 	<target name="testWithALUnknown">
 		<rat:report useDefaultLicenses="false">
+			<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 			<rat:license
-				id="YASL1"
-				name="Yet Another Software License (YASL) 1.0"
+				family="YASL1"
 				notes="Interesting License">
 				<rat:copyright start="2023" end="2024" owner="public domain" />
 			</rat:license>
@@ -82,9 +82,9 @@
 
 	<target name="testInlineCustomMatcher" depends="prepareCustomMatcher">
 		<rat:report useDefaultLicenses="false">
+			<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 			<rat:license
-				id="YASL1"
-				name="Yet Another Software License (YASL) 1.0"
+				family="YASL1"
 				notes="Interesting License">
 				<inlineMatcher />
 			</rat:license>
@@ -94,9 +94,9 @@
 
 	<target name="testCustomMatcher">
 		<rat:report useDefaultLicenses="false">
+			<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 			<rat:license
-				id="YASL1"
-				name="Yet Another Software License (YASL) 1.0"
+				family="YASL1"
 				notes="Interesting License">
 				<matcher />
 			</rat:license>
@@ -106,9 +106,9 @@
 
 	<target name="testCustomMatcherBuilder">
 		<rat:report useDefaultLicenses="false">
+			<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 			<rat:license
-				id="YASL1"
-				name="Yet Another Software License (YASL) 1.0"
+				family="YASL1"
 				notes="Interesting License">
 				<matcherBuilder />
 			</rat:license>
@@ -152,9 +152,9 @@
 	<target name="testCopyrightBuild">
 		<rat:report>
 			<file file="${resource.dir}/index.apt" />
+			<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 			<rat:license
-				id="YASL1"
-				name="Yet Another Software License (YASL) 1.0"
+				family="YASL1"
 				notes="Interesting License">
 				<rat:copyright start="2023" end="2024" owner="public domain" />
 			</rat:license>
@@ -162,7 +162,6 @@
 	</target>
 
 	<target name="prepareCustomMatcher">
-
 		<mkdir dir="${output.dir}/test-classes" />
 		<mkdir dir="${output.dir}/src/org/example" />
 		<echo file="${output.dir}/src/org/example/InlineMatcher.java"><![CDATA[
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
index 141d860c8..fa7d1a1ec 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-normal-operation.xml
@@ -129,9 +129,9 @@ SPDX-License-Identifier: Apache-2.0
 	<target name="testWithALUnknown">
 		<rat:report useDefaultLicenses="false">
 			<file file="${ant.file}" />
+			<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 			<rat:license
-				id="YASL1"
-				name="Yet Another Software License (YASL) 1.0"
+				family="YASL1"
 				notes="Interesting License">
 				<!-- non existant copyright in this file -->
 				<rat:copyright owner="non existant" />
@@ -146,9 +146,9 @@ SPDX-License-Identifier: Apache-2.0
 <!--			xml as the report -->
 			<rat:report useDefaultLicenses="false" reportFile="${report.file}">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					 <!--  non existant copyright in this file  -->
 					<rat:copyright owner="non existant" />
@@ -163,9 +163,9 @@ SPDX-License-Identifier: Apache-2.0
 <!-- FIXME		<target name="testCustomMatcher">-->
 <!-- 			<rat:report useDefaultLicenses="false">-->
 <!--				<file file="${ant.file}" />-->
+<!--				<rat:family id='EXMPL' name='Yet Another Software License (EXAMPLE) 1.0'/> -->
 <!--				<rat:license-->
-<!--					id="EXMPL"-->
-<!--					name="Yet Another Software License (EXAMPLE) 1.0"-->
+<!--					family="EXMPL"-->
 <!--					notes="Interesting License">-->
 <!--					<matcher />-->
 <!--				</rat:license>-->
@@ -177,9 +177,9 @@ SPDX-License-Identifier: Apache-2.0
 <!-- FIXME		<target name="testCustomMatcherBuilder">-->
 <!--			<rat:report useDefaultLicenses="false">-->
 <!--				<file file="${ant.file}" />-->
+<!--				<rat:family id='EXMPL' name='Yet Another Software License (EXAMPLE) 1.0'/>-->
 <!--				<rat:license-->
-<!--					id="EXMPL"-->
-<!--					name="Yet Another Software License (EXAMPLE) 1.0"-->
+<!--					family="EXMPL"-->
 <!--					notes="Interesting License">-->
 <!--					<matcherBuilder />-->
 <!--				</rat:license>-->
@@ -192,9 +192,9 @@ SPDX-License-Identifier: Apache-2.0
 	depends="prepareCustomMatcher">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='EXMPL' name='Yet Another Software License (EXAMPLE) 1.0'/>
 				<rat:license
-					id="EXMPL"
-					name="Yet Another Software License (EXAMPLE) 1.0"
+					family="EXMPL"
 					notes="Interesting License">
 					<myMatcher />
 				</rat:license>
@@ -218,9 +218,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testAnyBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:any>
 						<rat:copyright start="2023" end="2024" owner="public domain" />
@@ -233,9 +233,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testAllBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:all>
 						<rat:text text="the other text" />
@@ -248,9 +248,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testCopyrightBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${resource.dir}/index.apt" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:copyright start="2023" end="2024" owner="public domain" />
 				</rat:license>
@@ -260,9 +260,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testNotBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:not>
 						 <!--  non existant copyright in this file  -->
@@ -275,9 +275,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testRegexAttributeBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:regex regex="regex\sregex" />
 				</rat:license>
@@ -287,9 +287,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testRegexNestedTextBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:regex>regex\sregex</rat:regex>
 				</rat:license>
@@ -299,9 +299,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testSpdxAttributeBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:spdx name="Apache-2.0" />
 				</rat:license>
@@ -311,9 +311,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testSpdxNestedTextBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:spdx>Apache-2.0</rat:spdx>
 				</rat:license>
@@ -323,9 +323,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testTextAttributeBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:text text="The text" />
 				</rat:license>
@@ -335,9 +335,9 @@ SPDX-License-Identifier: Apache-2.0
 		<target name="testTextNestedTextBuild">
 			<rat:report useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:text>The text</rat:text>
 				</rat:license>
@@ -350,9 +350,9 @@ SPDX-License-Identifier: Apache-2.0
 				useDefaultLicenses="false"
 				removeApprovedLicense="YASL1">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:text>License Family Name: Yet Another Software License
 						(YASL) 1.0</rat:text>
@@ -368,9 +368,9 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report reportFile="${report.file}"
 				useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:text>License Family Name: Yet Another Software License
 						(YASL) 1.0</rat:text>
@@ -386,9 +386,9 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report reportFile="${report.file}"
 				useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					 <!--  non existant copyright in this file  -->
 					<rat:copyright owner="non existant" />
@@ -405,9 +405,9 @@ SPDX-License-Identifier: Apache-2.0
 			<rat:report reportFile="${report.file}"
 				useDefaultLicenses="false">
 				<file file="${ant.file}" />
+				<rat:family id='YASL1' name='Yet Another Software License (YASL) 1.0'/>
 				<rat:license
-					id="YASL1"
-					name="Yet Another Software License (YASL) 1.0"
+					family="YASL1"
 					notes="Interesting License">
 					<rat:text>name="Yet Another Software License (YASL)
 						${test.version}</rat:text>

From e6e7dd4936806741fc837ae0b9d8d55c9d185d65 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 25 Oct 2023 20:21:02 +0200
Subject: [PATCH 130/299] fixed unit tests to verify maven configs match
 expected

---
 apache-rat-api/pom.xml                        |   2 +-
 apache-rat-core/pom.xml                       | 232 ++++---
 .../src/main/java/org/apache/rat/Report.java  | 180 +++--
 .../apache/rat/ReportConfigurationTest.java   |  54 ++
 .../test/java/org/apache/rat/ReportTest.java  |  12 +
 .../ConfigurationReaderTest.java              |  53 +-
 .../org/apache/rat/testhelpers/TextUtils.java |  41 ++
 apache-rat-plugin/pom.xml                     | 619 +++++++++---------
 apache-rat-plugin/src/it/it1/pom.xml          |   7 +
 .../org/apache/rat/mp/AbstractRatMojo.java    |  25 +-
 .../main/java/org/apache/rat/mp/Family.java   |   7 +-
 .../org/apache/rat/mp/FilesReportable.java    |  64 +-
 .../java/org/apache/rat/mp/RatCheckMojo.java  |   1 -
 .../main/java/org/apache/rat/mp/Regex.java    |   1 -
 .../src/main/java/org/apache/rat/mp/Text.java |   1 -
 .../rat/mp/BetterAbstractMojoTestCase.java    | 104 +++
 .../org/apache/rat/mp/RatCheckMojoTest.java   | 232 ++-----
 .../org/apache/rat/mp/RatTestHelpers.java     |  50 +-
 .../src/test/resources/unit/it3/pom.xml       |   2 +
 .../src/test/resources/unit/it5/.bzrignore    |   5 +
 .../src/test/resources/unit/it5/pom.xml       | 128 ++++
 apache-rat-tasks/pom.xml                      |   2 +-
 apache-rat/pom.xml                            |   2 +-
 pom.xml                                       |   4 +-
 24 files changed, 1076 insertions(+), 752 deletions(-)
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
 create mode 100644 apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java
 create mode 100644 apache-rat-plugin/src/test/resources/unit/it5/.bzrignore
 create mode 100644 apache-rat-plugin/src/test/resources/unit/it5/pom.xml

diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
index bdb30bf61..dc852dd67 100644
--- a/apache-rat-api/pom.xml
+++ b/apache-rat-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.17-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
 
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 52397adb9..ac2b0f7b4 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -15,113 +15,135 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.rat</groupId>
-    <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
-  </parent>
-  <artifactId>apache-rat-core</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache Creadur Rat::Core</name>
-  <description>The core functionality, shared by the Ant tasks
-    and the Maven plugin.</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.rat</groupId>
+		<artifactId>apache-rat-project</artifactId>
+		<version>0.17-SNAPSHOT</version>
+	</parent>
+	<artifactId>apache-rat-core</artifactId>
+	<packaging>jar</packaging>
+	<name>Apache Creadur Rat::Core</name>
+	<description>The core functionality, shared by the Ant tasks
+		and the Maven plugin.</description>
 
-  <build>
-    <resources>
-      <resource>
-        <filtering>false</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/filtered-resources</directory>
-      </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>RELEASE_NOTES.txt</include>
-        </includes>
-      </resource>
-    </resources>
+	<build>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/filtered-resources</directory>
+			</resource>
+			<resource>
+				<directory>..</directory>
+				<targetPath>META-INF</targetPath>
+				<includes>
+					<include>RELEASE_NOTES.txt</include>
+				</includes>
+			</resource>
+		</resources>
 
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <!-- These files have bad license headers because they are used to test bad license headers -->
-              <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
-              <exclude>src/test/resources/oasis/bad/*.*</exclude>
-              <!-- These files does not have license headers because they are used to test license headers -->
-              <exclude>src/test/resources/elements/Source.java</exclude>
-              <exclude>src/test/resources/elements/ILoggerFactory.java</exclude>
-              <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
-              <exclude>src/test/resources/violations/bad.txt</exclude>
-              <exclude>src/test/resources/violations/FilterTest.cs</exclude>
-              <!-- used to test for binary files; does not work on UTF-8 (e.g. MacOSX) -->
-              <exclude>src/test/resources/binaries/Image-png.not</exclude>
-              <!-- These files have a valid license header that was not recognised by older rat versions -->
-              <exclude>src/test/resources/elements/TextHttps.txt</exclude>
-              <!-- Remove after using RAT 0.14 for dog-fooding ..... older versions do not ignore JSON -->
-              <exclude>src/test/resources/elements/plain.json</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.rat</groupId>
+					<artifactId>apache-rat-plugin</artifactId>
+					<configuration>
+						<excludes>
+							<!-- These files have bad license headers because
+							they are used to test bad license headers -->
+							<exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
+							<exclude>src/test/resources/oasis/bad/*.*</exclude>
+							<!-- These files does not have license headers
+							because they are used to test license headers -->
+							<exclude>src/test/resources/elements/Source.java</exclude>
+							<exclude>
+								src/test/resources/elements/ILoggerFactory.java</exclude>
+							<exclude>src/test/resources/elements/sub/Empty.txt</exclude>
+							<exclude>src/test/resources/violations/bad.txt</exclude>
+							<exclude>src/test/resources/violations/FilterTest.cs</exclude>
+							<!-- used to test for binary files; does not work on
+							UTF-8 (e.g. MacOSX) -->
+							<exclude>src/test/resources/binaries/Image-png.not</exclude>
+							<!-- These files have a valid license header that
+							was not recognised by older rat versions -->
+							<exclude>src/test/resources/elements/TextHttps.txt</exclude>
+							<!-- Remove after using RAT 0.14 for dog-fooding
+							..... older versions do not ignore JSON -->
+							<exclude>src/test/resources/elements/plain.json</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.rat</groupId>
-      <artifactId>apache-rat-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <exclusions>
-        <!-- Not actually used (yet) so no point including it -->
-        <exclusion>
-          <groupId>org.tukaani</groupId>
-          <artifactId>xz</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <scope>test</scope>
-    </dependency>
-  </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.rat</groupId>
+			<artifactId>apache-rat-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-collections4</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<exclusions>
+				<!-- Not actually used (yet) so no point including it -->
+				<exclusion>
+					<groupId>org.tukaani</groupId>
+					<artifactId>xz</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 2ce2be02c..089fcc604 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -125,7 +125,6 @@ public class Report {
      * @throws Exception on error.
      */
     public static final void main(String[] args) throws Exception {
-        final ReportConfiguration configuration = new ReportConfiguration();
         Options opts = buildOptions();
 
         CommandLine cl = null;
@@ -147,27 +146,106 @@ public static final void main(String[] args) throws Exception {
         if (args == null || args.length != 1) {
             printUsage(opts);
         } else {
+            
+        
+//
+//            if (cl.hasOption('a') || cl.hasOption('A')) {
+//                configuration
+//                        .setAddLicenseHeaders(cl.hasOption('f') ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
+//                configuration.setCopyrightMessage(cl.getOptionValue("c"));
+//            }
+//
+//            if (cl.hasOption(EXCLUDE_CLI)) {
+//                String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
+//                if (excludes != null) {
+//                    final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
+//                    configuration.setInputFileFilter(filter);
+//                }
+//            } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
+//                String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
+//                if (excludeFileName != null) {
+//                    final FilenameFilter filter = parseExclusions(
+//                            FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
+//                    configuration.setInputFileFilter(filter);
+//                }
+//            }
+//
+////            if (cl.hasOption(NO_DEFAULTS)) {
+////                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.none);
+////            } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
+////                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
+////            } else {
+////                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.approved);
+////            }
+//            if (cl.hasOption(XML)) {
+//                configuration.setStyleReport(false);
+//            } else {
+//                configuration.setStyleReport(true);
+//                if (cl.hasOption(STYLESHEET_CLI)) {
+//                    String[] style = cl.getOptionValues(STYLESHEET_CLI);
+//                    if (style.length != 1) {
+//                        System.err.println("please specify a single stylesheet");
+//                        System.exit(1);
+//                    }
+//                    configuration.setStyleSheet(() -> new FileInputStream(style[0]));
+//                }
+//            }
+//
+//            Defaults.Builder defaultBuilder = Defaults.builder();
+//            if (cl.hasOption(NO_DEFAULTS)) {
+//                defaultBuilder.noDefault();
+//            }
+//            if (cl.hasOption(LICENSES)) {
+//                for (String fn : cl.getOptionValues(LICENSES)) {
+//                    defaultBuilder.add(fn);
+//                }
+//            }
+//            Defaults defaults = defaultBuilder.build();
+//            configuration.setFrom(defaults);
+//            configuration.setReportable(getDirectory(args[0], configuration));
+//            configuration.validate(s -> System.err.println(s));
+//
+//            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
+//                listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
+//            }
+//            if (cl.hasOption(LIST_LICENSES)) {
+//                listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
+//            }
+            ReportConfiguration configuration = createConfiguration(args[0],cl);
+            configuration.validate(s -> System.err.println(s));
 
-            if (cl.hasOption('a') || cl.hasOption('A')) {
-                configuration
-                        .setAddLicenseHeaders(cl.hasOption('f') ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
-                configuration.setCopyrightMessage(cl.getOptionValue("c"));
+            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
+                listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
+            }
+            if (cl.hasOption(LIST_LICENSES)) {
+                listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
             }
+            Reporter.report(configuration);
+        }
+    }
 
-            if (cl.hasOption(EXCLUDE_CLI)) {
-                String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
-                if (excludes != null) {
-                    final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
-                    configuration.setInputFileFilter(filter);
-                }
-            } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
-                String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
-                if (excludeFileName != null) {
-                    final FilenameFilter filter = parseExclusions(
-                            FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
-                    configuration.setInputFileFilter(filter);
-                }
+    static ReportConfiguration createConfiguration(String baseDirectory, CommandLine cl) throws IOException {
+        final ReportConfiguration configuration = new ReportConfiguration();
+
+        if (cl.hasOption('a') || cl.hasOption('A')) {
+            configuration.setAddLicenseHeaders(cl.hasOption('f') ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
+            configuration.setCopyrightMessage(cl.getOptionValue("c"));
+        }
+
+        if (cl.hasOption(EXCLUDE_CLI)) {
+            String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
+            if (excludes != null) {
+                final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
+                configuration.setInputFileFilter(filter);
+            }
+        } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
+            String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
+            if (excludeFileName != null) {
+                final FilenameFilter filter = parseExclusions(
+                        FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
+                configuration.setInputFileFilter(filter);
             }
+        }
 
 //            if (cl.hasOption(NO_DEFAULTS)) {
 //                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.none);
@@ -176,43 +254,33 @@ public static final void main(String[] args) throws Exception {
 //            } else {
 //                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.approved);
 //            }
-            if (cl.hasOption(XML)) {
-                configuration.setStyleReport(false);
-            } else {
-                configuration.setStyleReport(true);
-                if (cl.hasOption(STYLESHEET_CLI)) {
-                    String[] style = cl.getOptionValues(STYLESHEET_CLI);
-                    if (style.length != 1) {
-                        System.err.println("please specify a single stylesheet");
-                        System.exit(1);
-                    }
-                    configuration.setStyleSheet(() -> new FileInputStream(style[0]));
-                }
-            }
-
-            Defaults.Builder defaultBuilder = Defaults.builder();
-            if (cl.hasOption(NO_DEFAULTS)) {
-                defaultBuilder.noDefault();
-            }
-            if (cl.hasOption(LICENSES)) {
-                for (String fn : cl.getOptionValues(LICENSES)) {
-                    defaultBuilder.add(fn);
+        if (cl.hasOption(XML)) {
+            configuration.setStyleReport(false);
+        } else {
+            configuration.setStyleReport(true);
+            if (cl.hasOption(STYLESHEET_CLI)) {
+                String[] style = cl.getOptionValues(STYLESHEET_CLI);
+                if (style.length != 1) {
+                    System.err.println("please specify a single stylesheet");
+                    System.exit(1);
                 }
+                configuration.setStyleSheet(() -> new FileInputStream(style[0]));
             }
-            Defaults defaults = defaultBuilder.build();
-            configuration.setFrom(defaults);
-            configuration.setReportable(getDirectory(args[0], configuration));
-            configuration.validate(s -> System.err.println(s));
+        }
 
-            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-                listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
-            }
-            if (cl.hasOption(LIST_LICENSES)) {
-                listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
+        Defaults.Builder defaultBuilder = Defaults.builder();
+        if (cl.hasOption(NO_DEFAULTS)) {
+            defaultBuilder.noDefault();
+        }
+        if (cl.hasOption(LICENSES)) {
+            for (String fn : cl.getOptionValues(LICENSES)) {
+                defaultBuilder.add(fn);
             }
-
-            Reporter.report(configuration);
         }
+        Defaults defaults = defaultBuilder.build();
+        configuration.setFrom(defaults);
+        configuration.setReportable(getDirectory(baseDirectory, configuration));
+        return configuration;
     }
 
     private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, PrintStream out) {
@@ -223,14 +291,14 @@ private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, Prin
 
     private static void listLicenses(SortedSet<ILicense> licenses, PrintStream out) {
         out.println("Licenses:");
-        licenses.stream()
-                .forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
-                        lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
+        licenses.stream().forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
+                lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
         out.println();
     }
 
     /**
      * Creates a filename filter from patterns to exclude.
+     * 
      * @param excludes the list of patterns to exclude.
      * @return the FilenameFilter tht excludes the patterns
      */
@@ -259,7 +327,7 @@ static FilenameFilter parseExclusions(List<String> excludes) {
         return new NotFileFilter(orFilter);
     }
 
-    private static Options buildOptions() {
+    static Options buildOptions() {
         Options opts = new Options();
 
         Option help = new Option(HELP, "help", false, "Print help for the RAT command line interface and exit");
@@ -343,7 +411,9 @@ private Report() {
     }
 
     /**
-     * Creates an IReporatble object from the directory name and ReportConfiguration object.
+     * Creates an IReporatble object from the directory name and ReportConfiguration
+     * object.
+     * 
      * @param baseDirectory the directory that contains the files to report on.
      * @param config the ReportConfiguration.
      * @return the IReportale instance containing the files.
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 704cb4283..85707260f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -44,6 +44,7 @@
 
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.config.AddLicenseHeaders;
+import org.apache.rat.configuration.ConfigurationReaderTest;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
@@ -364,4 +365,57 @@ public void testValidate() {
         underTest.validate(s -> sb2.append(s));
         assertEquals(0, sb2.length());
     }
+    
+    /**
+     * Validates that the configuration contains the default approved licenses.
+     * @param config The configuration to test.
+     */
+    public static void validateDefaultApprovedLicenses(ReportConfiguration config) {
+        assertEquals("Wrong number of approved licenses", ConfigurationReaderTest.EXPECTED_IDS.length,config.getApprovedLicenseCategories().size());
+        for (String s : ConfigurationReaderTest.EXPECTED_IDS) {
+            assertTrue("Missing apporved license category "+s, config.getApprovedLicenseCategories().contains(ILicenseFamily.makeCategory(s)));
+        }
+    }
+    
+    /**
+     * Validates that the configruation contains the default license families.
+     * @param config the configuration to test.
+     */
+    public static void validateDefaultLicenseFamilies(ReportConfiguration config) {
+        assertEquals("wrong number of license families",ConfigurationReaderTest.EXPECTED_IDS.length,config.getFamilies().size());
+        List<String> expected = Arrays.asList(ConfigurationReaderTest.EXPECTED_IDS);
+        for (ILicenseFamily family : config.getFamilies()) {
+            assertTrue("Missing license family "+family.getFamilyCategory(),  expected.contains(family.getFamilyCategory().trim()));
+        }
+    }
+    
+    /**
+     * Validates that the configuration contains the default licenses.
+     * @param config the configuration to test.
+     */
+    public static void validateDefaultLicenses(ReportConfiguration config) {
+        assertEquals("wrong number of licenses", ConfigurationReaderTest.EXPECTED_LICENSES.length, config.getLicenses(LicenseFilter.all).size());
+        List<String>  expected = Arrays.asList(ConfigurationReaderTest.EXPECTED_LICENSES);
+        for (ILicense license : config.getLicenses(LicenseFilter.all)) {
+            assertTrue("Missing license "+license.getId(), expected.contains(license.getId()));
+        }
+        
+    }
+    
+    /**
+     * Validates that the configuration matches the default.
+     * @param config The configuration to test.
+     */
+    public static void validateDefault(ReportConfiguration config) {
+        assertFalse("Adding licenses should be false", config.isAddingLicenses());
+        assertFalse("forced licenses should be false",  config.isAddingLicensesForced());
+        assertNull("copyright message should be null", config.getCopyrightMessage());
+        assertNull("Input file filter should be null", config.getInputFileFilter());
+        assertTrue("Style report should be true", config.isStyleReport());
+        assertNotNull("Stylesheet should not be null", config.getStyleSheet());
+        
+        validateDefaultApprovedLicenses(config);
+        validateDefaultLicenseFamilies(config);
+        validateDefaultLicenses(config);
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 7e7c35580..3b6da8efb 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -21,8 +21,12 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.util.Arrays;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.ParseException;
 import org.junit.Test;
 
 public class ReportTest {
@@ -32,5 +36,13 @@ public void parseExclusionsForCLIUsage() {
                 .parseExclusions(Arrays.asList("", " # foo/bar", "foo", "##", " ./foo/bar"));
         assertNotNull(filter);
     }
+    
+    @Test
+    public void testDefaultConfiguration() throws ParseException, IOException {
+        String[] empty = {};
+        CommandLine cl = new DefaultParser().parse(Report.buildOptions(), empty);
+        ReportConfiguration config = Report.createConfiguration("", cl);
+        ReportConfigurationTest.validateDefault(config);
+    }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index 06795e436..caaca7980 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -33,17 +33,15 @@
 import org.apache.rat.configuration.builders.RegexBuilder;
 import org.apache.rat.configuration.builders.SpdxBuilder;
 import org.apache.rat.configuration.builders.TextBuilder;
-import org.apache.rat.license.ILicenseFamily;
 import org.junit.Test;
 
 public class ConfigurationReaderTest {
 
-    
-    private static String[] EXPECTED_IDS = { "AL", "BSD-3", "CDDL1", "GEN", "GPL1", "GPL2", "GPL3",
-            "MIT", "OASIS", "W3C", "W3CD" };
-    
-    private static String[] EXPECTED_LICENSES = { "AL", "ASL", "BSD-3", "CDDL1", "DOJO", "GEN", "GPL1",
-            "GPL2", "GPL3", "ILLUMOS", "MIT", "OASIS", "TMF", "W3C", "W3CD" };
+    public static final String[] EXPECTED_IDS = { "AL", "BSD-3", "CDDL1", "GEN", "GPL1", "GPL2", "GPL3", "MIT", "OASIS",
+            "W3C", "W3CD" };
+
+    public static final String[] EXPECTED_LICENSES = { "AL", "ASL", "BSD-3", "CDDL1", "DOJO", "GEN", "GPL1", "GPL2",
+            "GPL3", "ILLUMOS", "MIT", "OASIS", "TMF", "W3C", "W3CD" };
 
     @Test
     public void approvedLicenseIdTest() {
@@ -52,7 +50,7 @@ public void approvedLicenseIdTest() {
         reader.read(url);
 
         Collection<String> readCategories = reader.approvedLicenseId();
-        
+
         assertArrayEquals(EXPECTED_IDS, readCategories.toArray(new String[readCategories.size()]));
     }
 
@@ -62,43 +60,42 @@ public void LicensesTest() {
         URL url = ConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
         reader.read(url);
 
-        Collection<String> readCategories = reader.readLicenses().stream()
-                .map(x -> x.getId()).collect(Collectors.toList());
+        Collection<String> readCategories = reader.readLicenses().stream().map(x -> x.getId())
+                .collect(Collectors.toList());
         assertArrayEquals(EXPECTED_LICENSES, readCategories.toArray(new String[readCategories.size()]));
     }
-    
+
     @Test
     public void LicenseFamiliesTest() {
         XMLConfigurationReader reader = new XMLConfigurationReader();
         URL url = ConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
         reader.read(url);
 
-        Collection<String> readCategories = reader.readFamilies().stream()
-                .map(x -> x.getFamilyCategory().trim()).collect(Collectors.toList());
+        Collection<String> readCategories = reader.readFamilies().stream().map(x -> x.getFamilyCategory().trim())
+                .collect(Collectors.toList());
         assertArrayEquals(EXPECTED_IDS, readCategories.toArray(new String[readCategories.size()]));
     }
-    
-    private void checkMatcher( String name, Class<? extends AbstractBuilder> clazz)
-    {
-        AbstractBuilder builder =  MatcherBuilderTracker.getMatcherBuilder(name);
-        assertNotNull( builder );
-        assertTrue( name+" is not an instanceof "+clazz.getName(), clazz.isAssignableFrom(builder.getClass()));
+
+    private void checkMatcher(String name, Class<? extends AbstractBuilder> clazz) {
+        AbstractBuilder builder = MatcherBuilderTracker.getMatcherBuilder(name);
+        assertNotNull(builder);
+        assertTrue(name + " is not an instanceof " + clazz.getName(), clazz.isAssignableFrom(builder.getClass()));
     }
-    
+
     @Test
     public void checkSystemMatcherTest() {
         XMLConfigurationReader reader = new XMLConfigurationReader();
         URL url = ConfigurationReaderTest.class.getResource("/org/apache/rat/default.xml");
         reader.read(url);
         reader.readMatcherBuilders();
-        checkMatcher( "all", AllBuilder.class);
-        checkMatcher( "any", AnyBuilder.class);
-        checkMatcher( "copyright", CopyrightBuilder.class);
-        checkMatcher( "matcherRef", MatcherRefBuilder.class);
-        checkMatcher( "not", NotBuilder.class);
-        checkMatcher( "regex", RegexBuilder.class);
-        checkMatcher( "spdx", SpdxBuilder.class);
-        checkMatcher( "text", TextBuilder.class);
+        checkMatcher("all", AllBuilder.class);
+        checkMatcher("any", AnyBuilder.class);
+        checkMatcher("copyright", CopyrightBuilder.class);
+        checkMatcher("matcherRef", MatcherRefBuilder.class);
+        checkMatcher("not", NotBuilder.class);
+        checkMatcher("regex", RegexBuilder.class);
+        checkMatcher("spdx", SpdxBuilder.class);
+        checkMatcher("text", TextBuilder.class);
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
new file mode 100644
index 000000000..0ca0873cf
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.testhelpers;
+
+import java.util.regex.Pattern;
+
+import org.junit.Assert;
+
+public class TextUtils {
+    public static final String[] EMPTY = {};
+    
+    public static void assertPatternInOutput(String pPattern, String out) {
+        Assert.assertTrue("Output does not match string: " + pPattern,
+                isMatching(pPattern, out));
+    }
+    
+    public static void assertPatternNotInOutput(String pPattern, String out) {
+        Assert.assertFalse("Output matches the pattern: " + pPattern,
+                isMatching(pPattern, out));
+    }
+
+   public static boolean isMatching(final String pPattern, final String pValue) {
+        return Pattern.compile(pPattern, Pattern.MULTILINE).matcher(pValue).find();
+    }
+}
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index fd90bd331..0166bc534 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -15,312 +15,321 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>apache-rat-project</artifactId>
-    <groupId>org.apache.rat</groupId>
-    <version>0.16-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>apache-rat-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>Apache Creadur Rat::Plugin4Maven</name>
-  <description>A plugin for Apache Maven that runs Apache Rat
-   to audit the source to be distributed.</description>
-  <inceptionYear>2007</inceptionYear>
-  <prerequisites>
-    <maven>${mavenVersion}</maven>
-  </prerequisites>
-  <properties>
-    <currentVersion>${project.version}</currentVersion>
-    <doxiaVersion>1.12.0</doxiaVersion>
-    <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
-  </properties>
-  <build>
-    <resources>
-      <resource>
-        <filtering>false</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/filtered-resources</directory>
-      </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>RELEASE_NOTES.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <pluginManagement>
-      <plugins>
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <configuration>
-            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-          </configuration>
-          <executions>
-            <execution>
-              <id>mojo-descriptor</id>
-              <goals>
-                <goal>descriptor</goal>
-              </goals>
-            </execution>
-            <!-- to generate help goal -->
-            <execution>
-              <id>help-goal</id>
-              <goals>
-                <goal>helpmojo</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <!-- These files do not have license headers because they are used to test license headers -->
-              <exclude>src/it/**/src.apt</exclude>
-              <exclude>src/test/resources/unit/it2/src.txt</exclude>
-              <exclude>src/test/resources/unit/it3/src.apt</exclude>
-              <exclude>src/test/resources/unit/it4/*.html</exclude>
-              <exclude>**/*.iml</exclude>
-              <!-- RAT-171: needs to be added since SCM ignores are only parsed in project root -->
-              <exclude>**/.bzrignore</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-        	<groupId>org.eclipse.m2e</groupId>
-        	<artifactId>lifecycle-mapping</artifactId>
-        	<version>1.0.0</version>
-        	<configuration>
-        		<lifecycleMappingMetadata>
-        			<pluginExecutions>
-        				<pluginExecution>
-        					<pluginExecutionFilter>
-        						<groupId>
-        							org.apache.maven.plugins
-        						</groupId>
-        						<artifactId>
-        							maven-plugin-plugin
-        						</artifactId>
-        						<versionRange>[3.3,)</versionRange>
-        						<goals>
-        							<goal>descriptor</goal>
-        							<goal>helpmojo</goal>
-        						</goals>
-        					</pluginExecutionFilter>
-        					<action>
-        						<ignore />
-        					</action>
-        				</pluginExecution>
-        			</pluginExecutions>
-        		</lifecycleMappingMetadata>
-        	</configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
-          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-          <settingsFile>src/it/settings.xml</settingsFile>
-          <postBuildHookScript>verify</postBuildHookScript>
-          <debug>true</debug>
-        </configuration>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <goals>
-              <goal>install</goal>
-              <goal>integration-test</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>apache-rat-project</artifactId>
+		<groupId>org.apache.rat</groupId>
+		<version>0.17-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>apache-rat-plugin</artifactId>
+	<packaging>maven-plugin</packaging>
+	<name>Apache Creadur Rat::Plugin4Maven</name>
+	<description>A plugin for Apache Maven that runs Apache Rat
+		to audit the source to be distributed.</description>
+	<inceptionYear>2007</inceptionYear>
+	<prerequisites>
+		<maven>${mavenVersion}</maven>
+	</prerequisites>
+	<properties>
+		<currentVersion>${project.version}</currentVersion>
+		<doxiaVersion>1.12.0</doxiaVersion>
+		<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+	</properties>
+	<build>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/filtered-resources</directory>
+			</resource>
+			<resource>
+				<directory>..</directory>
+				<targetPath>META-INF</targetPath>
+				<includes>
+					<include>RELEASE_NOTES.txt</include>
+				</includes>
+			</resource>
+		</resources>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-plugin-plugin</artifactId>
+					<configuration>
+						<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+					</configuration>
+					<executions>
+						<execution>
+							<id>mojo-descriptor</id>
+							<goals>
+								<goal>descriptor</goal>
+							</goals>
+						</execution>
+						<!-- to generate help goal -->
+						<execution>
+							<id>help-goal</id>
+							<goals>
+								<goal>helpmojo</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.rat</groupId>
+					<artifactId>apache-rat-plugin</artifactId>
+					<configuration>
+						<excludes>
+							<!-- These files do not have license headers because
+							they are used to test license headers -->
+							<exclude>src/it/**/src.apt</exclude>
+							<exclude>src/test/resources/unit/it2/src.txt</exclude>
+							<exclude>src/test/resources/unit/it3/src.apt</exclude>
+							<exclude>src/test/resources/unit/it4/*.html</exclude>
+							<exclude>**/*.iml</exclude>
+							<!-- RAT-171: needs to be added since SCM ignores
+							are only parsed in project root -->
+							<exclude>**/.bzrignore</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-plugin-plugin
+										</artifactId>
+										<versionRange>[3.3,)</versionRange>
+										<goals>
+											<goal>descriptor</goal>
+											<goal>helpmojo</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-invoker-plugin</artifactId>
+				<configuration>
+					<cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
+					<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+					<settingsFile>src/it/settings.xml</settingsFile>
+					<postBuildHookScript>verify</postBuildHookScript>
+					<debug>true</debug>
+				</configuration>
+				<executions>
+					<execution>
+						<id>integration-test</id>
+						<goals>
+							<goal>install</goal>
+							<goal>integration-test</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.rat</groupId>
-      <artifactId>apache-rat-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>${mavenPluginPluginVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-core</artifactId>
-      <version>${doxiaVersion}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-decoration-model</artifactId>
-      <version>${doxiaSitetoolsVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-module-xhtml</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-sink-api</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-integration-tools</artifactId>
-      <version>${doxiaSitetoolsVersion}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxiaSitetoolsVersion}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-utils</artifactId>
-      <version>3.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-testing</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.3.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
-    </dependency>
-  </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <version>${mavenPluginPluginVersion}</version>
-      </plugin>
-    </plugins>
-  </reporting>
-  <developers>
-    <developer>
-      <id>jochen</id>
-      <name>Jochen Wiedmann</name>
-      <email>jochen.wiedmann@gmail.com</email>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Bernd Bohmann</name>
-      <email>bommel@apache.org</email>
-    </contributor>
-    <contributor>
-      <name>Lars Trieloff</name>
-      <email>lars@trieloff.net</email>
-    </contributor>
-    <contributor>
-      <name>Jukka Zitting</name>
-      <email>jukka@apache.org</email>
-    </contributor>
-  </contributors>
-  <!--
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.rat</groupId>
+			<artifactId>apache-rat-core</artifactId>
+		</dependency>
+		<dependency>
+		  <groupId>org.apache.rat</groupId>
+		  <artifactId>apache-rat-core</artifactId>
+		  <classifier>tests</classifier>
+		  <version>${parent.version}</version>
+		  <scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugin-tools</groupId>
+			<artifactId>maven-plugin-annotations</artifactId>
+			<version>${mavenPluginPluginVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-artifact</artifactId>
+			<version>${mavenVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-model</artifactId>
+			<version>${mavenVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+			<version>${mavenVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-core</artifactId>
+			<version>${mavenVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-settings</artifactId>
+			<version>${mavenVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-compat</artifactId>
+			<version>${mavenVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.doxia</groupId>
+			<artifactId>doxia-core</artifactId>
+			<version>${doxiaVersion}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-container-default</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xercesImpl</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.doxia</groupId>
+			<artifactId>doxia-decoration-model</artifactId>
+			<version>${doxiaSitetoolsVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.doxia</groupId>
+			<artifactId>doxia-module-xhtml</artifactId>
+			<version>${doxiaVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.doxia</groupId>
+			<artifactId>doxia-sink-api</artifactId>
+			<version>${doxiaVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.doxia</groupId>
+			<artifactId>doxia-integration-tools</artifactId>
+			<version>${doxiaSitetoolsVersion}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-container-default</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.doxia</groupId>
+			<artifactId>doxia-site-renderer</artifactId>
+			<version>${doxiaSitetoolsVersion}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-container-default</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.reporting</groupId>
+			<artifactId>maven-reporting-api</artifactId>
+			<version>3.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.shared</groupId>
+			<artifactId>maven-shared-utils</artifactId>
+			<version>3.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugin-testing</groupId>
+			<artifactId>maven-plugin-testing-harness</artifactId>
+			<version>3.3.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>3.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+	</dependencies>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<version>${mavenPluginPluginVersion}</version>
+			</plugin>
+		</plugins>
+	</reporting>
+	<developers>
+		<developer>
+			<id>jochen</id>
+			<name>Jochen Wiedmann</name>
+			<email>jochen.wiedmann@gmail.com</email>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Bernd Bohmann</name>
+			<email>bommel@apache.org</email>
+		</contributor>
+		<contributor>
+			<name>Lars Trieloff</name>
+			<email>lars@trieloff.net</email>
+		</contributor>
+		<contributor>
+			<name>Jukka Zitting</name>
+			<email>jukka@apache.org</email>
+		</contributor>
+	</contributors>
+	<!--
   <profiles>
     <profile>
       <id>apache-release</id>
diff --git a/apache-rat-plugin/src/it/it1/pom.xml b/apache-rat-plugin/src/it/it1/pom.xml
index 382039d68..09ae88f74 100644
--- a/apache-rat-plugin/src/it/it1/pom.xml
+++ b/apache-rat-plugin/src/it/it1/pom.xml
@@ -38,6 +38,7 @@
 <!--							<copyright start="1990" end="1991" owner="foo" />-->
 <!--						</license>-->
 						<license>
+							<family>GEN</family>
 							<id>CpyrT</id>
 							<name>Copyright with tags</name>
 							<notes></notes>
@@ -54,6 +55,7 @@
 <!--							<regex expr="regex property" />-->
 <!--						</license>-->
 						<license>
+							<family>GEN</family>
 							<id>RegxT</id>
 							<name>Regex with tag</name>
 							<notes></notes>
@@ -66,6 +68,7 @@
 <!--							<spdx name="spdx-property" />-->
 <!--						</license>-->
 						<license>
+							<family>GEN</family>
 							<id>SpdxT</id>
 							<name>Spdx with tag</name>
 							<notes></notes>
@@ -78,12 +81,14 @@
 <!--							<text text="text-property" />-->
 <!--						</license>-->
 						<license>
+							<family>GEN</family>
 							<id>TextT</id>
 							<name>Text with tag</name>
 							<notes></notes>
 							<text>text-tag</text>
 						</license>
 						<license>
+							<family>GEN</family>
 							<id>Not</id>
 							<name>Not testing</name>
 							<notes></notes>
@@ -92,6 +97,7 @@
 							</not>
 						</license>
 						<license>
+							<family>GEN</family>
 							<id>All</id>
 							<name>All testing</name>
 							<notes></notes>
@@ -101,6 +107,7 @@
 							</all>
 						</license>
 						<license>
+							<family>GEN</family>
 							<id>Any</id>
 							<name>Any testing</name>
 							<notes></notes>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index f66295d9d..5481acf71 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -52,6 +52,7 @@
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
+import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.config.SourceCodeManagementSystems;
 import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
@@ -252,9 +253,11 @@ protected Defaults.Builder getDefaultsBuilder() {
     }
 
     protected ReportConfiguration getConfiguration() throws MojoExecutionException {
-        //@SuppressWarnings("resource")
-        ReportConfiguration result = new ReportConfiguration();
         
+        ReportConfiguration config = new ReportConfiguration();
+        if (addDefaultLicenses) {
+            config.setFrom(getDefaultsBuilder().build());
+        }
         if (additionalLicenseFiles != null) {
             for (String licenseFile : additionalLicenseFiles) {
                 try {
@@ -267,8 +270,8 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     LicenseReader lReader = fmt.licenseReader();
                     if (lReader != null) {
                             lReader.addLicenses(url);
-                    result.addLicenses(lReader.readLicenses());
-                    result.addApprovedLicenseCategories(lReader.approvedLicenseId());
+                    config.addLicenses(lReader.readLicenses());
+                    config.addApprovedLicenseCategories(lReader.approvedLicenseId());
                     }
                 } catch (MalformedURLException e) {
                     throw new ConfigurationException(licenseFile + " is not a valid license file", e);
@@ -284,7 +287,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     : (l) -> {
                     };
 
-            Consumer<ILicenseFamily> process = logger.andThen(result::addFamily);
+            Consumer<ILicenseFamily> process = logger.andThen(config::addFamily);
             Arrays.stream(families).map(Family::build).forEach(process);
         }
         if (licenses != null) {
@@ -296,19 +299,19 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     : (l) -> {
                     };
             Consumer<ILicense> addApproved = (approvedLicenses == null || approvedLicenses.length == 0)
-                    ? (l) -> result.addApprovedLicenseCategory(l.getLicenseFamily())
+                    ? (l) -> config.addApprovedLicenseCategory(l.getLicenseFamily())
                     : (l) -> {
                     };
 
-            Consumer<ILicense> process = logger.andThen(result::addLicense).andThen(addApproved);
-            Arrays.stream(licenses).map(x -> x.build(result.getLicenseFamilies(LicenseFilter.all))).forEach(process);
+            Consumer<ILicense> process = logger.andThen(config::addLicense).andThen(addApproved);
+            Arrays.stream(licenses).map(x -> x.build(config.getLicenseFamilies(LicenseFilter.all))).forEach(process);
         }
 
         if (approvedLicenses != null && approvedLicenses.length > 0) {
-            Arrays.stream(approvedLicenses).forEach(result::addApprovedLicenseCategory);
+            Arrays.stream(approvedLicenses).forEach(config::addApprovedLicenseCategory);
         }
-        result.setReportable(getReportable());
-        return result;
+        config.setReportable(getReportable());
+        return config;
     }
 
     protected void logLicenses(Collection<ILicense> licenses) {
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
index 9a0d8ff55..d2b2acf34 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
@@ -19,11 +19,9 @@
 package org.apache.rat.mp;
 
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 
-public class Family  {
+public class Family {
 
     private ILicenseFamily.Builder builder = ILicenseFamily.builder();
 
@@ -37,8 +35,7 @@ public Family() {
     }
 
     public ILicenseFamily build() {
-        return builder.setLicenseFamilyCategory(id)
-                .setLicenseFamilyName(name).build();
+        return builder.setLicenseFamilyCategory(id).setLicenseFamilyName(name).build();
     }
 
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
index ae339edd3..e49e2f89b 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
@@ -1,5 +1,12 @@
 package org.apache.rat.mp;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -26,41 +33,27 @@
 import org.apache.rat.report.IReportable;
 import org.apache.rat.report.RatReport;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-
 /**
  * Implementation of IReportable that traverses over a set of files.
  */
-class FilesReportable implements IReportable
-{
+class FilesReportable implements IReportable {
     private final File basedir;
 
     private final String[] files;
 
-    FilesReportable( File basedir, String[] files )
-            throws IOException
-    {
-        final File currentDir = new File( System.getProperty( "user.dir" ) ).getCanonicalFile();
+    FilesReportable(File basedir, String[] files) throws IOException {
+        final File currentDir = new File(System.getProperty("user.dir")).getCanonicalFile();
         final File f = basedir.getCanonicalFile();
-        if ( currentDir.equals( f ) )
-        {
+        if (currentDir.equals(f)) {
             this.basedir = null;
-        }
-        else
-        {
+        } else {
             this.basedir = basedir;
         }
         this.files = files;
     }
 
-    public void run( RatReport report ) throws RatException
-    {
+    @Override
+    public void run(RatReport report) throws RatException {
         FileDocument document = new FileDocument();
         for (String file : files) {
             document.setFile(new File(basedir, file));
@@ -69,39 +62,40 @@ public void run( RatReport report ) throws RatException
         }
     }
 
-    private class FileDocument implements Document
-    {
+    private class FileDocument implements Document {
         private File file;
         private final MetaData metaData = new MetaData();
-        
-        void setFile( File file )
-        {
+
+        void setFile(File file) {
             this.file = file;
         }
 
+        @Override
         public boolean isComposite() {
             return DocumentImplUtils.isZip(file);
         }
 
-        public Reader reader() throws IOException
-        {
-            final InputStream in = new FileInputStream( file );
-            return new InputStreamReader( in );
+        @Override
+        public Reader reader() throws IOException {
+            final InputStream in = new FileInputStream(file);
+            return new InputStreamReader(in);
         }
 
-        public String getName()
-        {
-            return DocumentImplUtils.toName( file );
+        @Override
+        public String getName() {
+            return DocumentImplUtils.toName(file);
         }
 
+        @Override
         public MetaData getMetaData() {
             return metaData;
         }
-        
+
+        @Override
         public InputStream inputStream() throws IOException {
             return new FileInputStream(file);
         }
-        
+
         @Override
         public String toString() {
             return "File:" + file.getAbsolutePath();
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index 7a1945cee..a28df5608 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -109,7 +109,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             return;
         }
         ReportConfiguration config = getConfiguration();
-        config.setFrom(getDefaultsBuilder().build());
         logLicenses(config.getLicenses(LicenseFilter.all));
         final File parent = reportFile.getParentFile();
         if (!parent.mkdirs() && !parent.isDirectory()) {
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
index 28febed33..e8fedaf4a 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Regex.java
@@ -20,7 +20,6 @@
 
 import javax.inject.Named;
 
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.configuration.builders.RegexBuilder;
 
 public class Regex extends RegexBuilder {
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
index 16adab186..1ecf0718a 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Text.java
@@ -18,7 +18,6 @@
  */
 package org.apache.rat.mp;
 
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.rat.configuration.builders.TextBuilder;
 
 public class Text extends TextBuilder {
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java
new file mode 100644
index 000000000..910975af5
--- /dev/null
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java
@@ -0,0 +1,104 @@
+/*
+ * This software is copyright (c) 2015 by Alex Heneveld and Cloudsoft Corporation.
+
+This software is released under the Apache Software License, v2.
+ */
+package org.apache.rat.mp;
+
+/* code lifted from https://github.com/ahgittin/license-audit-maven-plugin
+ */
+import java.io.File;
+import java.util.Arrays;
+
+import org.apache.maven.DefaultMaven;
+import org.apache.maven.Maven;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.DefaultMavenExecutionResult;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequestPopulator;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.Mojo;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
+
+/** Use this as you would {@link AbstractMojoTestCase},
+ * where you want more of the standard maven defaults to be set
+ * (and where the {@link AbstractMojoTestCase} leaves them as null or empty).
+ * This includes:
+ * <li> local repo, repo sessions and managers configured
+ * <li> maven default remote repos installed (NB: this does not use your ~/.m2 local settings)
+ * <li> system properties are copies
+ * <p>
+ * No changes to subclass code is needed; this simply intercepts the {@link #newMavenSession(MavenProject)} method
+ * used by the various {@link #lookupMojo(String, File)} methods.
+ * <p>
+ * This also provides new methods, {@link #newMavenSession()} to conveniently create a maven session,
+ * and {@link #lookupConfiguredMojo(File, String)} so you don't have to always build the project yourself.
+ */ 
+public abstract class BetterAbstractMojoTestCase extends AbstractMojoTestCase {
+
+    protected MavenSession newMavenSession() {
+        try {
+            MavenExecutionRequest request = new DefaultMavenExecutionRequest();
+            MavenExecutionResult result = new DefaultMavenExecutionResult();
+
+            // populate sensible defaults, including repository basedir and remote repos
+            MavenExecutionRequestPopulator populator;
+            populator = getContainer().lookup( MavenExecutionRequestPopulator.class );
+            populator.populateDefaults( request );
+
+            // this is needed to allow java profiles to get resolved; i.e. avoid during project builds:
+            // [ERROR] Failed to determine Java version for profile java-1.5-detected @ org.apache.commons:commons-parent:22, /Users/alex/.m2/repository/org/apache/commons/commons-parent/22/commons-parent-22.pom, line 909, column 14
+            request.setSystemProperties( System.getProperties() );
+            
+            // and this is needed so that the repo session in the maven session 
+            // has a repo manager, and it points at the local repo
+            // (cf MavenRepositorySystemUtils.newSession() which is what is otherwise done)
+            DefaultMaven maven = (DefaultMaven) getContainer().lookup( Maven.class );
+            DefaultRepositorySystemSession repoSession =
+                (DefaultRepositorySystemSession) maven.newRepositorySession( request );
+            repoSession.setLocalRepositoryManager(
+                new SimpleLocalRepositoryManagerFactory().newInstance(repoSession, 
+                    new LocalRepository( request.getLocalRepository().getBasedir() ) ));
+
+            @SuppressWarnings("deprecation")
+            MavenSession session = new MavenSession( getContainer(), 
+                repoSession,
+                request, result );
+            return session;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    /** Extends the super to use the new {@link #newMavenSession()} introduced here 
+     * which sets the defaults one expects from maven; the standard test case leaves a lot of things blank */
+    @Override
+    protected MavenSession newMavenSession(MavenProject project) {
+        MavenSession session = newMavenSession();
+        session.setCurrentProject( project );
+        session.setProjects( Arrays.asList( project ) );
+        return session;        
+    }
+
+    /** As {@link #lookupConfiguredMojo(MavenProject, String)} but taking the pom file 
+     * and creating the {@link MavenProject}. */
+    protected Mojo lookupConfiguredMojo(File pom, String goal) throws Exception {
+        assertNotNull( pom );
+        assertTrue( pom.exists() );
+
+        ProjectBuildingRequest buildingRequest = newMavenSession().getProjectBuildingRequest();
+        ProjectBuilder projectBuilder = lookup(ProjectBuilder.class);
+        MavenProject project = projectBuilder.build(pom, buildingRequest).getProject();
+
+        return lookupConfiguredMojo(project, goal);
+    }
+
+
+}
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index 1e2cdc582..6a280fdf5 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -1,51 +1,21 @@
 package org.apache.rat.mp;
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.model.Build;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.rat.config.AddLicenseHeaders;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.junit.Assume;
-import org.junit.Ignore;
-
 import static org.apache.rat.mp.RatTestHelpers.ensureRatReportIsCorrect;
 import static org.apache.rat.mp.RatTestHelpers.getSourceDirectory;
 import static org.apache.rat.mp.RatTestHelpers.newArtifactFactory;
 import static org.apache.rat.mp.RatTestHelpers.newArtifactRepository;
 import static org.apache.rat.mp.RatTestHelpers.newSiteRenderer;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
+
+import java.io.File;
+
+import org.apache.rat.ReportConfiguration;
+import org.apache.rat.ReportConfigurationTest;
+import org.apache.rat.testhelpers.TextUtils;
 
 /**
  * Test case for the {@link RatCheckMojo} and {@link RatReportMojo}.
  */
-public class RatCheckMojoTest extends AbstractMojoTestCase {
+public class RatCheckMojoTest extends BetterAbstractMojoTestCase {
 
     /**
      * Creates a new instance of {@link RatCheckMojo}.
@@ -61,54 +31,28 @@ private RatCheckMojo newRatCheckMojo(String pDir) throws Exception {
     /**
      * Creates a new instance of {@link AbstractRatMojo}.
      *
-     * @param pDir  The directory, where to look for a pom.xml file.
+     * @param pDir The directory, where to look for a pom.xml file.
      * @param pGoal The goal, which the Mojo must implement.
+     * @param pCreateCopy if {@code true} copy the directory contents and return the
+     * copy location.
      * @return The configured Mojo.
      * @throws Exception An error occurred while creating the Mojo.
      */
-    private AbstractRatMojo newRatMojo(String pDir, String pGoal,
-                                       boolean pCreateCopy) throws Exception {
+    private AbstractRatMojo newRatMojo(String pDir, String pGoal, boolean pCreateCopy) throws Exception {
         final File baseDir = new File(getBasedir());
-        final File testBaseDir = getSourceDirectory(getBasedir(), pDir,
-                pCreateCopy, baseDir);
-        File testPom = new File(testBaseDir, "pom.xml");
-        AbstractRatMojo mojo = (AbstractRatMojo) lookupMojo(pGoal, testPom);
+        final File testBaseDir = getSourceDirectory(getBasedir(), pDir, pCreateCopy, baseDir);
+        final File testPom = new File(testBaseDir, "pom.xml");
+        final File buildDirectory = new File(new File(baseDir, "target/test"), pDir);
+        AbstractRatMojo mojo = (AbstractRatMojo) lookupConfiguredMojo(testPom, pGoal);
         assertNotNull(mojo);
-        final File buildDirectory = new File(new File(baseDir, "target/test"),
-                pDir);
-        setVariableValueToObject(mojo, "basedir", testBaseDir);
-        setVariableValueToObject(mojo, "addDefaultLicenseMatchers",
-                Boolean.TRUE);
-        setVariableValueToObject(mojo, "useDefaultExcludes", Boolean.TRUE);
-        setVariableValueToObject(mojo, "useMavenDefaultExcludes", Boolean.TRUE);
-        setVariableValueToObject(mojo, "useEclipseDefaultExcludes",
-                Boolean.TRUE);
-        setVariableValueToObject(mojo, "addLicenseHeaders", AddLicenseHeaders.FALSE.name());
-        final Build build = new Build();
-        build.setDirectory(buildDirectory.getPath());
-        final MavenProjectStub project = new MavenProjectStub() {
-            @Override
-            public Build getBuild() {
-                return build;
-            }
-        };
-        setVariableValueToObject(mojo, "project", project);
-        assertNotNull(
-                "Problem in test setup - you are missing a project in your mojo.",
-                project);
-        assertNotNull(
-                "The mojo is missing its MavenProject, which will result in an NPE during rat runs.",
+
+        assertNotNull("The mojo is missing its MavenProject, which will result in an NPE during rat runs.",
                 mojo.getProject());
-        assertNotNull(
-                "No artifactRepos found, which will result in an NPE during rat runs.",
-                project.getRemoteArtifactRepositories());
 
         if (mojo instanceof RatReportMojo) {
-            setVariableValueToObject(mojo, "localRepository",
-                    newArtifactRepository(getContainer()));
+            setVariableValueToObject(mojo, "localRepository", newArtifactRepository(getContainer()));
             setVariableValueToObject(mojo, "factory", newArtifactFactory());
-            setVariableValueToObject(mojo, "siteRenderer",
-                    newSiteRenderer(getContainer()));
+            setVariableValueToObject(mojo, "siteRenderer", newSiteRenderer(getContainer()));
         } else if (mojo instanceof RatCheckMojo) {
             final File ratTxtFile = new File(buildDirectory, "rat.txt");
             setVariableValueToObject(mojo, "reportFile", ratTxtFile);
@@ -133,10 +77,18 @@ private File getRatTxtFile(RatCheckMojo pMojo) throws Exception {
      * @throws Exception The test failed.
      */
     public void testIt1() throws Exception {
+
         final RatCheckMojo mojo = newRatCheckMojo("it1");
         final File ratTxtFile = getRatTxtFile(mojo);
+        final String dir = mojo.getProject().getBasedir().getAbsolutePath() + "/";
+        final String[] expected = { " AL +\\Q" + dir + "pom.xml\\E", "Notes: 0", "Binaries: 0", "Archives: 0",
+                "Standards: 1$", "Apache Licensed: 1$", "Generated Documents: 0", "^0 Unknown Licenses" };
+
+        ReportConfiguration config = mojo.getConfiguration();
+        ReportConfigurationTest.validateDefault(config);
+
         mojo.execute();
-        ensureRatReportIsCorrect(ratTxtFile, 1, 0);
+        ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
     }
 
     /**
@@ -145,39 +97,22 @@ public void testIt1() throws Exception {
      * @throws Exception The test failed.
      */
     public void testIt2() throws Exception {
+
         final RatCheckMojo mojo = newRatCheckMojo("it2");
         final File ratTxtFile = getRatTxtFile(mojo);
+        final String dir = mojo.getProject().getBasedir().getAbsolutePath() + "/";
+        final String[] expected = { "^Files with unapproved licenses:\\s+\\Q" + dir + "src.txt\\E\\s+", "Notes: 0",
+                "Binaries: 0", "Archives: 0", "Standards: 2$", "Apache Licensed: 1$", "Generated Documents: 0",
+                "^1 Unknown Licenses", " AL +\\Q" + dir + "pom.xml\\E$", "\\Q!????? " + dir + "src.txt\\E$",
+                "^== File: \\Q" + dir + "src.txt\\E$" };
         try {
             mojo.execute();
             fail("Expected RatCheckException");
         } catch (RatCheckException e) {
             final String msg = e.getMessage();
-            // default value is "${project.build.directory}/rat.txt"
-            final String REPORTFILE = "rat.txt";
-
-            assertTrue("report filename was not contained in '" + msg + "'",
-                    msg.contains(REPORTFILE));
-            assertFalse("no null allowed in '" + msg + "'", (msg.toUpperCase()
-                    .contains("NULL")));
-        }
-        ensureRatReportIsCorrect(ratTxtFile, 1, 1);
-    }
-
-    private String getFirstLine(File pFile) throws IOException {
-        FileInputStream fis = null;
-        InputStreamReader reader = null;
-        BufferedReader breader = null;
-        try {
-            fis = new FileInputStream(pFile);
-            reader = new InputStreamReader(fis, StandardCharsets.UTF_8);
-            breader = new BufferedReader(reader);
-            final String result = breader.readLine();
-            breader.close();
-            return result;
-        } finally {
-            IOUtils.closeQuietly(fis);
-            IOUtils.closeQuietly(reader);
-            IOUtils.closeQuietly(breader);
+            assertTrue("report filename was not contained in '" + msg + "'", msg.contains(ratTxtFile.getName()));
+            assertFalse("no null allowed in '" + msg + "'", (msg.toUpperCase().contains("NULL")));
+            ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
         }
     }
 
@@ -185,71 +120,42 @@ private String getFirstLine(File pFile) throws IOException {
      * Tests adding license headers.
      */
     public void testIt3() throws Exception {
-        final RatCheckMojo mojo = (RatCheckMojo) newRatMojo("it3", "check",
-                true);
-        setVariableValueToObject(mojo, "addLicenseHeaders", AddLicenseHeaders.TRUE.name());
-        setVariableValueToObject(mojo, "numUnapprovedLicenses",
-                1);
-        mojo.execute();
+        final RatCheckMojo mojo = (RatCheckMojo) newRatMojo("it3", "check", true);
         final File ratTxtFile = getRatTxtFile(mojo);
-        ensureRatReportIsCorrect(ratTxtFile, 1, 1);
+        final String dir = mojo.getProject().getBasedir().getAbsolutePath() + "/";
+        final String[] expected = { "^Files with unapproved licenses:\\s+\\Q" + dir + "src.apt\\E\\s+", "Notes: 0",
+                "Binaries: 0", "Archives: 0", "Standards: 2$", "Apache Licensed: 1$", "Generated Documents: 0",
+                "^1 Unknown Licenses", " AL +\\Q" + dir + "pom.xml\\E$", "\\Q!????? " + dir + "src.apt\\E$",
+                "^== File: \\Q" + dir + "src.apt\\E$" };
 
-        final File baseDir = new File(getBasedir());
-        final File sourcesDir = new File(new File(baseDir, "target/it-source"),
-                "it3");
-        final String firstLineOrig = getFirstLine(new File(sourcesDir,
-                "src.apt"));
-        assertTrue(firstLineOrig.contains("--"));
-        assertFalse(firstLineOrig.contains("~~"));
-        final String firstLineModified = getFirstLine(new File(sourcesDir,
-                "src.apt.new"));
-        assertTrue(firstLineModified.contains("~~"));
-        assertFalse(firstLineModified.contains("--"));
+        ReportConfiguration config = mojo.getConfiguration();
+        assertTrue("should be adding licenses", config.isAddingLicenses());
+
+        mojo.execute();
+
+        ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
     }
 
     /**
-     * Test correct generation of XML file if non-UTF8 file.encoding is set.
-     *
-     * @throws Exception The test failed.
+     * Tests defining licenses in configuration
      */
-//    @Ignore
-//    public void testIt4() throws Exception {
-    	// In previous versions of the JDK, it used to be possible to
-    	// change the value of file.encoding at runtime. As of Java 16,
-    	// this is no longer possible. Instead, at this point, we check,
-    	// that file.encoding is actually ISO-8859-1. (Within Maven, this
-    	// is enforced by the configuration of the surefire plugin.) If not,
-    	// we skip this test.
-//    	Assume.assumeTrue("Expected file.encoding=ISO-8859-1", "ISO-8859-1".equals(System.getProperty("file.encoding")));
-//        final RatCheckMojo mojo = newRatCheckMojo("it4");
-//        final File ratTxtFile = getRatTxtFile(mojo);
-//        try {
-//            setVariableValueToObject(mojo, "reportStyle", "xml");
-//            mojo.execute();
-//            fail("Expected RatCheckException");
-//        } catch (RatCheckException e) {
-//            final String msg = e.getMessage();
-//            // default value is "${project.build.directory}/rat.txt"
-//            final String REPORTFILE = "rat.txt";
-//
-//            assertTrue("report filename was not contained in '" + msg + "'",
-//                    msg.contains(REPORTFILE));
-//            assertFalse("no null allowed in '" + msg + "'", (msg.toUpperCase()
-//                    .contains("NULL")));
-//        }
-//        assertTrue(ratTxtFile.exists());
-//        DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-//        try (FileInputStream fis = new FileInputStream(ratTxtFile)) {
-//            Document doc = db.parse(fis);
-//            NodeList headerSample = doc.getElementsByTagName("header-sample");
-//            String textContent = headerSample.item(0).getTextContent();
-//            if (textContent.length() == 0) { // can be the pom since this test will parse 2 files but the pom is "ok"
-//                textContent = headerSample.item(1).getTextContent();
-//            }
-//            boolean byteSequencePresent = textContent.contains("\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\u00DF");
-//            assertTrue("Report should contain test umlauts, got '" + textContent + "'", byteSequencePresent);
-//        } catch (Exception ex) {
-//            fail("Report file could not be parsed as XML: " + ex.getMessage());
-//        }
-//    }
+    public void testIt5() throws Exception {
+        final RatCheckMojo mojo = (RatCheckMojo) newRatMojo("it5", "check", true);
+        final File ratTxtFile = getRatTxtFile(mojo);
+        final String[] expected = { "Notes: 0", "Binaries: 0", "Archives: 0", "Standards: 0$", "Apache Licensed: 0$",
+                "Generated Documents: 0", "^0 Unknown Licenses" };
+
+        ReportConfiguration config = mojo.getConfiguration();
+        assertFalse("Should not be adding licenses", config.isAddingLicenses());
+        assertFalse("Should not be forcing licenses", config.isAddingLicensesForced());
+        assertTrue("Should be styling report", config.isStyleReport());
+
+        ReportConfigurationTest.validateDefaultApprovedLicenses(config);
+        ReportConfigurationTest.validateDefaultLicenseFamilies(config);
+        ReportConfigurationTest.validateDefaultLicenses(config);
+        assertNull("Should not have inputFileFilter", config.getInputFileFilter());
+        mojo.execute();
+
+        ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
+    }
 }
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
index bee5e2950..5cb95380f 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
@@ -1,15 +1,14 @@
 package org.apache.rat.mp;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.List;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,9 +37,12 @@
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
+import org.apache.rat.testhelpers.TextUtils;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.util.DirectoryScanner;
 
+import com.google.common.base.Charsets;
+
 /**
  * Test helpers used when verifying mojo interaction in RAT integration tests.
  */
@@ -194,48 +196,22 @@ public static File getSourceDirectory(String mvnBaseDir, String pDir, boolean pC
      * matching.
      *
      * @param pRatTxtFile The file to read.
-     * @param pNumALFiles The number of files with AL.
-     * @param pNumNoLicenseFiles The number of files without license.
+     * @param in An array of regex expressions that must be in the file.
+     * @param notIn An array of regex expressions that must NOT be in the file.
      * @throws IOException An error occurred while reading the file or the file does
      * not exist at all.
      * @throws IllegalArgumentException In case of mismatches in file numbers passed
      * in as parameter.
      */
-    public static void ensureRatReportIsCorrect(File pRatTxtFile, int pNumALFiles, int pNumNoLicenseFiles)
-            throws IOException {
-        if (!pRatTxtFile.exists()) {
-            throw new FileNotFoundException("Could not find " + pRatTxtFile);
+    public static void ensureRatReportIsCorrect(File pRatTxtFile, String[] in, String[] notIn) throws IOException {
+        List<String> lines = IOUtils.readLines(new FileInputStream(pRatTxtFile), Charsets.UTF_8);
+        String document = String.join("\n", lines);
+        for (String pattern : in) {
+            TextUtils.assertPatternInOutput(pattern, document);
         }
-        BufferedReader reader = null;
-        try {
-
-            reader = new BufferedReader(new FileReader(pRatTxtFile));
-            Integer numALFiles = null;
-            Integer numNoLicenseFiles = null;
-            for (;;) {
-                String line = reader.readLine();
-                if (line == null) {
-                    break;
-                }
-                int offset = line.indexOf("Apache Licensed: ");
-                if (offset >= 0) {
-                    numALFiles = Integer.valueOf(line.substring(offset + "Apache Licensed: ".length()).trim());
-                }
-                offset = line.indexOf("Unknown Licenses");
-                if (offset >= 0) {
-                    numNoLicenseFiles = Integer.valueOf(line.substring(0, offset).trim());
-                }
-            }
-            reader.close();
 
-            if (!Integer.valueOf(pNumALFiles).equals(numALFiles) || !Integer.valueOf(pNumNoLicenseFiles).equals(numNoLicenseFiles)) {
-                throw new IllegalArgumentException(
-                        "Amount of licensed files does not match. Expected " + pNumALFiles + ", got " + numALFiles);
-            }
-        } finally {
-            IOUtils.closeQuietly(reader);
+        for (String pattern : notIn) {
+            TextUtils.assertPatternInOutput(pattern, document);
         }
-
     }
-
 }
diff --git a/apache-rat-plugin/src/test/resources/unit/it3/pom.xml b/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
index 8629f2876..3885932ea 100644
--- a/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
@@ -30,6 +30,8 @@
         <artifactId>apache-rat-plugin</artifactId>
         <version>@pom.version@</version>
         <configuration>
+				<numUnapprovedLicenses>1</numUnapprovedLicenses>
+				<addLicenseHeaders>true</addLicenseHeaders>
         </configuration>
       </plugin>
     </plugins>
diff --git a/apache-rat-plugin/src/test/resources/unit/it5/.bzrignore b/apache-rat-plugin/src/test/resources/unit/it5/.bzrignore
new file mode 100644
index 000000000..f59acc081
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/it5/.bzrignore
@@ -0,0 +1,5 @@
+## RAT-171: Add rubbish and ensure that the plugin behaves properly
+DoesNotExistAtALL/**
+*\IllegalStuffNotExisting
+Lets-See*+?!OrWhat
+\\nDoesThatWorkAsWell\/
diff --git a/apache-rat-plugin/src/test/resources/unit/it5/pom.xml b/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
new file mode 100644
index 000000000..45bb4cb75
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.codehaus.mojo.rat.test</groupId>
+	<artifactId>it1</artifactId>
+	<version>1.0</version>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+				<version>@pom.version@</version>
+				<configuration>		
+					<licenses>
+						<!--						<license>-->
+						<!--							<id>CpyrP</id>-->
+						<!--							<name>Copyright with properties</name>-->
+						<!--							<notes></notes>-->
+						<!--							<copyright start="1990" end="1991" owner="foo"
+						/>-->
+						<!--						</license>-->
+						<license>
+							<family>GEN</family>
+							<id>CpyrT</id>
+							<name>Copyright with tags</name>
+							<notes></notes>
+							<copyright>
+								<start>1990</start>
+								<end>1991</end>
+								<owner>foo</owner>
+							</copyright>
+						</license>
+						<!--						<license>-->
+						<!--							<id>RegxP</id>-->
+						<!--							<name>Regex with properties</name>-->
+						<!--							<notes></notes>-->
+						<!--							<regex expr="regex property" />-->
+						<!--						</license>-->
+						<license>
+							<family>GEN</family>
+							<id>RegxT</id>
+							<name>Regex with tag</name>
+							<notes></notes>
+							<regex>regex tag</regex>
+						</license>
+						<!--						<license>-->
+						<!--							<id>SpdxP</id>-->
+						<!--							<name>Spdx with properties</name>-->
+						<!--							<notes></notes>-->
+						<!--							<spdx name="spdx-property" />-->
+						<!--						</license>-->
+						<license>
+							<family>GEN</family>
+							<id>SpdxT</id>
+							<name>Spdx with tag</name>
+							<notes></notes>
+							<spdx>spxd-tag</spdx>
+						</license>
+						<!--						<license>-->
+						<!--							<id>TextP</id>-->
+						<!--							<name>Text with properties</name>-->
+						<!--							<notes></notes>-->
+						<!--							<text text="text-property" />-->
+						<!--						</license>-->
+						<license>
+							<family>GEN</family>
+							<id>TextT</id>
+							<name>Text with tag</name>
+							<notes></notes>
+							<text>text-tag</text>
+						</license>
+						<license>
+							<family>GEN</family>
+							<id>Not</id>
+							<name>Not testing</name>
+							<notes></notes>
+							<not>
+								<text>not test text</text>
+							</not>
+						</license>
+						<license>
+							<family>GEN</family>
+							<id>All</id>
+							<name>All testing</name>
+							<notes></notes>
+							<all>
+								<text>all test text</text>
+								<spdx>all spdx text</spdx>
+							</all>
+						</license>
+						<license>
+							<family>GEN</family>
+							<id>Any</id>
+							<name>Any testing</name>
+							<notes></notes>
+							<any>
+								<text>any test text</text>
+								<spdx>any spdx text</spdx>
+							</any>
+						</license>
+					</licenses>
+					<includes>
+						<include>src.apt</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 1e034acc3..701fd988c 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.17-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat-tasks</artifactId>
   <packaging>jar</packaging>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index 4134d5715..b4d53c388 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.17-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat</artifactId>
   <packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 04359fd27..01209cd9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>
-  <version>0.16-SNAPSHOT</version>
+  <version>0.17-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Creadur Rat</name>
   <url>https://creadur.apache.org/rat/</url>
@@ -319,7 +319,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 6e978bbddf0711fc74968b81d78879ae224ba5be Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 25 Oct 2023 22:29:16 +0200
Subject: [PATCH 131/299] Experimental: Try to see if RAT runs with JDK21

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0a8d746f2..dcaf41850 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -33,7 +33,7 @@ jobs:
 # Caused by: sun.security.validator.ValidatorException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target
 #
 # Java 17 disabled, because we are running into https://bugs.openjdk.java.net/browse/JDK-8270866
-        java: [8, 11, 12, 13, 14, 15, 16]
+        java: [8, 11, 12, 13, 14, 15, 16, 21]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

From 62621f531d5b9ba79925cfb3a65292bfb78a32b1 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 28 Oct 2023 13:50:27 +0200
Subject: [PATCH 132/299] Fixed maven build issues

---
 apache-rat-core/pom.xml                       |   2 +-
 .../org/apache/rat/ReportConfiguration.java   |   5 +-
 .../configuration/XMLConfigurationReader.java |   5 +-
 .../java/org/apache/rat/license/ILicense.java | 190 ++++++++++++------
 .../apache/rat/license/ILicenseBuilder.java   | 185 +++++++++--------
 .../rat/license/LicenseFamilySetFactory.java  | 121 +++++++++++
 .../apache/rat/license/LicenseSetFactory.java |  23 +--
 .../org/apache/rat/license/SimpleLicense.java |  12 +-
 .../org/apache/rat/policy/DefaultPolicy.java  |   3 +-
 .../apache/rat/ReportConfigurationTest.java   |  30 ++-
 .../apache/rat/policy/DefaultPolicyTest.java  |   7 +-
 apache-rat-plugin/pom.xml                     |   2 +-
 apache-rat-plugin/src/it/it1/pom.xml          |  44 ++--
 apache-rat-plugin/src/it/it1/verify.groovy    |   2 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    |  12 +-
 .../main/java/org/apache/rat/mp/License.java  |   2 +-
 .../rat/mp/BetterAbstractMojoTestCase.java    |  24 ++-
 .../org/apache/rat/mp/RatCheckMojoTest.java   |  30 ++-
 .../src/test/resources/unit/it5/pom.xml       |  41 ++--
 19 files changed, 473 insertions(+), 267 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index ac2b0f7b4..445b31b37 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.rat</groupId>
 		<artifactId>apache-rat-project</artifactId>
-		<version>0.17-SNAPSHOT</version>
+		<version>0.16-SNAPSHOT</version>
 	</parent>
 	<artifactId>apache-rat-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 61f11f1b8..f2cff91c0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -38,6 +38,7 @@
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseFamilySetFactory;
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
@@ -48,7 +49,7 @@
  * configuration and invoke the {@link Reporter}.
  */
 public class ReportConfiguration {    
-    private SortedSet<ILicenseFamily> families = LicenseSetFactory.emptyLicenseFamilySet();
+    private SortedSet<ILicenseFamily> families = LicenseFamilySetFactory.emptyLicenseFamilySet();
     private SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
     private SortedSet<String> approvedLicenseCategories = new TreeSet<>();
     private SortedSet<String> removedLicenseCategories = new TreeSet<>();
@@ -419,7 +420,7 @@ public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
      * @return The set of defined licenses.
      */
     public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
-        return new LicenseSetFactory(licenses, getApprovedLicenseCategories()).getLicenseFamilies(filter);
+        return new LicenseFamilySetFactory(families, getApprovedLicenseCategories()).getFamilies(filter);
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 9517b329e..3143732aa 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -21,10 +21,8 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -46,6 +44,7 @@
 import org.apache.rat.configuration.builders.TextCaptureBuilder;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseFamilySetFactory;
 import org.apache.rat.license.LicenseSetFactory;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -132,7 +131,7 @@ public XMLConfigurationReader() {
         matchersElement = document.createElement(MATCHERS);
         rootElement.appendChild(matchersElement);
         licenses = LicenseSetFactory.emptyLicenseSet();
-        licenseFamilies = LicenseSetFactory.emptyLicenseFamilySet();
+        licenseFamilies = LicenseFamilySetFactory.emptyLicenseFamilySet();
         approvedFamilies = new TreeSet<>();
         matchers = new HashMap<>();
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 91e1ae511..d6916d3c9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -19,8 +19,10 @@
 package org.apache.rat.license;
 
 import java.util.Comparator;
+import java.util.Objects;
 import java.util.SortedSet;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
 
 /**
@@ -52,7 +54,7 @@ public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
      * @return An ILicense.Builder instance.
      */
     public static ILicense.Builder builder() {
-        return new ILicenseBuilder();
+        return new Builder();
     }
 
     /**
@@ -62,70 +64,134 @@ static Comparator<ILicense> getComparator() {
         return (x, y) ->  x.getId().compareTo( y.getId() );
     }
 
-    /**
-     * The definition of a ILicense Builder.
-     */
-    interface Builder {
-        /**
-         * @param families the set of defined license families.
-         * @return A new License implementation.
-         */
-        ILicense build(SortedSet<ILicenseFamily> families);
+//    /**
+//     * The definition of a ILicense Builder.
+//     */
+//    interface Builder {
+//        /**
+//         * @param families the set of defined license families.
+//         * @return A new License implementation.
+//         */
+//        ILicense build(SortedSet<ILicenseFamily> families);
+//        
+//        /**
+//         * Sets the matcher from a builder.
+//         * @param matcher the builder for the matcher for the license.
+//         * @return this builder for chaining.
+//         */
+//        Builder setMatcher(IHeaderMatcher.Builder matcher);
+//        
+//        /**
+//         * Sets the matcher.
+//         * @param matcher the matcher for the license.
+//         * @return this builder for chaining.
+//         */
+//        Builder setMatcher(IHeaderMatcher matcher);
+//
+//        /**
+//         * Sets the notes for the license.
+//         * If called multiple times the notes are concatenated to create a single note.
+//         * @param notes the notes for the license.
+//         * @return this builder for chaining.
+//         */
+//        Builder setNotes(String notes);
+//
+//        /**
+//         * Sets the derived from fields in the license.
+//         * @param derivedFrom the family category of the license this license was derived from.
+//         * @return this builder for chaining.
+//         */
+//        Builder setDerivedFrom(String derivedFrom);
+//
+//        /**
+//         * Set the family category for this license.
+//         * The category must be unique across all licenses and must be 5 characters. If more than 
+//         * 5 characters are provided then only the first 5 are taken.  If fewer than 5 characters are provided
+//         * the category is padded with spaces.
+//         * @param licenseFamilyCategory the family category for the license.
+//         * @return this builder for chaining.
+//         */
+//        Builder setLicenseFamilyCategory(String licenseFamilyCategory);
+//
+//        /**
+//         * Sets the name of the license.
+//         * If the name is not set then the name of the license family is used.
+//         * @param name the name for the license
+//         * @return this builder for chaining.
+//         */
+//        Builder setName(String name);
+//        
+//        /**
+//         * Sets the ID of the license.
+//         * If the ID is not set then the ID of the license family is used.
+//         * @param id the ID for the license
+//         * @return this builder for chaining.
+//         */
+//        Builder setId(String id);
+//    }
+    
+    class Builder  {
+
+        private IHeaderMatcher.Builder matcher;
+
+        private String notes;
+
+        private String derivedFrom;
+        
+        private String name;
+        
+        private String id;
+
+        private final ILicenseFamily.Builder licenseFamily = ILicenseFamily.builder();
+
+   
+        public Builder setMatcher(IHeaderMatcher.Builder matcher) {
+            this.matcher = matcher;
+            return this;
+        }
         
-        /**
-         * Sets the matcher from a builder.
-         * @param matcher the builder for the matcher for the license.
-         * @return this builder for chaining.
-         */
-        Builder setMatcher(IHeaderMatcher.Builder matcher);
         
-        /**
-         * Sets the matcher.
-         * @param matcher the matcher for the license.
-         * @return this builder for chaining.
-         */
-        Builder setMatcher(IHeaderMatcher matcher);
-
-        /**
-         * Sets the notes for the license.
-         * If called multiple times the notes are concatenated to create a single note.
-         * @param notes the notes for the license.
-         * @return this builder for chaining.
-         */
-        Builder setNotes(String notes);
-
-        /**
-         * Sets the derived from fields in the license.
-         * @param derivedFrom the family category of the license this license was derived from.
-         * @return this builder for chaining.
-         */
-        Builder setDerivedFrom(String derivedFrom);
-
-        /**
-         * Set the family category for this license.
-         * The category must be unique across all licenses and must be 5 characters. If more than 
-         * 5 characters are provided then only the first 5 are taken.  If fewer than 5 characters are provided
-         * the category is padded with spaces.
-         * @param licenseFamilyCategory the family category for the license.
-         * @return this builder for chaining.
-         */
-        Builder setLicenseFamilyCategory(String licenseFamilyCategory);
-
-        /**
-         * Sets the name of the license.
-         * If the name is not set then the name of the license family is used.
-         * @param name the name for the license
-         * @return this builder for chaining.
-         */
-        Builder setName(String name);
+        public Builder setMatcher(IHeaderMatcher matcher) {
+            this.matcher = ()->matcher;
+            return this;
+        }
+
+    
+        public Builder setNotes(String notes) {
+            this.notes = notes;
+            return this;
+        }
+
+      
+        public Builder setId(String id) {
+            this.id = id;
+            return this;
+        }
         
-        /**
-         * Sets the ID of the license.
-         * If the ID is not set then the ID of the license family is used.
-         * @param id the ID for the license
-         * @return this builder for chaining.
-         */
-        Builder setId(String id);
+     
+        public Builder setDerivedFrom(String derivedFrom) {
+            this.derivedFrom = derivedFrom;
+            return this;
+        }
+
+        public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
+            this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
+            this.licenseFamily.setLicenseFamilyName("License Family for searching");
+            return this;
+        }
+
+      
+        public Builder setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
+        	Objects.requireNonNull(matcher, "Matcher must not be null");
+            ILicenseFamily family = LicenseFamilySetFactory.search(licenseFamily.build(), licenseFamilies);
+            Objects.requireNonNull(family, "License family "+licenseFamily.getCategory()+" not found.");
+            return new SimpleLicense(family, matcher.build(), derivedFrom, notes, name, id); 
+        }
     }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
index 9f0fc93da..2a09dcb48 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
@@ -1,93 +1,92 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- */
-package org.apache.rat.license;
-
-import java.util.Objects;
-import java.util.SortedSet;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.license.ILicense.Builder;
-
-/**
- * An implementation of the ILicense Builder.
- */
-class ILicenseBuilder implements Builder {
-
-    private IHeaderMatcher.Builder matcher;
-
-    private String notes;
-
-    private String derivedFrom;
-    
-    private String name;
-    
-    private String id;
-
-    private final ILicenseFamily.Builder licenseFamily = ILicenseFamily.builder();
-
-    @Override
-    public Builder setMatcher(IHeaderMatcher.Builder matcher) {
-        this.matcher = matcher;
-        return this;
-    }
-    
-    @Override
-    public Builder setMatcher(IHeaderMatcher matcher) {
-        this.matcher = ()->matcher;
-        return this;
-    }
-
-    @Override
-    public Builder setNotes(String notes) {
-        this.notes = notes;
-        return this;
-    }
-
-    @Override
-    public Builder setId(String id) {
-        this.id = id;
-        return this;
-    }
-    
-    @Override
-    public Builder setDerivedFrom(String derivedFrom) {
-        this.derivedFrom = derivedFrom;
-        return this;
-    }
-
-    @Override
-    public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
-        this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
-        this.licenseFamily.setLicenseFamilyName("License Family for searching");
-        return this;
-    }
-
-    @Override
-    public Builder setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    @Override
-    public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
-        ILicenseFamily family = LicenseSetFactory.search(licenseFamily.build(), licenseFamilies);
-        Objects.requireNonNull(family, "License family may not be null.  Family "+licenseFamily.getCategory()+" not found.");
-        return new SimpleLicense(family, matcher.build(), derivedFrom, notes, name, id);
-    }
-}
\ No newline at end of file
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one   *
+// * or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information        *
+// * regarding copyright ownership.  The ASF licenses this file   *
+// * to you under the Apache License, Version 2.0 (the            *
+// * "License"); you may not use this file except in compliance   *
+// * with the License.  You may obtain a copy of the License at   *
+// *                                                              *
+// *   http://www.apache.org/licenses/LICENSE-2.0                 *
+// *                                                              *
+// * Unless required by applicable law or agreed to in writing,   *
+// * software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+// * KIND, either express or implied.  See the License for the    *
+// * specific language governing permissions and limitations      *
+// * under the License.                                           *
+// */
+//package org.apache.rat.license;
+//
+//import java.util.Objects;
+//import java.util.SortedSet;
+//
+//import org.apache.rat.analysis.IHeaderMatcher;
+//
+///**
+// * An implementation of the ILicense Builder.
+// */
+//public class ILicenseBuilder  {
+//
+//    private IHeaderMatcher.Builder matcher;
+//
+//    private String notes;
+//
+//    private String derivedFrom;
+//    
+//    private String name;
+//    
+//    private String id;
+//
+//    private final ILicenseFamily.Builder licenseFamily = ILicenseFamily.builder();
+//
+//    @Override
+//    public Builder setMatcher(IHeaderMatcher.Builder matcher) {
+//        this.matcher = matcher;
+//        return this;
+//    }
+//    
+//    @Override
+//    public Builder setMatcher(IHeaderMatcher matcher) {
+//        this.matcher = ()->matcher;
+//        return this;
+//    }
+//
+//    @Override
+//    public Builder setNotes(String notes) {
+//        this.notes = notes;
+//        return this;
+//    }
+//
+//    @Override
+//    public Builder setId(String id) {
+//        this.id = id;
+//        return this;
+//    }
+//    
+//    @Override
+//    public Builder setDerivedFrom(String derivedFrom) {
+//        this.derivedFrom = derivedFrom;
+//        return this;
+//    }
+//
+//    @Override
+//    public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
+//        this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
+//        this.licenseFamily.setLicenseFamilyName("License Family for searching");
+//        return this;
+//    }
+//
+//    @Override
+//    public Builder setName(String name) {
+//        this.name = name;
+//        return this;
+//    }
+//
+//    @Override
+//    public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
+//        ILicenseFamily family = LicenseSetFactory.search(licenseFamily.build(), licenseFamilies);
+//        Objects.requireNonNull(family, "License family may not be null.  Family "+licenseFamily.getCategory()+" not found.");
+//        return new SimpleLicense(family, matcher.build(), derivedFrom, notes, name, id);
+//    }
+//}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
new file mode 100644
index 000000000..076367ba9
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */package org.apache.rat.license;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
+
+/**
+ * Class to take a set of ILicenses and collecton of approved license categories and extract Subsets.
+ */
+public class LicenseFamilySetFactory {
+
+    private final SortedSet<ILicenseFamily> families;
+    private final Collection<String> approvedLicenses;
+    
+    /**
+     * Constructs a factory with the specified set of Licenses and the approved license collection.
+     * @param licenses the set of defined licenses.
+     * @param approvedLicenses the list of approved licenses.
+     */
+    public LicenseFamilySetFactory(SortedSet<ILicenseFamily> licenses, Collection<String> approvedLicenses) {
+        this.families = licenses;
+        this.approvedLicenses = approvedLicenses;
+    }
+    
+    /**
+     * Create an empty sorted Set with proper comparator.
+     * @return An empty sorted set of ILicenseFamily objects.
+     */
+    public static SortedSet<ILicenseFamily> emptyLicenseFamilySet() {
+        return new TreeSet<>();
+    }
+
+
+    /**
+     * Gets the License objects based on the filter.
+     * @param filter the types of LicenseFamily objects to return.
+     * @return a SortedSet of ILicense objects.
+     */
+    public SortedSet<ILicenseFamily> getFamilies(LicenseFilter filter) {
+        switch (filter) {
+        case all:
+            return Collections.unmodifiableSortedSet(families);
+        case approved:
+            SortedSet<ILicenseFamily> result = emptyLicenseFamilySet();
+            families.stream().filter(x -> approvedLicenses.contains(x.getFamilyCategory()))
+                    .forEach(result::add);
+            return result;
+        case none:
+        default:
+            return Collections.emptySortedSet();
+        }
+    }
+    
+    
+    /**
+     * Gets the categories fof LicenseFamily objects based on the filter.
+     * @param filter the types of LicenseFamily objects to return.
+     * @return a SortedSet of ILicenseFamily categories.
+     */
+    public SortedSet<String> getFamilyIds(LicenseFilter filter) {
+        SortedSet<String> result = new TreeSet<>();
+        switch (filter) {
+        case all:
+            families.stream().map(x -> x.getFamilyCategory())
+                    .forEach(result::add);
+            break;
+        case approved:
+            result.addAll(approvedLicenses);
+            break;
+        case none:
+        default:
+            // do nothing
+        }
+        return result;
+    }
+
+    
+    /**
+     * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
+     * @param target The instance to serch  for.
+     * @param licenseFamilies the license families to search
+     * @return
+     */
+    public static ILicenseFamily search(String target, SortedSet<ILicenseFamily> licenseFamilies) {
+        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory(target).setLicenseFamilyName("Searching family")
+                .build();
+        return search( family, licenseFamilies);
+    }
+
+    /**
+     * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
+     * @param target The instance to serch  for.
+     * @param licenseFamilies the license families to search
+     * @return
+     */
+    public static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenseFamilies) {
+        SortedSet<ILicenseFamily> part = licenseFamilies.tailSet(target);
+        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
+    }
+    
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
index 35b9e3ef0..bf63bda81 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -59,14 +59,6 @@ public LicenseSetFactory(SortedSet<ILicense> licenses, Collection<String> approv
     public static SortedSet<ILicense> emptyLicenseSet() {
         return new TreeSet<>(ILicense.getComparator());
     }
-    
-    /**
-     * Create an empty sorted Set with proper comparator.
-     * @return An empty sorted set of ILicenseFamily objects.
-     */
-    public static SortedSet<ILicenseFamily> emptyLicenseFamilySet() {
-        return new TreeSet<>();
-    }
 
     /**
      * Create a sorted set of licenses families from the collection.
@@ -109,7 +101,7 @@ public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
         case all:
             return extractFamily(licenses);
         case approved:
-            SortedSet<ILicenseFamily> result = LicenseSetFactory.emptyLicenseFamilySet();
+            SortedSet<ILicenseFamily> result = LicenseFamilySetFactory.emptyLicenseFamilySet();
             licenses.stream().map(ILicense::getLicenseFamily)
             .filter(x -> approvedLicenses.contains(x.getFamilyCategory()))
                     .forEach(result::add);
@@ -151,7 +143,7 @@ public SortedSet<String> getLicenseFamilyIds(LicenseFilter filter) {
      */
     public static ILicense search(String licenseId, SortedSet<ILicense> licenses) {
         ILicenseFamily searchFamily = ILicenseFamily.builder().setLicenseFamilyCategory(licenseId)
-                .setLicenseFamilyCategory("searching proxy").build();
+                .setLicenseFamilyName("searching proxy").build();
         ILicense target = new ILicense() {
     
             @Override
@@ -219,16 +211,5 @@ public static ILicense search(ILicense target, SortedSet<ILicense> licenses) {
         SortedSet<ILicense> part = licenses.tailSet(target);
         return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
     }
-
-    /**
-     * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
-     * @param target The instance to serch  for.
-     * @param licenseFamilies the license families to search
-     * @return
-     */
-    public static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenseFamilies) {
-        SortedSet<ILicenseFamily> part = licenseFamilies.tailSet(target);
-        return (!part.isEmpty() && part.first().compareTo(target) == 0) ? part.first() : null;
-    }
     
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
index 6a28dfe7a..18e4f7609 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicense.java
@@ -18,6 +18,8 @@
  */
 package org.apache.rat.license;
 
+import java.util.Objects;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
 
@@ -34,12 +36,14 @@ class SimpleLicense implements ILicense {
     private String id;
 
     SimpleLicense(ILicenseFamily family, IHeaderMatcher matcher, String derivedFrom, String notes, String name, String id) {
+        Objects.requireNonNull(matcher, "Matcher must not be null");
+        Objects.requireNonNull(family, "Family must not be null");  
         this.family = family;
         this.matcher = matcher;
         this.derivedFrom = derivedFrom;
         this.notes = notes;
-        this.name = name;
-        this.id = id;
+        this.name = StringUtils.defaultIfBlank(name, family.getFamilyName());
+        this.id = StringUtils.defaultIfBlank(id, family.getFamilyCategory().trim());
     }
 
     @Override
@@ -69,7 +73,7 @@ public void setDerivedFrom(String derivedFrom) {
 
     @Override
     public String getId() {
-        return StringUtils.defaultIfBlank(id, family.getFamilyCategory().trim());
+        return id;
     }
 
     @Override
@@ -114,6 +118,6 @@ public String derivedFrom() {
     
     @Override
     public String getName() {
-        return StringUtils.defaultIfBlank(name, family.getFamilyName());
+        return name;
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index af45a18d5..037a6b11c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -26,6 +26,7 @@
 import org.apache.rat.api.MetaData;
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseFamilySetFactory;
 import org.apache.rat.license.LicenseSetFactory;
 
 /**
@@ -39,7 +40,7 @@ public class DefaultPolicy implements IDocumentAnalyser {
      * @param approvedLicenseFamilies the approved license families.
      */
     public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseFamilies) {
-        this.approvedLicenseFamilies = LicenseSetFactory.emptyLicenseFamilySet();
+        this.approvedLicenseFamilies = LicenseFamilySetFactory.emptyLicenseFamilySet();
         this.approvedLicenseFamilies.addAll(approvedLicenseFamilies);
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 85707260f..272fff30b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -371,35 +371,47 @@ public void testValidate() {
      * @param config The configuration to test.
      */
     public static void validateDefaultApprovedLicenses(ReportConfiguration config) {
-        assertEquals("Wrong number of approved licenses", ConfigurationReaderTest.EXPECTED_IDS.length,config.getApprovedLicenseCategories().size());
+        validateDefaultApprovedLicenses(config, 0);
+    }
+    
+    /**
+     * Validates that the configuration contains the default approved licenses.
+     * @param config The configuration to test.
+     */
+    public static void validateDefaultApprovedLicenses(ReportConfiguration config, int additionalIdCount) {
+        assertEquals("Wrong number of approved licenses", ConfigurationReaderTest.EXPECTED_IDS.length+additionalIdCount,config.getApprovedLicenseCategories().size());
         for (String s : ConfigurationReaderTest.EXPECTED_IDS) {
             assertTrue("Missing apporved license category "+s, config.getApprovedLicenseCategories().contains(ILicenseFamily.makeCategory(s)));
         }
     }
     
+
     /**
      * Validates that the configruation contains the default license families.
      * @param config the configuration to test.
      */
-    public static void validateDefaultLicenseFamilies(ReportConfiguration config) {
-        assertEquals("wrong number of license families",ConfigurationReaderTest.EXPECTED_IDS.length,config.getFamilies().size());
-        List<String> expected = Arrays.asList(ConfigurationReaderTest.EXPECTED_IDS);
+    public static void validateDefaultLicenseFamilies(ReportConfiguration config, String...additionalIds) {
+        assertEquals("wrong number of license families",ConfigurationReaderTest.EXPECTED_IDS.length+additionalIds.length,config.getFamilies().size());
+        List<String> expected = new ArrayList<>();
+        expected.addAll(Arrays.asList(ConfigurationReaderTest.EXPECTED_IDS));
+        expected.addAll(Arrays.asList(additionalIds));
         for (ILicenseFamily family : config.getFamilies()) {
             assertTrue("Missing license family "+family.getFamilyCategory(),  expected.contains(family.getFamilyCategory().trim()));
         }
     }
-    
+
     /**
      * Validates that the configuration contains the default licenses.
      * @param config the configuration to test.
      */
-    public static void validateDefaultLicenses(ReportConfiguration config) {
-        assertEquals("wrong number of licenses", ConfigurationReaderTest.EXPECTED_LICENSES.length, config.getLicenses(LicenseFilter.all).size());
-        List<String>  expected = Arrays.asList(ConfigurationReaderTest.EXPECTED_LICENSES);
+    public static void validateDefaultLicenses(ReportConfiguration config, String...additionalLicenses) {
+        assertEquals("wrong number of licenses", ConfigurationReaderTest.EXPECTED_LICENSES.length+additionalLicenses.length, config.getLicenses(LicenseFilter.all).size());
+        List<String> expected = new ArrayList<>();
+        expected.addAll(Arrays.asList(ConfigurationReaderTest.EXPECTED_LICENSES));
+        expected.addAll(Arrays.asList(additionalLicenses));
         for (ILicense license : config.getLicenses(LicenseFilter.all)) {
             assertTrue("Missing license "+license.getId(), expected.contains(license.getId()));
         }
-        
     }
     
     /**
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 2aa860c76..7f39aab60 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -30,6 +30,7 @@
 import org.apache.rat.api.MetaData;
 import org.apache.rat.api.MetaData.Datum;
 import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseFamilySetFactory;
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.testhelpers.TestingLicense;
@@ -105,7 +106,7 @@ public void testApprovedLicenses() {
     @Test
     public void testUnApprovedLicenses() {
         SortedSet<ILicenseFamily> all = defaults.getLicenseFamilies(LicenseFilter.all);
-        SortedSet<ILicenseFamily> unapproved = LicenseSetFactory.emptyLicenseFamilySet();
+        SortedSet<ILicenseFamily> unapproved = LicenseFamilySetFactory.emptyLicenseFamilySet();
         unapproved.addAll(all);
         unapproved.removeAll(defaults.getLicenseFamilies(LicenseFilter.approved));
 
@@ -134,7 +135,7 @@ public void testAddNewApprovedLicenseAndDefaults() {
 
         policy.add(testingFamily);
         assertNotNull("Did not properly add ILicenseFamily",
-                LicenseSetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
+                LicenseFamilySetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
         policy.analyse(document);
         assertApproval(true);
     }
@@ -151,7 +152,7 @@ public void testAddNewApprovedLicenseNoDefaults() {
         policy.add(testingFamily);
         assertEquals(1, policy.getApprovedLicenseNames().size());
         assertNotNull("Did not properly add ILicenseFamily",
-                LicenseSetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
+                LicenseFamilySetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
         policy.analyse(document);
         assertApproval(true);
     }
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 0166bc534..5099b0024 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>apache-rat-project</artifactId>
 		<groupId>org.apache.rat</groupId>
-		<version>0.17-SNAPSHOT</version>
+    <version>0.16-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>apache-rat-plugin</artifactId>
diff --git a/apache-rat-plugin/src/it/it1/pom.xml b/apache-rat-plugin/src/it/it1/pom.xml
index 09ae88f74..cfac6ea69 100644
--- a/apache-rat-plugin/src/it/it1/pom.xml
+++ b/apache-rat-plugin/src/it/it1/pom.xml
@@ -20,7 +20,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.rat.test</groupId>
+	<groupId>org.codehaus.mojo.rat.test</groupId>
 	<artifactId>it1</artifactId>
 	<version>1.0</version>
 	<build>
@@ -29,14 +29,22 @@
 				<groupId>org.apache.rat</groupId>
 				<artifactId>apache-rat-plugin</artifactId>
 				<version>@pom.version@</version>
-				<configuration>
-					<licenses>
-<!--						<license>-->
-<!--							<id>CpyrP</id>-->
-<!--							<name>Copyright with properties</name>-->
-<!--							<notes></notes>-->
-<!--							<copyright start="1990" end="1991" owner="foo" />-->
-<!--						</license>-->
+				<configuration>		
+					<families>
+                        <family>
+                        <id>YAL</id>
+                        <name>Yet another license</name>
+                        </family>
+                    </families>
+                    <approvedLicenses>
+                        <approvedLicense>YAL</approvedLicense>
+                    </approvedLicenses>
+                    <licenses>
+                        <license>
+                            <id>MyLicense</id>
+                            <family>YAL</family>
+                            <text>Yet Another License</text>
+                        </license>
 						<license>
 							<family>GEN</family>
 							<id>CpyrT</id>
@@ -48,12 +56,6 @@
 								<owner>foo</owner>
 							</copyright>
 						</license>
-<!--						<license>-->
-<!--							<id>RegxP</id>-->
-<!--							<name>Regex with properties</name>-->
-<!--							<notes></notes>-->
-<!--							<regex expr="regex property" />-->
-<!--						</license>-->
 						<license>
 							<family>GEN</family>
 							<id>RegxT</id>
@@ -61,12 +63,6 @@
 							<notes></notes>
 							<regex>regex tag</regex>
 						</license>
-<!--						<license>-->
-<!--							<id>SpdxP</id>-->
-<!--							<name>Spdx with properties</name>-->
-<!--							<notes></notes>-->
-<!--							<spdx name="spdx-property" />-->
-<!--						</license>-->
 						<license>
 							<family>GEN</family>
 							<id>SpdxT</id>
@@ -74,12 +70,6 @@
 							<notes></notes>
 							<spdx>spxd-tag</spdx>
 						</license>
-<!--						<license>-->
-<!--							<id>TextP</id>-->
-<!--							<name>Text with properties</name>-->
-<!--							<notes></notes>-->
-<!--							<text text="text-property" />-->
-<!--						</license>-->
 						<license>
 							<family>GEN</family>
 							<id>TextT</id>
diff --git a/apache-rat-plugin/src/it/it1/verify.groovy b/apache-rat-plugin/src/it/it1/verify.groovy
index 48129484f..cdf9899c7 100644
--- a/apache-rat-plugin/src/it/it1/verify.groovy
+++ b/apache-rat-plugin/src/it/it1/verify.groovy
@@ -20,4 +20,4 @@ assert f.exists()
 
 content = f.text
 
-assert content.contains( 'Not   src.apt' )
\ No newline at end of file
+assert content.contains( 'YAL   src.apt' )
\ No newline at end of file
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 5481acf71..11ccd8364 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -41,6 +41,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.SortedSet;
 import java.util.function.Consumer;
 
 import org.apache.commons.lang3.StringUtils;
@@ -290,6 +291,11 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
             Consumer<ILicenseFamily> process = logger.andThen(config::addFamily);
             Arrays.stream(families).map(Family::build).forEach(process);
         }
+
+        if (approvedLicenses != null && approvedLicenses.length > 0) {
+            Arrays.stream(approvedLicenses).forEach(config::addApprovedLicenseCategory);
+        }
+        
         if (licenses != null) {
             Log log = getLog();
             if (log.isDebugEnabled()) {
@@ -304,12 +310,10 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     };
 
             Consumer<ILicense> process = logger.andThen(config::addLicense).andThen(addApproved);
-            Arrays.stream(licenses).map(x -> x.build(config.getLicenseFamilies(LicenseFilter.all))).forEach(process);
+            SortedSet<ILicenseFamily> families = config.getLicenseFamilies(LicenseFilter.all);
+            Arrays.stream(licenses).map(x -> x.build(families)).forEach(process);
         }
 
-        if (approvedLicenses != null && approvedLicenses.length > 0) {
-            Arrays.stream(approvedLicenses).forEach(config::addApprovedLicenseCategory);
-        }
         config.setReportable(getReportable());
         return config;
     }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
index 4e44fb90a..32f0a0277 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
@@ -53,7 +53,7 @@ protected void setMatcher(IHeaderMatcher.Builder builder) {
     }
 
     public ILicense build(SortedSet<ILicenseFamily> context) {
-        return builder.setDerivedFrom(derivedFrom).setLicenseFamilyCategory(family)
+        return builder.setDerivedFrom(derivedFrom).setLicenseFamilyCategory(family).setId(id)
                 .setName(name).setNotes(notes).build(context);
     }
 
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java
index 910975af5..254da237e 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/BetterAbstractMojoTestCase.java
@@ -1,12 +1,27 @@
+
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*
  * This software is copyright (c) 2015 by Alex Heneveld and Cloudsoft Corporation.
-
-This software is released under the Apache Software License, v2.
+ * 
+ * code lifted from https://github.com/ahgittin/license-audit-maven-plugin
  */
 package org.apache.rat.mp;
 
-/* code lifted from https://github.com/ahgittin/license-audit-maven-plugin
- */
 import java.io.File;
 import java.util.Arrays;
 
@@ -67,7 +82,6 @@ protected MavenSession newMavenSession() {
                 new SimpleLocalRepositoryManagerFactory().newInstance(repoSession, 
                     new LocalRepository( request.getLocalRepository().getBasedir() ) ));
 
-            @SuppressWarnings("deprecation")
             MavenSession session = new MavenSession( getContainer(), 
                 repoSession,
                 request, result );
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index 6a280fdf5..67e9fedd0 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.rat.mp;
 
 import static org.apache.rat.mp.RatTestHelpers.ensureRatReportIsCorrect;
@@ -10,6 +26,10 @@
 
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.ReportConfigurationTest;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseFamilySetFactory;
+import org.apache.rat.license.LicenseSetFactory;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.testhelpers.TextUtils;
 
 /**
@@ -150,9 +170,13 @@ public void testIt5() throws Exception {
         assertFalse("Should not be forcing licenses", config.isAddingLicensesForced());
         assertTrue("Should be styling report", config.isStyleReport());
 
-        ReportConfigurationTest.validateDefaultApprovedLicenses(config);
-        ReportConfigurationTest.validateDefaultLicenseFamilies(config);
-        ReportConfigurationTest.validateDefaultLicenses(config);
+        ReportConfigurationTest.validateDefaultApprovedLicenses(config, 1);
+        assertTrue(config.getApprovedLicenseCategories().contains(ILicenseFamily.makeCategory("YAL")));
+        ReportConfigurationTest.validateDefaultLicenseFamilies(config, "YAL");
+        assertNotNull(LicenseFamilySetFactory.search("YAL", config.getLicenseFamilies(LicenseFilter.all)));
+        ReportConfigurationTest.validateDefaultLicenses(config, "MyLicense", "CpyrT", "RegxT", "SpdxT", "TextT", 
+                "Not", "All", "Any");
+        assertNotNull(LicenseSetFactory.search("MyLicense", config.getLicenses(LicenseFilter.all)));
         assertNull("Should not have inputFileFilter", config.getInputFileFilter());
         mojo.execute();
 
diff --git a/apache-rat-plugin/src/test/resources/unit/it5/pom.xml b/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
index 45bb4cb75..cfac6ea69 100644
--- a/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
@@ -30,14 +30,21 @@
 				<artifactId>apache-rat-plugin</artifactId>
 				<version>@pom.version@</version>
 				<configuration>		
-					<licenses>
-						<!--						<license>-->
-						<!--							<id>CpyrP</id>-->
-						<!--							<name>Copyright with properties</name>-->
-						<!--							<notes></notes>-->
-						<!--							<copyright start="1990" end="1991" owner="foo"
-						/>-->
-						<!--						</license>-->
+					<families>
+                        <family>
+                        <id>YAL</id>
+                        <name>Yet another license</name>
+                        </family>
+                    </families>
+                    <approvedLicenses>
+                        <approvedLicense>YAL</approvedLicense>
+                    </approvedLicenses>
+                    <licenses>
+                        <license>
+                            <id>MyLicense</id>
+                            <family>YAL</family>
+                            <text>Yet Another License</text>
+                        </license>
 						<license>
 							<family>GEN</family>
 							<id>CpyrT</id>
@@ -49,12 +56,6 @@
 								<owner>foo</owner>
 							</copyright>
 						</license>
-						<!--						<license>-->
-						<!--							<id>RegxP</id>-->
-						<!--							<name>Regex with properties</name>-->
-						<!--							<notes></notes>-->
-						<!--							<regex expr="regex property" />-->
-						<!--						</license>-->
 						<license>
 							<family>GEN</family>
 							<id>RegxT</id>
@@ -62,12 +63,6 @@
 							<notes></notes>
 							<regex>regex tag</regex>
 						</license>
-						<!--						<license>-->
-						<!--							<id>SpdxP</id>-->
-						<!--							<name>Spdx with properties</name>-->
-						<!--							<notes></notes>-->
-						<!--							<spdx name="spdx-property" />-->
-						<!--						</license>-->
 						<license>
 							<family>GEN</family>
 							<id>SpdxT</id>
@@ -75,12 +70,6 @@
 							<notes></notes>
 							<spdx>spxd-tag</spdx>
 						</license>
-						<!--						<license>-->
-						<!--							<id>TextP</id>-->
-						<!--							<name>Text with properties</name>-->
-						<!--							<notes></notes>-->
-						<!--							<text text="text-property" />-->
-						<!--						</license>-->
 						<license>
 							<family>GEN</family>
 							<id>TextT</id>

From a2748a97d4e701deb7aacfafabfefa85fce4575a Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 28 Oct 2023 15:46:41 +0200
Subject: [PATCH 133/299] fixes for Ant UI

---
 apache-rat-api/pom.xml                        |  2 +-
 .../apache/rat/ReportConfigurationTest.java   |  1 +
 apache-rat-tasks/pom.xml                      |  9 ++++-
 .../java/org/apache/rat/anttasks/Report.java  | 28 +++++++++-------
 .../org/apache/rat/anttasks/ReportTest.java   | 33 ++++++++++++++++---
 .../antunit/report-bad-configurations.xml     |  2 +-
 .../test/resources/antunit/report-junit.xml   |  5 +++
 apache-rat/pom.xml                            |  2 +-
 pom.xml                                       |  2 +-
 9 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
index dc852dd67..bdb30bf61 100644
--- a/apache-rat-api/pom.xml
+++ b/apache-rat-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 272fff30b..3699f8939 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -419,6 +419,7 @@ public static void validateDefaultLicenses(ReportConfiguration config, String...
      * @param config The configuration to test.
      */
     public static void validateDefault(ReportConfiguration config) {
+        //config.validate( System.err::println );
         assertFalse("Adding licenses should be false", config.isAddingLicenses());
         assertFalse("forced licenses should be false",  config.isAddingLicensesForced());
         assertNull("copyright message should be null", config.getCopyrightMessage());
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 701fd988c..9022ffabf 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat-tasks</artifactId>
   <packaging>jar</packaging>
@@ -35,6 +35,13 @@
       <groupId>org.apache.rat</groupId>
       <artifactId>apache-rat-core</artifactId>
     </dependency>
+    <dependency>
+		  <groupId>org.apache.rat</groupId>
+		  <artifactId>apache-rat-core</artifactId>
+		  <classifier>tests</classifier>
+		  <version>${parent.version}</version>
+		  <scope>test</scope>
+		</dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index c58638805..77cdc0735 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -202,6 +202,18 @@ public void setAddDefaultDefinitions(File fileName) {
             throw new BuildException("Can not open additional default definitions: " + fileName.toString(), e);
         }
     }
+    
+    public ReportConfiguration getConfiguration() {
+        Defaults defaults = defaultsBuilder.build();
+        
+        configuration.setFrom(defaults);
+        configuration.setReportable(new ResourceCollectionContainer(nestedResources));
+        families.stream().map(Family::build).forEach(configuration::addFamily);
+        licenses.stream().map(License::asBuilder).forEach(l -> 
+            configuration.addApprovedLicenseCategory(configuration.addLicense(l).getLicenseFamily())
+        );
+        return configuration;
+    }
 
     /**
      * Generates the report.
@@ -209,16 +221,7 @@ public void setAddDefaultDefinitions(File fileName) {
     @Override
     public void execute() {
         try {
-            Defaults defaults = defaultsBuilder.build();
-            
-            configuration.setFrom(defaults);
-            configuration.setReportable(new ResourceCollectionContainer(nestedResources));
-            families.stream().map(Family::build).forEach(configuration::addFamily);
-            licenses.stream().map(License::asBuilder).forEach(l -> 
-                configuration.addApprovedLicenseCategory(configuration.addLicense(l).getLicenseFamily())
-            );
-            validate();
-            Reporter.report(configuration);
+            Reporter.report(validate(getConfiguration()));
         } catch (BuildException e) {
             throw e;
         } catch (Exception ioex) {
@@ -229,15 +232,16 @@ public void execute() {
     /**
      * validates the task's configuration.
      */
-    private void validate() {
+    private ReportConfiguration validate(ReportConfiguration cfg) {
         try {
-            configuration.validate(s -> log(s, Project.MSG_WARN));
+            cfg.validate(s -> log(s, Project.MSG_WARN));
         } catch (ConfigurationException e) {
             throw new BuildException(e.getMessage(), e.getCause());
         }
         if (nestedResources == null) {
             throw new BuildException("You must specify at least one file to create the report for.");
         }
+        return cfg;
     }
 
     /**
diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
index 248914a37..26a29838c 100644
--- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
+++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
@@ -27,12 +27,19 @@
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Optional;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.rat.ReportConfiguration;
+import org.apache.rat.ReportConfigurationTest;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.UnknownElement;
 import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -56,7 +63,7 @@ public void testWithReportSentToAnt() throws Exception {
     public void testWithReportSentToFile() throws Exception {
         final File reportFile = new File(getTempDir(), "selftest.report");
         final String alLine = "AL +\\Q" + getAntFileName() + "\\E";
-        
+
         if (!getTempDir().mkdirs() && !getTempDir().isDirectory()) {
             throw new IOException("Could not create temporary directory " + getTempDir());
         }
@@ -82,7 +89,7 @@ public void testCustomLicense() throws Exception {
         assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
         assertLogMatches(" newFa +\\Q" + getAntFileName() + "\\E");
     }
-    
+
     @Test
     public void testCustomMatcher() throws Exception {
         buildRule.executeTarget("testCustomMatcher");
@@ -96,14 +103,14 @@ public void testInlineCustomMatcher() throws Exception {
         assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
         assertLogMatches(" YASL1 +\\Q" + getAntFileName() + "\\E");
     }
-    
+
     @Test
     public void testCustomMatcherBuilder() throws Exception {
         buildRule.executeTarget("testCustomMatcherBuilder");
         assertLogDoesNotMatch(" AS +\\Q" + getAntFileName() + "\\E");
         assertLogMatches(" YASL1 +\\Q" + getAntFileName() + "\\E");
     }
-    
+
     @Test
     public void testNoResources() throws Exception {
         try {
@@ -114,7 +121,7 @@ public void testNoResources() throws Exception {
             assertTrue("Expected " + expect + ", got " + e.getMessage(), e.getMessage().contains(expect));
         }
     }
-    
+
     @Test
     public void testCopyrightBuild() throws Exception {
         try {
@@ -128,6 +135,22 @@ public void testCopyrightBuild() throws Exception {
         }
     }
 
+    private Report getReport(String target) {
+        Target testDefault = buildRule.getProject().getTargets().get(target);
+        Optional<Task> optT = Arrays.stream(testDefault.getTasks()).filter(t -> t.getTaskName().equals("rat:report"))
+                .findFirst();
+        assertTrue(optT.isPresent());
+        optT.get().maybeConfigure();
+        return (Report) ((UnknownElement) optT.get()).getRealThing();
+    }
+
+    @Test
+    public void testDefault() {
+        Report report = getReport("testDefault");
+        ReportConfiguration config = report.getConfiguration();
+        ReportConfigurationTest.validateDefault(config);
+    }
+
     @Test
     public void testNoLicenseMatchers() throws Exception {
         try {
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
index ac0d6c60c..1aee502d0 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-bad-configurations.xml
@@ -76,7 +76,7 @@
 
   <target name="testLicenseRequiresFamilyName">
     <au:expectfailure
-        expectedMessage="License family may not be null.  Family YASL1 not found">
+        expectedMessage="License family YASL1 not found">
       <rat:report>
         <file file="${ant.file}"/>
         <rat:license
diff --git a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
index 0ef2e8570..76cefe572 100644
--- a/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
+++ b/apache-rat-tasks/src/test/resources/antunit/report-junit.xml
@@ -53,6 +53,11 @@
 	</target>
 
 	<target name="all" />
+	
+	<target name="testDefault">
+		<rat:report />
+	</target>
+	
 	<target name="testWithReportSentToFile">
 		<property name="report.file" location="${output.dir}/selftest.report" />
 		<rat:report reportFile="${report.file}">
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index b4d53c388..4134d5715 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat</artifactId>
   <packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 01209cd9f..524d49589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>
-  <version>0.17-SNAPSHOT</version>
+  <version>0.16-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Creadur Rat</name>
   <url>https://creadur.apache.org/rat/</url>

From 7dc1c5f5e4b39b32b4cc21ea60d3601ff85a1c67 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 28 Oct 2023 15:49:40 +0200
Subject: [PATCH 134/299] Cleaned up code

---
 .../java/org/apache/rat/anttasks/Report.java  | 33 ++++++++-----------
 .../anttasks/ResourceCollectionContainer.java | 19 +++++++----
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 77cdc0735..0d22147c1 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -19,10 +19,7 @@
 package org.apache.rat.anttasks;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -37,10 +34,7 @@
 import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.MatcherReader;
-import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory;
-import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
-import org.apache.rat.configuration.MatcherBuilderTracker;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -82,7 +76,7 @@ public class Report extends Task {
 
     public Report() {
         configuration = new ReportConfiguration();
-        configuration.setOut(()->new LogOutputStream(this, Project.MSG_INFO));
+        configuration.setOut(() -> new LogOutputStream(this, Project.MSG_INFO));
         defaultsBuilder = Defaults.builder();
     }
 
@@ -109,7 +103,7 @@ public void setReportFile(File reportFile) {
     public void addLicense(License lic) {
         licenses.add(lic);
     }
-    
+
     public void addFamily(Family family) {
         families.add(family);
     }
@@ -125,7 +119,7 @@ public void addStylesheet(Resource styleSheet) {
     }
 
     public void addStyleSheet(Resource styleSheet) {
-        configuration.setStyleSheet(()->styleSheet.getInputStream());
+        configuration.setStyleSheet(() -> styleSheet.getInputStream());
         configuration.setStyleReport(true);
     }
 
@@ -154,9 +148,9 @@ public void setLicenses(File fileName) {
             }
             LicenseReader lReader = fmt.licenseReader();
             if (lReader != null) {
-                    lReader.addLicenses(url);
-            configuration.addLicenses(lReader.readLicenses());
-            configuration.addApprovedLicenseCategories(lReader.approvedLicenseId());
+                lReader.addLicenses(url);
+                configuration.addLicenses(lReader.readLicenses());
+                configuration.addApprovedLicenseCategories(lReader.approvedLicenseId());
             }
         } catch (MalformedURLException e) {
             throw new BuildException("Can not read license file " + fileName, e);
@@ -176,9 +170,11 @@ public void setUseDefaultLicenses(boolean useDefaultLicenses) {
     public void setAddApprovedLicense(String familyCategory) {
         configuration.addApprovedLicenseCategory(familyCategory);
     }
+
     public void addAddApprovedLicense(String familyCategory) {
         configuration.addApprovedLicenseCategory(familyCategory);
     }
+
     public void setRemoveApprovedLicense(String familyCategory) {
         configuration.removeApprovedLicenseCategory(familyCategory);
     }
@@ -202,16 +198,15 @@ public void setAddDefaultDefinitions(File fileName) {
             throw new BuildException("Can not open additional default definitions: " + fileName.toString(), e);
         }
     }
-    
+
     public ReportConfiguration getConfiguration() {
         Defaults defaults = defaultsBuilder.build();
-        
+
         configuration.setFrom(defaults);
         configuration.setReportable(new ResourceCollectionContainer(nestedResources));
         families.stream().map(Family::build).forEach(configuration::addFamily);
-        licenses.stream().map(License::asBuilder).forEach(l -> 
-            configuration.addApprovedLicenseCategory(configuration.addLicense(l).getLicenseFamily())
-        );
+        licenses.stream().map(License::asBuilder)
+                .forEach(l -> configuration.addApprovedLicenseCategory(configuration.addLicense(l).getLicenseFamily()));
         return configuration;
     }
 
@@ -283,8 +278,8 @@ public ApprovalFilter(String s) {
 
         @Override
         public String[] getValues() {
-            return Arrays.stream(LicenseSetFactory.LicenseFilter.values()).map(LicenseSetFactory.LicenseFilter::name).collect(Collectors.toList())
-                    .toArray(new String[LicenseSetFactory.LicenseFilter.values().length]);
+            return Arrays.stream(LicenseSetFactory.LicenseFilter.values()).map(LicenseSetFactory.LicenseFilter::name)
+                    .collect(Collectors.toList()).toArray(new String[LicenseSetFactory.LicenseFilter.values().length]);
         }
 
         public LicenseSetFactory.LicenseFilter internalFilter() {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
index 6fe9175bc..667fb3bcc 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the    *
  * specific language governing permissions and limitations      *
  * under the License.                                           *
- */ 
+ */
 package org.apache.rat.anttasks;
 
 import java.io.File;
@@ -35,8 +35,8 @@
 import org.apache.tools.ant.types.resources.FileResource;
 
 /**
- * Implementation of IReportable that traverses over a resource
- * collection internally.
+ * Implementation of IReportable that traverses over a resource collection
+ * internally.
  */
 class ResourceCollectionContainer implements IReportable {
     private final ResourceCollection rc;
@@ -45,6 +45,7 @@ class ResourceCollectionContainer implements IReportable {
         this.rc = rc;
     }
 
+    @Override
     public void run(RatReport report) throws RatException {
         ResourceDocument document = new ResourceDocument();
         for (Resource r : rc) {
@@ -55,6 +56,7 @@ public void run(RatReport report) throws RatException {
             }
         }
     }
+
     private class ResourceDocument implements Document {
 
         private Resource resource;
@@ -63,12 +65,14 @@ private class ResourceDocument implements Document {
         private void setResource(Resource resource) {
             this.resource = resource;
         }
-        
+
+        @Override
         public Reader reader() throws IOException {
             final InputStream in = resource.getInputStream();
             return new InputStreamReader(in);
         }
 
+        @Override
         public String getName() {
             // TODO: reconsider names
             String result = null;
@@ -82,6 +86,7 @@ public String getName() {
             return result;
         }
 
+        @Override
         public boolean isComposite() {
             if (resource instanceof FileResource) {
                 final FileResource fileResource = (FileResource) resource;
@@ -90,11 +95,13 @@ public boolean isComposite() {
             }
             return false;
         }
-        
+
+        @Override
         public MetaData getMetaData() {
             return metaData;
         }
-        
+
+        @Override
         public InputStream inputStream() throws IOException {
             return resource.getInputStream();
         }

From dc615137b5cdf4b992d6e199ffc3ff9da3b52921 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 28 Oct 2023 16:22:55 +0200
Subject: [PATCH 135/299] Fixed dependency issue

---
 apache-rat-core/pom.xml   | 1 -
 apache-rat-plugin/pom.xml | 8 +++++---
 apache-rat-tasks/pom.xml  | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 445b31b37..b5923445e 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -86,7 +86,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 5099b0024..3a50bdadb 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -159,13 +159,15 @@
 		<dependency>
 			<groupId>org.apache.rat</groupId>
 			<artifactId>apache-rat-core</artifactId>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
 		  <groupId>org.apache.rat</groupId>
 		  <artifactId>apache-rat-core</artifactId>
-		  <classifier>tests</classifier>
-		  <version>${parent.version}</version>
-		  <scope>test</scope>
+		  <version>${project.parent.version}</version>
+		  <type>test-jar</type>
+      <classifier>tests</classifier>
+      <scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 9022ffabf..4d821f4a2 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -34,13 +34,15 @@
     <dependency>
       <groupId>org.apache.rat</groupId>
       <artifactId>apache-rat-core</artifactId>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
 		  <groupId>org.apache.rat</groupId>
 		  <artifactId>apache-rat-core</artifactId>
-		  <classifier>tests</classifier>
-		  <version>${parent.version}</version>
-		  <scope>test</scope>
+		  <version>${project.parent.version}</version>
+		  <type>test-jar</type>
+      <classifier>tests</classifier>
+      <scope>test</scope>
 		</dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>

From 05fdfaba143d456dff807dd0b14e4f16a5eb26f1 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 28 Oct 2023 17:01:24 +0200
Subject: [PATCH 136/299] modified workflow to generate site with test jar
 included

---
 .github/workflows/maven.yml | 5 ++++-
 pom.xml                     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0a8d746f2..c7d388236 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -58,7 +58,10 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn -e -B -V -ntp clean package site
+        run: mvn -e -B -V -ntp clean install
+        
+      - name: Build site
+        run: mvn -e -B V -ntp site
 
 # as of 20220505:  Invalid workflow file
 # The workflow is not valid. .github/workflows/maven.yml (Line: 55, Col: 1): Unexpected value 'notifications'
diff --git a/pom.xml b/pom.xml
index 524d49589..fc9786a46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,8 +59,8 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
-    <previousRatVersion>0.16</previousRatVersion>
-    <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
+    <previousRatVersion>0.15</previousRatVersion>
+    <currentSnapshotRatVersion>0.16-SNAPSHOT</currentSnapshotRatVersion>
   </properties>
   <distributionManagement>
     <site>

From 9ab8682284b077506f3e5d954cabb4adb3176b01 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 28 Oct 2023 17:03:15 +0200
Subject: [PATCH 137/299] fixed typo in maven.yml

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c7d388236..e759c66b4 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -61,7 +61,7 @@ jobs:
         run: mvn -e -B -V -ntp clean install
         
       - name: Build site
-        run: mvn -e -B V -ntp site
+        run: mvn -e -B -V -ntp site
 
 # as of 20220505:  Invalid workflow file
 # The workflow is not valid. .github/workflows/maven.yml (Line: 55, Col: 1): Unexpected value 'notifications'

From 73d3a3dc7baeb1e771999a94bcb1e9c0078ed68a Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 29 Oct 2023 07:44:20 +0100
Subject: [PATCH 138/299] reformatted poms as requested

---
 .buildtools/formatPom                         |  20 +
 apache-rat-api/pom.xml                        |   3 -
 apache-rat-core/pom.xml                       | 242 ++++---
 apache-rat-plugin/pom.xml                     | 611 +++++++++---------
 .../src/it/RAT-268/module1/pom.xml            |   5 +-
 .../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          | 195 +++---
 apache-rat-plugin/src/it/it4_RAT-168/pom.xml  |   5 +-
 .../src/test/resources/unit/it1/pom.xml       |   5 +-
 .../src/test/resources/unit/it2/pom.xml       |   5 +-
 .../src/test/resources/unit/it3/pom.xml       |   9 +-
 .../src/test/resources/unit/it4/pom.xml       |   5 +-
 .../src/test/resources/unit/it5/pom.xml       | 195 +++---
 apache-rat-tasks/pom.xml                      |  37 +-
 apache-rat/pom.xml                            |  17 +-
 16 files changed, 668 insertions(+), 698 deletions(-)
 create mode 100644 .buildtools/formatPom

diff --git a/.buildtools/formatPom b/.buildtools/formatPom
new file mode 100644
index 000000000..484b8a5f9
--- /dev/null
+++ b/.buildtools/formatPom
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+for pom in `find . -name \pom.xml` 
+do
+	xmllint --format $pom > /tmp/w 
+  	mv /tmp/w $pom 
+done
diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
index bdb30bf61..74ff54f2c 100644
--- a/apache-rat-api/pom.xml
+++ b/apache-rat-api/pom.xml
@@ -23,12 +23,9 @@
     <version>0.16-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
-
   <artifactId>apache-rat-api</artifactId>
-
   <name>Apache Creadur Rat::API</name>
   <description>Shared beans and services.</description>
-
   <dependencies>
     <!-- Test Dependencies -->
     <dependency>
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index b5923445e..1523c1f09 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,134 +15,128 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.rat</groupId>
-		<artifactId>apache-rat-project</artifactId>
-		<version>0.16-SNAPSHOT</version>
-	</parent>
-	<artifactId>apache-rat-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache Creadur Rat::Core</name>
-	<description>The core functionality, shared by the Ant tasks
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.rat</groupId>
+    <artifactId>apache-rat-project</artifactId>
+    <version>0.16-SNAPSHOT</version>
+  </parent>
+  <artifactId>apache-rat-core</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Creadur Rat::Core</name>
+  <description>The core functionality, shared by the Ant tasks
 		and the Maven plugin.</description>
-
-	<build>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>true</filtering>
-				<directory>src/main/filtered-resources</directory>
-			</resource>
-			<resource>
-				<directory>..</directory>
-				<targetPath>META-INF</targetPath>
-				<includes>
-					<include>RELEASE_NOTES.txt</include>
-				</includes>
-			</resource>
-		</resources>
-
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.rat</groupId>
-					<artifactId>apache-rat-plugin</artifactId>
-					<configuration>
-						<excludes>
-							<!-- These files have bad license headers because
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/filtered-resources</directory>
+      </resource>
+      <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>RELEASE_NOTES.txt</include>
+        </includes>
+      </resource>
+    </resources>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <!-- These files have bad license headers because
 							they are used to test bad license headers -->
-							<exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
-							<exclude>src/test/resources/oasis/bad/*.*</exclude>
-							<!-- These files does not have license headers
+              <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
+              <exclude>src/test/resources/oasis/bad/*.*</exclude>
+              <!-- These files does not have license headers
 							because they are used to test license headers -->
-							<exclude>src/test/resources/elements/Source.java</exclude>
-							<exclude>
+              <exclude>src/test/resources/elements/Source.java</exclude>
+              <exclude>
 								src/test/resources/elements/ILoggerFactory.java</exclude>
-							<exclude>src/test/resources/elements/sub/Empty.txt</exclude>
-							<exclude>src/test/resources/violations/bad.txt</exclude>
-							<exclude>src/test/resources/violations/FilterTest.cs</exclude>
-							<!-- used to test for binary files; does not work on
+              <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
+              <exclude>src/test/resources/violations/bad.txt</exclude>
+              <exclude>src/test/resources/violations/FilterTest.cs</exclude>
+              <!-- used to test for binary files; does not work on
 							UTF-8 (e.g. MacOSX) -->
-							<exclude>src/test/resources/binaries/Image-png.not</exclude>
-							<!-- These files have a valid license header that
+              <exclude>src/test/resources/binaries/Image-png.not</exclude>
+              <!-- These files have a valid license header that
 							was not recognised by older rat versions -->
-							<exclude>src/test/resources/elements/TextHttps.txt</exclude>
-							<!-- Remove after using RAT 0.14 for dog-fooding
+              <exclude>src/test/resources/elements/TextHttps.txt</exclude>
+              <!-- Remove after using RAT 0.14 for dog-fooding
 							..... older versions do not ignore JSON -->
-							<exclude>src/test/resources/elements/plain.json</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.rat</groupId>
-			<artifactId>apache-rat-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-collections4</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-compress</artifactId>
-			<exclusions>
-				<!-- Not actually used (yet) so no point including it -->
-				<exclusion>
-					<groupId>org.tukaani</groupId>
-					<artifactId>xz</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+              <exclude>src/test/resources/elements/plain.json</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.rat</groupId>
+      <artifactId>apache-rat-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <exclusions>
+        <!-- Not actually used (yet) so no point including it -->
+        <exclusion>
+          <groupId>org.tukaani</groupId>
+          <artifactId>xz</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 3a50bdadb..89cd33dd1 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -15,323 +15,320 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>apache-rat-project</artifactId>
-		<groupId>org.apache.rat</groupId>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>apache-rat-project</artifactId>
+    <groupId>org.apache.rat</groupId>
     <version>0.16-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>apache-rat-plugin</artifactId>
-	<packaging>maven-plugin</packaging>
-	<name>Apache Creadur Rat::Plugin4Maven</name>
-	<description>A plugin for Apache Maven that runs Apache Rat
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>apache-rat-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>Apache Creadur Rat::Plugin4Maven</name>
+  <description>A plugin for Apache Maven that runs Apache Rat
 		to audit the source to be distributed.</description>
-	<inceptionYear>2007</inceptionYear>
-	<prerequisites>
-		<maven>${mavenVersion}</maven>
-	</prerequisites>
-	<properties>
-		<currentVersion>${project.version}</currentVersion>
-		<doxiaVersion>1.12.0</doxiaVersion>
-		<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
-	</properties>
-	<build>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>true</filtering>
-				<directory>src/main/filtered-resources</directory>
-			</resource>
-			<resource>
-				<directory>..</directory>
-				<targetPath>META-INF</targetPath>
-				<includes>
-					<include>RELEASE_NOTES.txt</include>
-				</includes>
-			</resource>
-		</resources>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-plugin-plugin</artifactId>
-					<configuration>
-						<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-					</configuration>
-					<executions>
-						<execution>
-							<id>mojo-descriptor</id>
-							<goals>
-								<goal>descriptor</goal>
-							</goals>
-						</execution>
-						<!-- to generate help goal -->
-						<execution>
-							<id>help-goal</id>
-							<goals>
-								<goal>helpmojo</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.rat</groupId>
-					<artifactId>apache-rat-plugin</artifactId>
-					<configuration>
-						<excludes>
-							<!-- These files do not have license headers because
+  <inceptionYear>2007</inceptionYear>
+  <prerequisites>
+    <maven>${mavenVersion}</maven>
+  </prerequisites>
+  <properties>
+    <currentVersion>${project.version}</currentVersion>
+    <doxiaVersion>1.12.0</doxiaVersion>
+    <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+  </properties>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/filtered-resources</directory>
+      </resource>
+      <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>RELEASE_NOTES.txt</include>
+        </includes>
+      </resource>
+    </resources>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <configuration>
+            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+          </configuration>
+          <executions>
+            <execution>
+              <id>mojo-descriptor</id>
+              <goals>
+                <goal>descriptor</goal>
+              </goals>
+            </execution>
+            <!-- to generate help goal -->
+            <execution>
+              <id>help-goal</id>
+              <goals>
+                <goal>helpmojo</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <!-- These files do not have license headers because
 							they are used to test license headers -->
-							<exclude>src/it/**/src.apt</exclude>
-							<exclude>src/test/resources/unit/it2/src.txt</exclude>
-							<exclude>src/test/resources/unit/it3/src.apt</exclude>
-							<exclude>src/test/resources/unit/it4/*.html</exclude>
-							<exclude>**/*.iml</exclude>
-							<!-- RAT-171: needs to be added since SCM ignores
+              <exclude>src/it/**/src.apt</exclude>
+              <exclude>src/test/resources/unit/it2/src.txt</exclude>
+              <exclude>src/test/resources/unit/it3/src.apt</exclude>
+              <exclude>src/test/resources/unit/it4/*.html</exclude>
+              <exclude>**/*.iml</exclude>
+              <!-- RAT-171: needs to be added since SCM ignores
 							are only parsed in project root -->
-							<exclude>**/.bzrignore</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
+              <exclude>**/.bzrignore</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>
 											org.apache.maven.plugins
 										</groupId>
-										<artifactId>
+                    <artifactId>
 											maven-plugin-plugin
 										</artifactId>
-										<versionRange>[3.3,)</versionRange>
-										<goals>
-											<goal>descriptor</goal>
-											<goal>helpmojo</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-invoker-plugin</artifactId>
-				<configuration>
-					<cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
-					<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-					<settingsFile>src/it/settings.xml</settingsFile>
-					<postBuildHookScript>verify</postBuildHookScript>
-					<debug>true</debug>
-				</configuration>
-				<executions>
-					<execution>
-						<id>integration-test</id>
-						<goals>
-							<goal>install</goal>
-							<goal>integration-test</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.rat</groupId>
-			<artifactId>apache-rat-core</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-		  <groupId>org.apache.rat</groupId>
-		  <artifactId>apache-rat-core</artifactId>
-		  <version>${project.parent.version}</version>
-		  <type>test-jar</type>
+                    <versionRange>[3.3,)</versionRange>
+                    <goals>
+                      <goal>descriptor</goal>
+                      <goal>helpmojo</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <configuration>
+          <cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <postBuildHookScript>verify</postBuildHookScript>
+          <debug>true</debug>
+        </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.rat</groupId>
+      <artifactId>apache-rat-core</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.rat</groupId>
+      <artifactId>apache-rat-core</artifactId>
+      <version>${project.parent.version}</version>
+      <type>test-jar</type>
       <classifier>tests</classifier>
       <scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugin-tools</groupId>
-			<artifactId>maven-plugin-annotations</artifactId>
-			<version>${mavenPluginPluginVersion}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-artifact</artifactId>
-			<version>${mavenVersion}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-model</artifactId>
-			<version>${mavenVersion}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-			<version>${mavenVersion}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-core</artifactId>
-			<version>${mavenVersion}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-settings</artifactId>
-			<version>${mavenVersion}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-compat</artifactId>
-			<version>${mavenVersion}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.doxia</groupId>
-			<artifactId>doxia-core</artifactId>
-			<version>${doxiaVersion}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-container-default</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xerces</groupId>
-					<artifactId>xercesImpl</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.doxia</groupId>
-			<artifactId>doxia-decoration-model</artifactId>
-			<version>${doxiaSitetoolsVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.doxia</groupId>
-			<artifactId>doxia-module-xhtml</artifactId>
-			<version>${doxiaVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.doxia</groupId>
-			<artifactId>doxia-sink-api</artifactId>
-			<version>${doxiaVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.doxia</groupId>
-			<artifactId>doxia-integration-tools</artifactId>
-			<version>${doxiaSitetoolsVersion}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-container-default</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.doxia</groupId>
-			<artifactId>doxia-site-renderer</artifactId>
-			<version>${doxiaSitetoolsVersion}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-container-default</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.reporting</groupId>
-			<artifactId>maven-reporting-api</artifactId>
-			<version>3.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.shared</groupId>
-			<artifactId>maven-shared-utils</artifactId>
-			<version>3.4.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugin-testing</groupId>
-			<artifactId>maven-plugin-testing-harness</artifactId>
-			<version>3.3.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>3.5.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-	</dependencies>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-plugin-plugin</artifactId>
-				<version>${mavenPluginPluginVersion}</version>
-			</plugin>
-		</plugins>
-	</reporting>
-	<developers>
-		<developer>
-			<id>jochen</id>
-			<name>Jochen Wiedmann</name>
-			<email>jochen.wiedmann@gmail.com</email>
-		</developer>
-	</developers>
-	<contributors>
-		<contributor>
-			<name>Bernd Bohmann</name>
-			<email>bommel@apache.org</email>
-		</contributor>
-		<contributor>
-			<name>Lars Trieloff</name>
-			<email>lars@trieloff.net</email>
-		</contributor>
-		<contributor>
-			<name>Jukka Zitting</name>
-			<email>jukka@apache.org</email>
-		</contributor>
-	</contributors>
-	<!--
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>${mavenPluginPluginVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-core</artifactId>
+      <version>${doxiaVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-decoration-model</artifactId>
+      <version>${doxiaSitetoolsVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xhtml</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-integration-tools</artifactId>
+      <version>${doxiaSitetoolsVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <version>${doxiaSitetoolsVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>3.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
+      <version>3.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-testing</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <version>3.3.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>${mavenPluginPluginVersion}</version>
+      </plugin>
+    </plugins>
+  </reporting>
+  <developers>
+    <developer>
+      <id>jochen</id>
+      <name>Jochen Wiedmann</name>
+      <email>jochen.wiedmann@gmail.com</email>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Bernd Bohmann</name>
+      <email>bommel@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Lars Trieloff</name>
+      <email>lars@trieloff.net</email>
+    </contributor>
+    <contributor>
+      <name>Jukka Zitting</name>
+      <email>jukka@apache.org</email>
+    </contributor>
+  </contributors>
+  <!--
   <profiles>
     <profile>
       <id>apache-release</id>
diff --git a/apache-rat-plugin/src/it/RAT-268/module1/pom.xml b/apache-rat-plugin/src/it/RAT-268/module1/pom.xml
index 896861ec8..0cdc850c0 100644
--- a/apache-rat-plugin/src/it/RAT-268/module1/pom.xml
+++ b/apache-rat-plugin/src/it/RAT-268/module1/pom.xml
@@ -15,10 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.rat.test</groupId>
diff --git a/apache-rat-plugin/src/it/RAT-268/module3/pom.xml b/apache-rat-plugin/src/it/RAT-268/module3/pom.xml
index 2f41709fd..f7a4fb9a0 100644
--- a/apache-rat-plugin/src/it/RAT-268/module3/pom.xml
+++ b/apache-rat-plugin/src/it/RAT-268/module3/pom.xml
@@ -15,10 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.rat.test</groupId>
diff --git a/apache-rat-plugin/src/it/RAT-268/pom.xml b/apache-rat-plugin/src/it/RAT-268/pom.xml
index 8886a6c01..ae0df78b1 100644
--- a/apache-rat-plugin/src/it/RAT-268/pom.xml
+++ b/apache-rat-plugin/src/it/RAT-268/pom.xml
@@ -15,22 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.rat.test</groupId>
   <artifactId>rat268</artifactId>
   <version>1.0</version>
   <packaging>pom</packaging>
-  
   <modules>
     <module>module1</module>
     <module>module2/module2.pom</module>
     <module>module3/pom.xml</module>
   </modules>
-  
   <build>
     <plugins>
       <plugin>
diff --git a/apache-rat-plugin/src/it/it1/pom.xml b/apache-rat-plugin/src/it/it1/pom.xml
index cfac6ea69..ca62ab392 100644
--- a/apache-rat-plugin/src/it/it1/pom.xml
+++ b/apache-rat-plugin/src/it/it1/pom.xml
@@ -15,103 +15,100 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.codehaus.mojo.rat.test</groupId>
-	<artifactId>it1</artifactId>
-	<version>1.0</version>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-				<version>@pom.version@</version>
-				<configuration>		
-					<families>
-                        <family>
-                        <id>YAL</id>
-                        <name>Yet another license</name>
-                        </family>
-                    </families>
-                    <approvedLicenses>
-                        <approvedLicense>YAL</approvedLicense>
-                    </approvedLicenses>
-                    <licenses>
-                        <license>
-                            <id>MyLicense</id>
-                            <family>YAL</family>
-                            <text>Yet Another License</text>
-                        </license>
-						<license>
-							<family>GEN</family>
-							<id>CpyrT</id>
-							<name>Copyright with tags</name>
-							<notes></notes>
-							<copyright>
-								<start>1990</start>
-								<end>1991</end>
-								<owner>foo</owner>
-							</copyright>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>RegxT</id>
-							<name>Regex with tag</name>
-							<notes></notes>
-							<regex>regex tag</regex>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>SpdxT</id>
-							<name>Spdx with tag</name>
-							<notes></notes>
-							<spdx>spxd-tag</spdx>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>TextT</id>
-							<name>Text with tag</name>
-							<notes></notes>
-							<text>text-tag</text>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>Not</id>
-							<name>Not testing</name>
-							<notes></notes>
-							<not>
-								<text>not test text</text>
-							</not>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>All</id>
-							<name>All testing</name>
-							<notes></notes>
-							<all>
-								<text>all test text</text>
-								<spdx>all spdx text</spdx>
-							</all>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>Any</id>
-							<name>Any testing</name>
-							<notes></notes>
-							<any>
-								<text>any test text</text>
-								<spdx>any spdx text</spdx>
-							</any>
-						</license>
-					</licenses>
-					<includes>
-						<include>src.apt</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.codehaus.mojo.rat.test</groupId>
+  <artifactId>it1</artifactId>
+  <version>1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>@pom.version@</version>
+        <configuration>
+          <families>
+            <family>
+              <id>YAL</id>
+              <name>Yet another license</name>
+            </family>
+          </families>
+          <approvedLicenses>
+            <approvedLicense>YAL</approvedLicense>
+          </approvedLicenses>
+          <licenses>
+            <license>
+              <id>MyLicense</id>
+              <family>YAL</family>
+              <text>Yet Another License</text>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>CpyrT</id>
+              <name>Copyright with tags</name>
+              <notes/>
+              <copyright>
+                <start>1990</start>
+                <end>1991</end>
+                <owner>foo</owner>
+              </copyright>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>RegxT</id>
+              <name>Regex with tag</name>
+              <notes/>
+              <regex>regex tag</regex>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>SpdxT</id>
+              <name>Spdx with tag</name>
+              <notes/>
+              <spdx>spxd-tag</spdx>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>TextT</id>
+              <name>Text with tag</name>
+              <notes/>
+              <text>text-tag</text>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>Not</id>
+              <name>Not testing</name>
+              <notes/>
+              <not>
+                <text>not test text</text>
+              </not>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>All</id>
+              <name>All testing</name>
+              <notes/>
+              <all>
+                <text>all test text</text>
+                <spdx>all spdx text</spdx>
+              </all>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>Any</id>
+              <name>Any testing</name>
+              <notes/>
+              <any>
+                <text>any test text</text>
+                <spdx>any spdx text</spdx>
+              </any>
+            </license>
+          </licenses>
+          <includes>
+            <include>src.apt</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/apache-rat-plugin/src/it/it4_RAT-168/pom.xml b/apache-rat-plugin/src/it/it4_RAT-168/pom.xml
index 0a419e3fa..471eeb3a4 100644
--- a/apache-rat-plugin/src/it/it4_RAT-168/pom.xml
+++ b/apache-rat-plugin/src/it/it4_RAT-168/pom.xml
@@ -15,10 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.rat.test</groupId>
   <artifactId>it4rat168</artifactId>
diff --git a/apache-rat-plugin/src/test/resources/unit/it1/pom.xml b/apache-rat-plugin/src/test/resources/unit/it1/pom.xml
index 6c8e269cc..b6b71dc54 100644
--- a/apache-rat-plugin/src/test/resources/unit/it1/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/it1/pom.xml
@@ -15,10 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.mojo.rat.test</groupId>
   <artifactId>it1</artifactId>
diff --git a/apache-rat-plugin/src/test/resources/unit/it2/pom.xml b/apache-rat-plugin/src/test/resources/unit/it2/pom.xml
index d7aac5e34..bab0bea2f 100644
--- a/apache-rat-plugin/src/test/resources/unit/it2/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/it2/pom.xml
@@ -15,10 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.rat.test</groupId>
   <artifactId>it2</artifactId>
diff --git a/apache-rat-plugin/src/test/resources/unit/it3/pom.xml b/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
index 3885932ea..f6982e399 100644
--- a/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/it3/pom.xml
@@ -15,10 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.rat.test</groupId>
   <artifactId>it3</artifactId>
@@ -30,8 +27,8 @@
         <artifactId>apache-rat-plugin</artifactId>
         <version>@pom.version@</version>
         <configuration>
-				<numUnapprovedLicenses>1</numUnapprovedLicenses>
-				<addLicenseHeaders>true</addLicenseHeaders>
+          <numUnapprovedLicenses>1</numUnapprovedLicenses>
+          <addLicenseHeaders>true</addLicenseHeaders>
         </configuration>
       </plugin>
     </plugins>
diff --git a/apache-rat-plugin/src/test/resources/unit/it4/pom.xml b/apache-rat-plugin/src/test/resources/unit/it4/pom.xml
index d24f14526..18145fdca 100644
--- a/apache-rat-plugin/src/test/resources/unit/it4/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/it4/pom.xml
@@ -15,10 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.rat.test</groupId>
   <artifactId>it4</artifactId>
diff --git a/apache-rat-plugin/src/test/resources/unit/it5/pom.xml b/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
index cfac6ea69..ca62ab392 100644
--- a/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/it5/pom.xml
@@ -15,103 +15,100 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.codehaus.mojo.rat.test</groupId>
-	<artifactId>it1</artifactId>
-	<version>1.0</version>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-				<version>@pom.version@</version>
-				<configuration>		
-					<families>
-                        <family>
-                        <id>YAL</id>
-                        <name>Yet another license</name>
-                        </family>
-                    </families>
-                    <approvedLicenses>
-                        <approvedLicense>YAL</approvedLicense>
-                    </approvedLicenses>
-                    <licenses>
-                        <license>
-                            <id>MyLicense</id>
-                            <family>YAL</family>
-                            <text>Yet Another License</text>
-                        </license>
-						<license>
-							<family>GEN</family>
-							<id>CpyrT</id>
-							<name>Copyright with tags</name>
-							<notes></notes>
-							<copyright>
-								<start>1990</start>
-								<end>1991</end>
-								<owner>foo</owner>
-							</copyright>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>RegxT</id>
-							<name>Regex with tag</name>
-							<notes></notes>
-							<regex>regex tag</regex>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>SpdxT</id>
-							<name>Spdx with tag</name>
-							<notes></notes>
-							<spdx>spxd-tag</spdx>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>TextT</id>
-							<name>Text with tag</name>
-							<notes></notes>
-							<text>text-tag</text>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>Not</id>
-							<name>Not testing</name>
-							<notes></notes>
-							<not>
-								<text>not test text</text>
-							</not>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>All</id>
-							<name>All testing</name>
-							<notes></notes>
-							<all>
-								<text>all test text</text>
-								<spdx>all spdx text</spdx>
-							</all>
-						</license>
-						<license>
-							<family>GEN</family>
-							<id>Any</id>
-							<name>Any testing</name>
-							<notes></notes>
-							<any>
-								<text>any test text</text>
-								<spdx>any spdx text</spdx>
-							</any>
-						</license>
-					</licenses>
-					<includes>
-						<include>src.apt</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.codehaus.mojo.rat.test</groupId>
+  <artifactId>it1</artifactId>
+  <version>1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>@pom.version@</version>
+        <configuration>
+          <families>
+            <family>
+              <id>YAL</id>
+              <name>Yet another license</name>
+            </family>
+          </families>
+          <approvedLicenses>
+            <approvedLicense>YAL</approvedLicense>
+          </approvedLicenses>
+          <licenses>
+            <license>
+              <id>MyLicense</id>
+              <family>YAL</family>
+              <text>Yet Another License</text>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>CpyrT</id>
+              <name>Copyright with tags</name>
+              <notes/>
+              <copyright>
+                <start>1990</start>
+                <end>1991</end>
+                <owner>foo</owner>
+              </copyright>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>RegxT</id>
+              <name>Regex with tag</name>
+              <notes/>
+              <regex>regex tag</regex>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>SpdxT</id>
+              <name>Spdx with tag</name>
+              <notes/>
+              <spdx>spxd-tag</spdx>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>TextT</id>
+              <name>Text with tag</name>
+              <notes/>
+              <text>text-tag</text>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>Not</id>
+              <name>Not testing</name>
+              <notes/>
+              <not>
+                <text>not test text</text>
+              </not>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>All</id>
+              <name>All testing</name>
+              <notes/>
+              <all>
+                <text>all test text</text>
+                <spdx>all spdx text</spdx>
+              </all>
+            </license>
+            <license>
+              <family>GEN</family>
+              <id>Any</id>
+              <name>Any testing</name>
+              <notes/>
+              <any>
+                <text>any test text</text>
+                <spdx>any spdx text</spdx>
+              </any>
+            </license>
+          </licenses>
+          <includes>
+            <include>src.apt</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 4d821f4a2..da8532fbe 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -29,7 +29,6 @@
  A plugin for Apache Ant that runs Apache Rat
    to audit the source to be distributed.
   </description>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.rat</groupId>
@@ -37,13 +36,13 @@
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>
-		  <groupId>org.apache.rat</groupId>
-		  <artifactId>apache-rat-core</artifactId>
-		  <version>${project.parent.version}</version>
-		  <type>test-jar</type>
+      <groupId>org.apache.rat</groupId>
+      <artifactId>apache-rat-core</artifactId>
+      <version>${project.parent.version}</version>
+      <type>test-jar</type>
       <classifier>tests</classifier>
       <scope>test</scope>
-		</dependency>
+    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
@@ -61,7 +60,6 @@
       <artifactId>ant-testutil</artifactId>
     </dependency>
   </dependencies>
-
   <build>
     <resources>
       <resource>
@@ -110,18 +108,18 @@
             <configuration>
               <target>
                 <ant antfile="src/test/resources/antunit/report-bad-configurations.xml" inheritAll="false" inheritRefs="false">
-                  <property name="jar.name" location="${project.build.outputDirectory}" />
-                  <property name="base.dir" location="${basedir}" />
-                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar" />
-                  <property name="test.skipped" value="${maven.test.skip}" />
-                  <property name="test.classpath" refid="maven.test.classpath" />
+                  <property name="jar.name" location="${project.build.outputDirectory}"/>
+                  <property name="base.dir" location="${basedir}"/>
+                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+                  <property name="test.skipped" value="${maven.test.skip}"/>
+                  <property name="test.classpath" refid="maven.test.classpath"/>
                 </ant>
                 <ant antfile="src/test/resources/antunit/report-normal-operation.xml" inheritAll="false" inheritRefs="false">
-                  <property name="jar.name" location="${project.build.outputDirectory}" />
-                  <property name="base.dir" location="${basedir}" />
-                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar" />
-                  <property name="test.skipped" value="${maven.test.skip}" />
-                  <property name="test.classpath" refid="maven.test.classpath" />
+                  <property name="jar.name" location="${project.build.outputDirectory}"/>
+                  <property name="base.dir" location="${basedir}"/>
+                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+                  <property name="test.skipped" value="${maven.test.skip}"/>
+                  <property name="test.classpath" refid="maven.test.classpath"/>
                 </ant>
               </target>
             </configuration>
@@ -129,7 +127,6 @@
         </executions>
       </plugin>
     </plugins>
-    
     <pluginManagement>
       <plugins>
         <plugin>
@@ -160,7 +157,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index 4134d5715..fdc7e324d 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -31,7 +31,6 @@
     provides a JAR file, which is the combination of
     rat-core, rat-tasks, and its dependencies.
   </description>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.rat</groupId>
@@ -42,7 +41,6 @@
       <artifactId>apache-rat-tasks</artifactId>
     </dependency>
   </dependencies>
-
   <build>
     <resources>
       <resource>
@@ -120,7 +118,6 @@
         </executions>
       </plugin>
     </plugins>
-
     <pluginManagement>
       <plugins>
         <plugin>
@@ -152,7 +149,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -162,7 +159,6 @@
       </plugins>
     </pluginManagement>
   </build>
-
   <profiles>
     <profile>
       <id>apache-release</id>
@@ -178,10 +174,11 @@
             <executions>
               <execution>
                 <id>make-assembly</id>
-                  <phase>package</phase> <!-- append to the packaging phase. -->
-                  <goals>
-                    <goal>single</goal>
-                  </goals>
+                <phase>package</phase>
+                <!-- append to the packaging phase. -->
+                <goals>
+                  <goal>single</goal>
+                </goals>
               </execution>
             </executions>
           </plugin>

From 8d9a6e57c82f5e32411352bad33ba22e4f31f35a Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 29 Oct 2023 08:10:00 +0100
Subject: [PATCH 139/299] reverted accidental pom changes

---
 apache-rat-core/pom.xml   | 17 ++++++-----------
 apache-rat-plugin/pom.xml | 16 +++++-----------
 pom.xml                   |  4 ++--
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 1523c1f09..16b1d0676 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -26,7 +26,7 @@
   <packaging>jar</packaging>
   <name>Apache Creadur Rat::Core</name>
   <description>The core functionality, shared by the Ant tasks
-		and the Maven plugin.</description>
+    and the Maven plugin.</description>
   <build>
     <resources>
       <resource>
@@ -52,26 +52,21 @@
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
             <excludes>
-              <!-- These files have bad license headers because
-							they are used to test bad license headers -->
+              <!-- These files have bad license headers because they are used to test bad license headers -->
               <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
               <exclude>src/test/resources/oasis/bad/*.*</exclude>
-              <!-- These files does not have license headers
-							because they are used to test license headers -->
+              <!-- These files does not have license headers because they are used to test license headers -->
               <exclude>src/test/resources/elements/Source.java</exclude>
               <exclude>
 								src/test/resources/elements/ILoggerFactory.java</exclude>
               <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
               <exclude>src/test/resources/violations/bad.txt</exclude>
               <exclude>src/test/resources/violations/FilterTest.cs</exclude>
-              <!-- used to test for binary files; does not work on
-							UTF-8 (e.g. MacOSX) -->
+              <!-- used to test for binary files; does not work on UTF-8 (e.g. MacOSX) -->
               <exclude>src/test/resources/binaries/Image-png.not</exclude>
-              <!-- These files have a valid license header that
-							was not recognised by older rat versions -->
+              <!-- These files have a valid license header that was not recognised by older rat versions -->
               <exclude>src/test/resources/elements/TextHttps.txt</exclude>
-              <!-- Remove after using RAT 0.14 for dog-fooding
-							..... older versions do not ignore JSON -->
+              <!-- Remove after using RAT 0.14 for dog-fooding older versions do not ignore JSON -->
               <exclude>src/test/resources/elements/plain.json</exclude>
             </excludes>
           </configuration>
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 89cd33dd1..f7e07e5c4 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -27,7 +27,7 @@
   <packaging>maven-plugin</packaging>
   <name>Apache Creadur Rat::Plugin4Maven</name>
   <description>A plugin for Apache Maven that runs Apache Rat
-		to audit the source to be distributed.</description>
+                to audit the source to be distributed.</description>
   <inceptionYear>2007</inceptionYear>
   <prerequisites>
     <maven>${mavenVersion}</maven>
@@ -84,15 +84,13 @@
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
             <excludes>
-              <!-- These files do not have license headers because
-							they are used to test license headers -->
+              <!-- These files do not have license headers because they are used to test license headers -->
               <exclude>src/it/**/src.apt</exclude>
               <exclude>src/test/resources/unit/it2/src.txt</exclude>
               <exclude>src/test/resources/unit/it3/src.apt</exclude>
               <exclude>src/test/resources/unit/it4/*.html</exclude>
               <exclude>**/*.iml</exclude>
-              <!-- RAT-171: needs to be added since SCM ignores
-							are only parsed in project root -->
+              <!-- RAT-171: needs to be added since SCM ignores are only parsed in project root -->
               <exclude>**/.bzrignore</exclude>
             </excludes>
           </configuration>
@@ -107,12 +105,8 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>
-											org.apache.maven.plugins
-										</groupId>
-                    <artifactId>
-											maven-plugin-plugin
-										</artifactId>
+                    <groupId> org.apache.maven.plugins </groupId>
+                    <artifactId> maven-plugin-plugin </artifactId>
                     <versionRange>[3.3,)</versionRange>
                     <goals>
                       <goal>descriptor</goal>
diff --git a/pom.xml b/pom.xml
index fc9786a46..524d49589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,8 +59,8 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
-    <previousRatVersion>0.15</previousRatVersion>
-    <currentSnapshotRatVersion>0.16-SNAPSHOT</currentSnapshotRatVersion>
+    <previousRatVersion>0.16</previousRatVersion>
+    <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
   </properties>
   <distributionManagement>
     <site>

From 606acea1fdb3d4b31a0b5afe1891826bb1d7f2fe Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 29 Oct 2023 08:39:15 +0100
Subject: [PATCH 140/299] updated as per review

---
 apache-rat-core/pom.xml                       |   5 +-
 .../rat/configuration/LicenseReader.java      |   2 +-
 .../java/org/apache/rat/license/ILicense.java | 101 +++++++++---------
 .../org/apache/rat/policy/DefaultPolicy.java  |   1 -
 .../apache/rat/policy/DefaultPolicyTest.java  |   1 -
 5 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 16b1d0676..3e3fd1379 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -55,10 +55,9 @@
               <!-- These files have bad license headers because they are used to test bad license headers -->
               <exclude>src/test/resources/appliedAL20/bad/*.*</exclude>
               <exclude>src/test/resources/oasis/bad/*.*</exclude>
-              <!-- These files does not have license headers because they are used to test license headers -->
+              <!-- These files do not have license headers because they are used to test license headers -->
               <exclude>src/test/resources/elements/Source.java</exclude>
-              <exclude>
-								src/test/resources/elements/ILoggerFactory.java</exclude>
+              <exclude>src/test/resources/elements/ILoggerFactory.java</exclude>
               <exclude>src/test/resources/elements/sub/Empty.txt</exclude>
               <exclude>src/test/resources/violations/bad.txt</exclude>
               <exclude>src/test/resources/violations/FilterTest.cs</exclude>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index d48f613f8..e9819b8df 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -45,7 +45,7 @@ public interface LicenseReader {
     /**
      * Reads the configuration and extracts instances of ILicenseFamily.
      * 
-     * @return A collection of iLicensFamily.
+     * @return A collection of ILicensFamily.
      */
     SortedSet<ILicenseFamily> readFamilies();
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index d6916d3c9..94d4e19c3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -22,7 +22,6 @@
 import java.util.Objects;
 import java.util.SortedSet;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.analysis.IHeaderMatcher;
 
 /**
@@ -68,57 +67,22 @@ static Comparator<ILicense> getComparator() {
 //     * The definition of a ILicense Builder.
 //     */
 //    interface Builder {
-//        /**
-//         * @param families the set of defined license families.
-//         * @return A new License implementation.
-//         */
 //        ILicense build(SortedSet<ILicenseFamily> families);
 //        
-//        /**
-//         * Sets the matcher from a builder.
-//         * @param matcher the builder for the matcher for the license.
-//         * @return this builder for chaining.
-//         */
+
 //        Builder setMatcher(IHeaderMatcher.Builder matcher);
 //        
-//        /**
-//         * Sets the matcher.
-//         * @param matcher the matcher for the license.
-//         * @return this builder for chaining.
-//         */
 //        Builder setMatcher(IHeaderMatcher matcher);
 //
-//        /**
-//         * Sets the notes for the license.
-//         * If called multiple times the notes are concatenated to create a single note.
-//         * @param notes the notes for the license.
-//         * @return this builder for chaining.
-//         */
+
 //        Builder setNotes(String notes);
-//
-//        /**
-//         * Sets the derived from fields in the license.
-//         * @param derivedFrom the family category of the license this license was derived from.
-//         * @return this builder for chaining.
-//         */
+
 //        Builder setDerivedFrom(String derivedFrom);
 //
-//        /**
-//         * Set the family category for this license.
-//         * The category must be unique across all licenses and must be 5 characters. If more than 
-//         * 5 characters are provided then only the first 5 are taken.  If fewer than 5 characters are provided
-//         * the category is padded with spaces.
-//         * @param licenseFamilyCategory the family category for the license.
-//         * @return this builder for chaining.
-//         */
+
 //        Builder setLicenseFamilyCategory(String licenseFamilyCategory);
 //
-//        /**
-//         * Sets the name of the license.
-//         * If the name is not set then the name of the license family is used.
-//         * @param name the name for the license
-//         * @return this builder for chaining.
-//         */
+
 //        Builder setName(String name);
 //        
 //        /**
@@ -144,48 +108,87 @@ class Builder  {
 
         private final ILicenseFamily.Builder licenseFamily = ILicenseFamily.builder();
 
-   
+        /**
+         * Sets the matcher from a builder.
+         * @param matcher the builder for the matcher for the license.
+         * @return this builder for chaining.
+         */
         public Builder setMatcher(IHeaderMatcher.Builder matcher) {
             this.matcher = matcher;
             return this;
         }
-        
-        
+
+        /**
+         * Sets the matcher.
+         * @param matcher the matcher for the license.
+         * @return this builder for chaining.
+         */
         public Builder setMatcher(IHeaderMatcher matcher) {
             this.matcher = ()->matcher;
             return this;
         }
 
-    
+        /**
+         * Sets the notes for the license.
+         * If called multiple times the notes are concatenated to create a single note.
+         * @param notes the notes for the license.
+         * @return this builder for chaining.
+         */
         public Builder setNotes(String notes) {
             this.notes = notes;
             return this;
         }
 
-      
+        /**
+         * Sets the ID of the license.
+         * If the ID is not set then the ID of the license family is used.
+         * @param id the ID for the license
+         * @return this builder for chaining.
+         */
         public Builder setId(String id) {
             this.id = id;
             return this;
         }
-        
-     
+
+        /**
+         * Sets the derived from fields in the license.
+         * @param derivedFrom the family category of the license this license was derived from.
+         * @return this builder for chaining.
+         */
         public Builder setDerivedFrom(String derivedFrom) {
             this.derivedFrom = derivedFrom;
             return this;
         }
 
+        /**
+         * Set the family category for this license.
+         * The category must be unique across all licenses and must be 5 characters. If more than 
+         * 5 characters are provided then only the first 5 are taken.  If fewer than 5 characters are provided
+         * the category is padded with spaces.
+         * @param licenseFamilyCategory the family category for the license.
+         * @return this builder for chaining.
+         */
         public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
             this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
             this.licenseFamily.setLicenseFamilyName("License Family for searching");
             return this;
         }
 
-      
+        /**
+         * Sets the name of the license.
+         * If the name is not set then the name of the license family is used.
+         * @param name the name for the license
+         * @return this builder for chaining.
+         */
         public Builder setName(String name) {
             this.name = name;
             return this;
         }
 
+        /**
+         * @param licenseFamilies the set of defined license families.
+         * @return A new License implementation.
+         */
         public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
         	Objects.requireNonNull(matcher, "Matcher must not be null");
             ILicenseFamily family = LicenseFamilySetFactory.search(licenseFamily.build(), licenseFamilies);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 037a6b11c..d019a6121 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -27,7 +27,6 @@
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseFamilySetFactory;
-import org.apache.rat.license.LicenseSetFactory;
 
 /**
  * A default Document Analyser that determines if the matched license is in the set of approved licenses.
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 7f39aab60..2757713be 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -31,7 +31,6 @@
 import org.apache.rat.api.MetaData.Datum;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseFamilySetFactory;
-import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.TestingLocation;

From 3d61370c70620602b8d0fe8dab523be6bc94457b Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 29 Oct 2023 08:40:38 +0100
Subject: [PATCH 141/299] updated as per review

---
 .../java/org/apache/rat/license/ILicense.java | 35 ++-----------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 94d4e19c3..1279cf3aa 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -63,37 +63,9 @@ static Comparator<ILicense> getComparator() {
         return (x, y) ->  x.getId().compareTo( y.getId() );
     }
 
-//    /**
-//     * The definition of a ILicense Builder.
-//     */
-//    interface Builder {
-//        ILicense build(SortedSet<ILicenseFamily> families);
-//        
-
-//        Builder setMatcher(IHeaderMatcher.Builder matcher);
-//        
-//        Builder setMatcher(IHeaderMatcher matcher);
-//
-
-//        Builder setNotes(String notes);
-
-//        Builder setDerivedFrom(String derivedFrom);
-//
-
-//        Builder setLicenseFamilyCategory(String licenseFamilyCategory);
-//
-
-//        Builder setName(String name);
-//        
-//        /**
-//         * Sets the ID of the license.
-//         * If the ID is not set then the ID of the license family is used.
-//         * @param id the ID for the license
-//         * @return this builder for chaining.
-//         */
-//        Builder setId(String id);
-//    }
-    
+    /**
+     * A builder for ILicense instances.
+     */
     class Builder  {
 
         private IHeaderMatcher.Builder matcher;
@@ -196,5 +168,4 @@ public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
             return new SimpleLicense(family, matcher.build(), derivedFrom, notes, name, id); 
         }
     }
-
 }

From e110b986a6c5e5bbdf0e27a4f41de4d76d15b19f Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 29 Oct 2023 08:56:09 +0100
Subject: [PATCH 142/299] remved commented out code

---
 .../src/main/java/org/apache/rat/Report.java  | 72 -------------------
 1 file changed, 72 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 089fcc604..1e5fbc95d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -146,71 +146,6 @@ public static final void main(String[] args) throws Exception {
         if (args == null || args.length != 1) {
             printUsage(opts);
         } else {
-            
-        
-//
-//            if (cl.hasOption('a') || cl.hasOption('A')) {
-//                configuration
-//                        .setAddLicenseHeaders(cl.hasOption('f') ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
-//                configuration.setCopyrightMessage(cl.getOptionValue("c"));
-//            }
-//
-//            if (cl.hasOption(EXCLUDE_CLI)) {
-//                String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
-//                if (excludes != null) {
-//                    final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
-//                    configuration.setInputFileFilter(filter);
-//                }
-//            } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
-//                String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
-//                if (excludeFileName != null) {
-//                    final FilenameFilter filter = parseExclusions(
-//                            FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
-//                    configuration.setInputFileFilter(filter);
-//                }
-//            }
-//
-////            if (cl.hasOption(NO_DEFAULTS)) {
-////                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.none);
-////            } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
-////                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
-////            } else {
-////                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.approved);
-////            }
-//            if (cl.hasOption(XML)) {
-//                configuration.setStyleReport(false);
-//            } else {
-//                configuration.setStyleReport(true);
-//                if (cl.hasOption(STYLESHEET_CLI)) {
-//                    String[] style = cl.getOptionValues(STYLESHEET_CLI);
-//                    if (style.length != 1) {
-//                        System.err.println("please specify a single stylesheet");
-//                        System.exit(1);
-//                    }
-//                    configuration.setStyleSheet(() -> new FileInputStream(style[0]));
-//                }
-//            }
-//
-//            Defaults.Builder defaultBuilder = Defaults.builder();
-//            if (cl.hasOption(NO_DEFAULTS)) {
-//                defaultBuilder.noDefault();
-//            }
-//            if (cl.hasOption(LICENSES)) {
-//                for (String fn : cl.getOptionValues(LICENSES)) {
-//                    defaultBuilder.add(fn);
-//                }
-//            }
-//            Defaults defaults = defaultBuilder.build();
-//            configuration.setFrom(defaults);
-//            configuration.setReportable(getDirectory(args[0], configuration));
-//            configuration.validate(s -> System.err.println(s));
-//
-//            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-//                listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
-//            }
-//            if (cl.hasOption(LIST_LICENSES)) {
-//                listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
-//            }
             ReportConfiguration configuration = createConfiguration(args[0],cl);
             configuration.validate(s -> System.err.println(s));
 
@@ -247,13 +182,6 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
             }
         }
 
-//            if (cl.hasOption(NO_DEFAULTS)) {
-//                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.none);
-//            } else if (cl.hasOption(ALL_DEFAULT_LICENSES)) {
-//                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.all);
-//            } else {
-//                configuration.setLicenseFilter(ReportConfiguration.LicenseFilter.approved);
-//            }
         if (cl.hasOption(XML)) {
             configuration.setStyleReport(false);
         } else {

From ac66ec548977704455859012258ddb143ee3899f Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 29 Oct 2023 09:10:00 +0100
Subject: [PATCH 143/299] removed dead code

---
 .../src/main/java/org/apache/rat/Report.java  |  3 +-
 .../apache/rat/license/ILicenseBuilder.java   | 92 -------------------
 2 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 1e5fbc95d..430818f22 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -274,8 +274,7 @@ static Options buildOptions() {
                 + "By default new files will be created with the license header, "
                 + "to force the modification of existing files use the --force option.";
 
-        // RAT-85/RAT-203: Deprecated! added only for convenience and for backwards
-        // compatibility
+        // RAT-85/RAT-203: Deprecated! added only for convenience and for backwards compatibility
         Option addLicence = new Option(ADD_OLD, "addLicence", false, addLicenseDesc);
         addLicenseGroup.addOption(addLicence);
         Option addLicense = new Option(ADD, "addLicense", false, addLicenseDesc);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
deleted file mode 100644
index 2a09dcb48..000000000
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseBuilder.java
+++ /dev/null
@@ -1,92 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one   *
-// * or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information        *
-// * regarding copyright ownership.  The ASF licenses this file   *
-// * to you under the Apache License, Version 2.0 (the            *
-// * "License"); you may not use this file except in compliance   *
-// * with the License.  You may obtain a copy of the License at   *
-// *                                                              *
-// *   http://www.apache.org/licenses/LICENSE-2.0                 *
-// *                                                              *
-// * Unless required by applicable law or agreed to in writing,   *
-// * software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
-// * KIND, either express or implied.  See the License for the    *
-// * specific language governing permissions and limitations      *
-// * under the License.                                           *
-// */
-//package org.apache.rat.license;
-//
-//import java.util.Objects;
-//import java.util.SortedSet;
-//
-//import org.apache.rat.analysis.IHeaderMatcher;
-//
-///**
-// * An implementation of the ILicense Builder.
-// */
-//public class ILicenseBuilder  {
-//
-//    private IHeaderMatcher.Builder matcher;
-//
-//    private String notes;
-//
-//    private String derivedFrom;
-//    
-//    private String name;
-//    
-//    private String id;
-//
-//    private final ILicenseFamily.Builder licenseFamily = ILicenseFamily.builder();
-//
-//    @Override
-//    public Builder setMatcher(IHeaderMatcher.Builder matcher) {
-//        this.matcher = matcher;
-//        return this;
-//    }
-//    
-//    @Override
-//    public Builder setMatcher(IHeaderMatcher matcher) {
-//        this.matcher = ()->matcher;
-//        return this;
-//    }
-//
-//    @Override
-//    public Builder setNotes(String notes) {
-//        this.notes = notes;
-//        return this;
-//    }
-//
-//    @Override
-//    public Builder setId(String id) {
-//        this.id = id;
-//        return this;
-//    }
-//    
-//    @Override
-//    public Builder setDerivedFrom(String derivedFrom) {
-//        this.derivedFrom = derivedFrom;
-//        return this;
-//    }
-//
-//    @Override
-//    public Builder setLicenseFamilyCategory(String licenseFamilyCategory) {
-//        this.licenseFamily.setLicenseFamilyCategory(licenseFamilyCategory);
-//        this.licenseFamily.setLicenseFamilyName("License Family for searching");
-//        return this;
-//    }
-//
-//    @Override
-//    public Builder setName(String name) {
-//        this.name = name;
-//        return this;
-//    }
-//
-//    @Override
-//    public ILicense build(SortedSet<ILicenseFamily> licenseFamilies) {
-//        ILicenseFamily family = LicenseSetFactory.search(licenseFamily.build(), licenseFamilies);
-//        Objects.requireNonNull(family, "License family may not be null.  Family "+licenseFamily.getCategory()+" not found.");
-//        return new SimpleLicense(family, matcher.build(), derivedFrom, notes, name, id);
-//    }
-//}
\ No newline at end of file

From c13b8b1cfaf0bed699ff16158e88bf1d5a5aa804 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 29 Oct 2023 16:33:47 +0100
Subject: [PATCH 144/299] MENFORCER-493: Replace deprecated maven goal by
 global setting to show version info during build

---
 .mvn/maven.config | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .mvn/maven.config

diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 000000000..df145f3d4
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1 @@
+-V

From 40ad246713d3794759d12cef7483320e0febd5ee Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 29 Oct 2023 16:38:12 +0100
Subject: [PATCH 145/299] Add exclusion for .mvn to fix the build

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 04359fd27..0bbf01ad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,6 +358,7 @@ agnostic home for software distribution comprehension and audit tools.
               <exclude>apache-rat-plugin/src/test/resources/**</exclude>
               <exclude>apache-rat-plugin/src/it/**</exclude>
               <exclude>apache-rat-tasks/src/test/resources/**</exclude>
+              <exclude>**/.mvn/**</exclude>
               <exclude>**/iso-8859-1.html</exclude>
               <exclude>**/velocity.log</exclude>
             </excludes>

From 3246f3db73b2fc3ac749d69e4ac8d84ca8594712 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 30 Oct 2023 16:47:42 +0100
Subject: [PATCH 146/299] fix potential windows encoding issue

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 524d49589..c34c3c53a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@ agnostic home for software distribution comprehension and audit tools.
   </description>
   <inceptionYear>2006</inceptionYear>
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
     <ant.version>1.10.14</ant.version>

From 2b700ad97669da2acd6a4c43c0cf6a170f6192c9 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 30 Oct 2023 16:55:02 +0100
Subject: [PATCH 147/299] added output for debugging text matching tests

---
 .../src/test/java/org/apache/rat/testhelpers/TextUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
index 0ca0873cf..d806981ee 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
@@ -26,12 +26,12 @@ public class TextUtils {
     public static final String[] EMPTY = {};
     
     public static void assertPatternInOutput(String pPattern, String out) {
-        Assert.assertTrue("Output does not match string: " + pPattern,
+        Assert.assertTrue("Output does not match string: " + pPattern+"\n"+out,
                 isMatching(pPattern, out));
     }
     
     public static void assertPatternNotInOutput(String pPattern, String out) {
-        Assert.assertFalse("Output matches the pattern: " + pPattern,
+        Assert.assertFalse("Output matches the pattern: " + pPattern+"\n"+out,
                 isMatching(pPattern, out));
     }
 

From 1b0a188ea109514238efdc27534364fcdde51c95 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 30 Oct 2023 17:22:51 +0100
Subject: [PATCH 148/299] fixed windows path check issue

---
 .../test/java/org/apache/rat/mp/RatCheckMojoTest.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index 67e9fedd0..d97b6786e 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -91,6 +91,9 @@ private File getRatTxtFile(RatCheckMojo pMojo) throws Exception {
         return (File) getVariableValueFromObject(pMojo, "reportFile");
     }
 
+    private String getDir(RatCheckMojo mojo) {
+        return mojo.getProject().getBasedir().getAbsolutePath().replace("\\","/") + "/";
+    }
     /**
      * Runs a check, which should expose no problems.
      *
@@ -100,8 +103,7 @@ public void testIt1() throws Exception {
 
         final RatCheckMojo mojo = newRatCheckMojo("it1");
         final File ratTxtFile = getRatTxtFile(mojo);
-        final String dir = mojo.getProject().getBasedir().getAbsolutePath() + "/";
-        final String[] expected = { " AL +\\Q" + dir + "pom.xml\\E", "Notes: 0", "Binaries: 0", "Archives: 0",
+        final String[] expected = { " AL +\\Q" + getDir(mojo) + "pom.xml\\E", "Notes: 0", "Binaries: 0", "Archives: 0",
                 "Standards: 1$", "Apache Licensed: 1$", "Generated Documents: 0", "^0 Unknown Licenses" };
 
         ReportConfiguration config = mojo.getConfiguration();
@@ -120,7 +122,7 @@ public void testIt2() throws Exception {
 
         final RatCheckMojo mojo = newRatCheckMojo("it2");
         final File ratTxtFile = getRatTxtFile(mojo);
-        final String dir = mojo.getProject().getBasedir().getAbsolutePath() + "/";
+        final String dir = getDir(mojo);
         final String[] expected = { "^Files with unapproved licenses:\\s+\\Q" + dir + "src.txt\\E\\s+", "Notes: 0",
                 "Binaries: 0", "Archives: 0", "Standards: 2$", "Apache Licensed: 1$", "Generated Documents: 0",
                 "^1 Unknown Licenses", " AL +\\Q" + dir + "pom.xml\\E$", "\\Q!????? " + dir + "src.txt\\E$",
@@ -142,7 +144,7 @@ public void testIt2() throws Exception {
     public void testIt3() throws Exception {
         final RatCheckMojo mojo = (RatCheckMojo) newRatMojo("it3", "check", true);
         final File ratTxtFile = getRatTxtFile(mojo);
-        final String dir = mojo.getProject().getBasedir().getAbsolutePath() + "/";
+        final String dir = getDir(mojo);
         final String[] expected = { "^Files with unapproved licenses:\\s+\\Q" + dir + "src.apt\\E\\s+", "Notes: 0",
                 "Binaries: 0", "Archives: 0", "Standards: 2$", "Apache Licensed: 1$", "Generated Documents: 0",
                 "^1 Unknown Licenses", " AL +\\Q" + dir + "pom.xml\\E$", "\\Q!????? " + dir + "src.apt\\E$",

From 8c4b23d9b185f4d4d50b8dbf66b54ff6d1fa47a5 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 1 Nov 2023 22:30:57 +0100
Subject: [PATCH 149/299] LHF: RAT-321: fix typo

---
 .../main/java/org/apache/rat/configuration/LicenseReader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index e9819b8df..0fd6eb5f0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -53,7 +53,7 @@ public interface LicenseReader {
      * Reads the configuration and extracts the list of approved licenses.
      * 
      * @return The list of approved licenses specified in the configuration or an
-     * empty list if non specified..
+     * empty list if non specified.
      */
     SortedSet<String> approvedLicenseId();
 }

From d320f157b7ebd8aef0af828ec6b9b000b04c1c83 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 1 Nov 2023 22:33:12 +0100
Subject: [PATCH 150/299] RAT-321: Remove old manual exclusion as we are past
 RAT 0.14

---
 apache-rat-core/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 3e3fd1379..079e11943 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -65,8 +65,6 @@
               <exclude>src/test/resources/binaries/Image-png.not</exclude>
               <!-- These files have a valid license header that was not recognised by older rat versions -->
               <exclude>src/test/resources/elements/TextHttps.txt</exclude>
-              <!-- Remove after using RAT 0.14 for dog-fooding older versions do not ignore JSON -->
-              <exclude>src/test/resources/elements/plain.json</exclude>
             </excludes>
           </configuration>
         </plugin>

From 5a858f6e5ed84ff65c21e63de1f671f9c0f06b48 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 1 Nov 2023 23:34:29 +0100
Subject: [PATCH 151/299] RAT-314: Add note about redundant exclusion once 0.16
 is used in RAT

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index b92f41488..c2d73b0dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,6 +359,7 @@ agnostic home for software distribution comprehension and audit tools.
               <exclude>apache-rat-plugin/src/test/resources/**</exclude>
               <exclude>apache-rat-plugin/src/it/**</exclude>
               <exclude>apache-rat-tasks/src/test/resources/**</exclude>
+              <!-- RAT-314: Can be removed after 0.16 is used for scanning -->
               <exclude>**/.mvn/**</exclude>
               <exclude>**/iso-8859-1.html</exclude>
               <exclude>**/velocity.log</exclude>

From 51448c9908408f25c1ad8032197c83506d20574e Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Thu, 2 Nov 2023 19:29:54 +0100
Subject: [PATCH 152/299] Fix for IOSupplier issue includes javadoc updates

---
 .../org/apache/rat/ReportConfiguration.java   | 131 +++++++++++++++---
 .../apache/rat/ReportConfigurationTest.java   |  52 ++++---
 2 files changed, 147 insertions(+), 36 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index f2cff91c0..667cabddf 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -26,6 +26,9 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,7 +51,7 @@
  * {@link Reporter}. The sole purpose of the front ends is to create the
  * configuration and invoke the {@link Reporter}.
  */
-public class ReportConfiguration {    
+public class ReportConfiguration {
     private SortedSet<ILicenseFamily> families = LicenseFamilySetFactory.emptyLicenseFamilySet();
     private SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
     private SortedSet<String> approvedLicenseCategories = new TreeSet<>();
@@ -91,13 +94,16 @@ public void setReportable(IReportable reportable) {
     }
 
     /**
-     * @return the XSLT style sheet to style the report with.
+     * @return the Supplier of the InputStream that is the XSLT style sheet to style the report with.
      */
     public IOSupplier<InputStream> getStyleSheet() {
         return styleSheet;
     }
 
     /**
+     * Sets the style sheet for custom processing.
+     * The IOSupplier may be called multiple times, so the input stream must be 
+     * able to be opened and closed multiple times.
      * @param styleSheet the XSLT style sheet to style the report with.
      */
     public void setStyleSheet(IOSupplier<InputStream> styleSheet) {
@@ -126,9 +132,38 @@ public void setFrom(Defaults defaults) {
      */
     public void setStyleSheet(File styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
-        setStyleSheet(() -> styleSheet.toURI().toURL().openStream());
+        setStyleSheet(styleSheet.toURI());
     }
 
+    /**
+     * Sets the style sheet for custom processing.
+     * The stylesheet may be opened multiple times so the URI must be capable of being opened
+     * multiple times.
+     * @param styleSheet the URI of the XSLT style sheet to style the report with.
+     * @throws MalformedURLException 
+     * @throws IOException
+     */
+    public void setStyleSheet(URI styleSheet) {
+        Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
+        try {
+            setStyleSheet(styleSheet.toURL());
+        } catch (MalformedURLException e) {
+            throw new ConfigurationException( "Unable to process stylesheet", e);
+        }
+    }
+
+    /**
+     * Sets the style sheet for custom processing.
+     * The stylesheet may be opened multiple times so the URL must be capable of being opened
+     * multiple times.
+     * @param styleSheet the URL of the XSLT style sheet to style the report with.
+     * @throws IOException
+     */
+    public void setStyleSheet(URL styleSheet) {
+        Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
+        setStyleSheet(() -> styleSheet.openStream());
+    }
+    
     /**
      * @return {@code true} if the XML report should be styled.
      */
@@ -144,22 +179,29 @@ public void setStyleReport(boolean styleReport) {
     }
 
     /**
+     * Sets the supplier for the output stream. The supplier may be called multiple
+     * times to provide the stream. Suppliers should prepare streams that are
+     * appended to and that can be closed. If an {@code OutputStream} should not be
+     * closed consider wrapping it in a {@code NoCloseOutputStream}
+     * 
      * @param out The OutputStream supplier that provides the output stream to write
      * the report to. (may be null)
+     * @see NoCloseOutputStream
      */
     public void setOut(IOSupplier<OutputStream> out) {
         this.out = out;
     }
 
     /**
-     * Sets the OutputStream supplier to use the specified file.
+     * Sets the OutputStream supplier to use the specified file. The file may be
+     * opened and closed several times. File is opened in append mode.
      * 
      * @see #setOut(IOSupplier)
      * @param file The file to create the supplier with.
      */
     public void setOut(File file) {
         Objects.requireNonNull(file, "output file should not be null");
-        setOut(() -> new FileOutputStream(file));
+        setOut(() -> new FileOutputStream(file, true));
     }
 
     /**
@@ -169,7 +211,7 @@ public void setOut(File file) {
      * @return The supplier of the output stream to write the report to.
      */
     public IOSupplier<OutputStream> getOutput() {
-        return out == null ? () -> System.out : out;
+        return out == null ? () -> new NoCloseOutputStream(System.out) : out;
     }
 
     /**
@@ -192,7 +234,7 @@ public void addLicense(ILicense license) {
             this.families.add(license.getLicenseFamily());
         }
     }
-    
+
     /**
      * Adds a license to the list of licenses. Does not add the license to the list
      * of approved licenses.
@@ -218,10 +260,10 @@ public void addLicenses(Collection<ILicense> licenses) {
         this.licenses.addAll(licenses);
         licenses.stream().map(ILicense::getLicenseFamily).forEach(families::add);
     }
-    
+
     /**
-     * Adds a license family to the list of families. Does not add the family to the list
-     * of approved licenses.
+     * Adds a license family to the list of families. Does not add the family to the
+     * list of approved licenses.
      * 
      * @param family The license family to add to the list of license families.
      */
@@ -232,31 +274,32 @@ public void addFamily(ILicenseFamily family) {
     }
 
     /**
-     * Adds a license family to the list of families. Does not add the family to the list
-     * of approved licenses.
+     * Adds a license family to the list of families. Does not add the family to the
+     * list of approved licenses.
      * 
-     * @param builder The licenseFamily.Builder to build and add to the list of licenses.
+     * @param builder The licenseFamily.Builder to build and add to the list of
+     * licenses.
      */
     public void addFamily(ILicenseFamily.Builder builder) {
         if (builder != null) {
             this.families.add(builder.build());
         }
     }
-    
+
     /**
-     * Adds multiple families to the list of license families. Does not add the licenses to
-     * the list of approved licenses.
+     * Adds multiple families to the list of license families. Does not add the
+     * licenses to the list of approved licenses.
      *
      * @param license The licensefamily to add.
      */
     public void addFamilies(Collection<ILicenseFamily> families) {
         this.families.addAll(families);
     }
-    
+
     public SortedSet<ILicenseFamily> getFamilies() {
         return Collections.unmodifiableSortedSet(families);
     }
-    
+
     /**
      * Adds an ILicenseFamily to the list of approved licenses.
      *
@@ -442,4 +485,56 @@ public void validate(Consumer<String> logger) {
             throw new ConfigurationException("Stylesheet must be specified if report styling is selected");
         }
     }
+
+    /**
+     * A wrapper around an output stream that does not close the output stream.
+     */
+    public static class NoCloseOutputStream extends OutputStream {
+        private OutputStream delegate;
+
+        public NoCloseOutputStream(OutputStream delegate) {
+            super();
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void write(int arg0) throws IOException {
+            delegate.write(arg0);
+        }
+
+        @Override
+        public void close() throws IOException {
+            this.delegate.flush();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return delegate.equals(obj);
+        }
+
+        @Override
+        public void flush() throws IOException {
+            delegate.flush();
+        }
+
+        @Override
+        public int hashCode() {
+            return delegate.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return delegate.toString();
+        }
+
+        @Override
+        public void write(byte[] arg0, int arg1, int arg2) throws IOException {
+            delegate.write(arg0, arg1, arg2);
+        }
+
+        @Override
+        public void write(byte[] b) throws IOException {
+            delegate.write(b);
+        }
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 3699f8939..9a2524535 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -43,6 +44,7 @@
 import java.util.SortedSet;
 
 import org.apache.commons.io.function.IOSupplier;
+import org.apache.rat.ReportConfiguration.NoCloseOutputStream;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.configuration.ConfigurationReaderTest;
 import org.apache.rat.license.ILicense;
@@ -233,8 +235,7 @@ public void licensesTest() {
 
     @Test
     public void outputTest() throws IOException {
-        // defaults to system.out
-        assertEquals(System.out, underTest.getOutput().get());
+        assertTrue(underTest.getOutput().get() instanceof NoCloseOutputStream);
         assertNotNull(underTest.getWriter());
 
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -312,22 +313,6 @@ public void testFlags() {
 
     @Test
     public void testValidate() {
-
-//        public void validate(Consumer<String> logger) {
-//            if (reportable == null) {
-//                throw new ConfigurationException("Reportable may not be null");
-//            }
-//            if (licenses.size() == 0) {
-//                throw new ConfigurationException("You must specify at least one license");
-//            }
-//            if (styleSheet != null && !isStyleReport()) {
-//                logger.accept("Ignoring stylesheet because styling is not selected");
-//            }
-//            if (styleSheet == null && isStyleReport()) {
-//                throw new ConfigurationException("Stylesheet must be specified if report styling is selected");
-//            }
-//        }
-
         final StringBuilder sb = new StringBuilder();
         try {
             underTest.validate(s -> sb.append(s));
@@ -366,6 +351,22 @@ public void testValidate() {
         assertEquals(0, sb2.length());
     }
     
+    @Test
+    public void testSetOut() throws IOException {
+        ReportConfiguration config = new ReportConfiguration();
+        OutputStreamIntercepter osi = new OutputStreamIntercepter();
+        config.setOut(() -> osi);
+        assertEquals( 0, osi.closeCount);
+        try (OutputStream os = config.getOutput().get()) {
+            assertEquals( 0, osi.closeCount);
+        }
+        assertEquals( 1, osi.closeCount);
+        try (OutputStream os = config.getOutput().get()) {
+            assertEquals( 1, osi.closeCount);
+        }
+        assertEquals( 2, osi.closeCount);
+    }
+    
     /**
      * Validates that the configuration contains the default approved licenses.
      * @param config The configuration to test.
@@ -431,4 +432,19 @@ public static void validateDefault(ReportConfiguration config) {
         validateDefaultLicenseFamilies(config);
         validateDefaultLicenses(config);
     }
+    
+    static class OutputStreamIntercepter extends OutputStream {
+        
+        int closeCount = 0;
+
+        @Override
+        public void write(int arg0) throws IOException {
+            throw new UnsupportedOperationException();
+        }
+        
+        @Override
+        public void close() {
+            ++closeCount;
+        }
+    }
 }

From ffbc44c217d7310ee2b41e32ff63521fa41db2f2 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Fri, 3 Nov 2023 09:21:28 +0100
Subject: [PATCH 153/299] Added md processing

---
 .gitignore                                    |  1 +
 .../annotation/AbstractLicenseAppender.java   |  6 +++--
 .../rat/annotation/TestLicenseAppender.java   | 24 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25e619a33..6d7b8e738 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 */.idea
 /target/
 **/.gitignore
+**/lib/
diff --git a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
index 17d6cd385..a7a057b4b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
@@ -68,7 +68,8 @@ public abstract class AbstractLicenseAppender {
     private static final int TYPE_JSP = 24;
     private static final int TYPE_FML = 25;
     private static final int TYPE_GO = 26;
-    private static final int TYPE_PM = 27;    
+    private static final int TYPE_PM = 27;
+    private static final int TYPE_MD = 28;
 
     /**
      * the line separator for this OS
@@ -81,7 +82,7 @@ public abstract class AbstractLicenseAppender {
             TYPE_BEANSHELL, TYPE_GO,
     };
     private static final int[] FAMILY_SGML = new int[]{
-            TYPE_XML, TYPE_HTML, TYPE_JSP, TYPE_FML,
+            TYPE_XML, TYPE_HTML, TYPE_JSP, TYPE_FML, TYPE_MD,
     };
     private static final int[] FAMILY_SH = new int[]{
             TYPE_PROPERTIES, TYPE_PYTHON, TYPE_SH, TYPE_RUBY, TYPE_PERL,
@@ -160,6 +161,7 @@ public abstract class AbstractLicenseAppender {
         EXT2TYPE.put("java", TYPE_JAVA);
         EXT2TYPE.put("js", TYPE_JAVASCRIPT);
         EXT2TYPE.put("jsp", TYPE_JSP);
+        EXT2TYPE.put("md", TYPE_MD);
         EXT2TYPE.put("ndoc", TYPE_XML);
         EXT2TYPE.put("nunit", TYPE_XML);
         EXT2TYPE.put("php", TYPE_PHP);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
index 71e09d965..c69cb6103 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
@@ -735,4 +735,28 @@ public void readFile(BufferedReader r) throws IOException {
                     }
                 });
     }
+    
+    @Test
+    public void addLicenseMarkdown() throws IOException {
+        String filename = "tmp.md";
+
+        commonTestTemplate(filename, new FileCreator() {
+                    public void createFile(Writer writer)
+                            throws IOException {
+                        writer.write("## This is the first header\n");
+                        writer.write(" * this is a list entry\n");
+                        writer.write(" * this is another list entry\n");
+                        writer.write(" <!-- this is a comment line -->");
+                        writer.write("## This is the second header\n");
+                    }
+                },
+                new NewFileReader() {
+                    public void readFile(BufferedReader r) throws IOException {
+                        String line = r.readLine();
+                        assertEquals("First line is incorrect",
+                                "<!--", line);
+                        line = r.readLine();
+                    }
+                });
+    }
 }

From fe3c1f7404150895bdb9de4296f5e65b26736726 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 3 Nov 2023 09:25:35 +0100
Subject: [PATCH 154/299] RAT-328: Ensure that System.out does not get closed
 during report generation and updated javadocs.

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index becfd5d34..2da889896 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-328" type="fix" dev="pottlinger" due-to="Claude Warren">
+         Ensure that System.out does not get closed during report generation and updated javadocs.
+      </action>
       <action issue="RAT-316" type="add" dev="pottlinger">
          Add default exclusion of MANIFEST.MF as it must not contain comment lines to include a license.
       </action>

From 4b5cff5ecc548558217aecd9e92062f74d8826af Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Fri, 3 Nov 2023 12:38:24 +0100
Subject: [PATCH 155/299] added YAML processing

---
 .../org/apache/rat/annotation/AbstractLicenseAppender.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
index a7a057b4b..3950c4579 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
@@ -70,6 +70,9 @@ public abstract class AbstractLicenseAppender {
     private static final int TYPE_GO = 26;
     private static final int TYPE_PM = 27;
     private static final int TYPE_MD = 28;
+    private static final int TYPE_YAML = 29;
+    
+    
 
     /**
      * the line separator for this OS
@@ -86,7 +89,7 @@ public abstract class AbstractLicenseAppender {
     };
     private static final int[] FAMILY_SH = new int[]{
             TYPE_PROPERTIES, TYPE_PYTHON, TYPE_SH, TYPE_RUBY, TYPE_PERL,
-            TYPE_TCL, TYPE_VISUAL_STUDIO_SOLUTION, TYPE_PM,
+            TYPE_TCL, TYPE_VISUAL_STUDIO_SOLUTION, TYPE_PM, TYPE_YAML,
     };
     private static final int[] FAMILY_BAT = new int[]{
             TYPE_BAT,
@@ -188,6 +191,8 @@ public abstract class AbstractLicenseAppender {
         EXT2TYPE.put("xml", TYPE_XML);
         EXT2TYPE.put("xproj", TYPE_XML);
         EXT2TYPE.put("xsl", TYPE_XML);
+        EXT2TYPE.put("yaml", TYPE_YAML);
+        EXT2TYPE.put("yml", TYPE_YAML);
     }
 
     private boolean isForced;

From c6c81e72097ba81a79f2cd7161f4486dce45570f Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sat, 4 Nov 2023 21:24:21 +0100
Subject: [PATCH 156/299] RAT-320: Fix typos in Report.java

---
 apache-rat-core/src/main/java/org/apache/rat/Report.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 430818f22..30418ab6b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -338,12 +338,12 @@ private Report() {
     }
 
     /**
-     * Creates an IReporatble object from the directory name and ReportConfiguration
+     * Creates an IReportable object from the directory name and ReportConfiguration
      * object.
      * 
      * @param baseDirectory the directory that contains the files to report on.
      * @param config the ReportConfiguration.
-     * @return the IReportale instance containing the files.
+     * @return the IReportable instance containing the files.
      */
     private static IReportable getDirectory(String baseDirectory, ReportConfiguration config) {
         try (PrintStream out = new PrintStream(config.getOutput().get())) {

From 4312203760bcaf1c4765fd61ff752d6db464c246 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 5 Nov 2023 14:15:25 +0100
Subject: [PATCH 157/299] RAT-329: Add markdown and yaml as a recognized
 extension for processing

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2da889896..03f7daa30 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-329" type="add" dev="pottlinger" due-to="Claude Warren">
+         Add markdown (MD) and yaml (YML/YAML) as a recognized extension for file and license processing.
+      </action>
       <action issue="RAT-328" type="fix" dev="pottlinger" due-to="Claude Warren">
          Ensure that System.out does not get closed during report generation and updated javadocs.
       </action>

From 243dcf4f0b06cb5541f4d2ed6117f267d82605db Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 10 Nov 2023 22:35:23 +0100
Subject: [PATCH 158/299] RAT-326: Fix javadoc errors

---
 .../src/main/java/org/apache/rat/configuration/Format.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index a6df9262b..95f9d89e2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -28,7 +28,7 @@
 import org.apache.rat.ConfigurationException;
 
 /**
- * An enumeration of the types of files that can contain the configurtion
+ * An enumeration of the types of files that can contain the configuration
  * information.
  */
 public enum Format {
@@ -101,7 +101,7 @@ public static Format fromName(String name) {
 
    /**
     * Determine the {@code Format} from a URL.
-    * @param name the URL to check.
+    * @param url the URL to check.
     * @return the Format
     */
    public static Format fromURL(URL url) {
@@ -110,7 +110,7 @@ public static Format fromURL(URL url) {
 
    /**
     * Determine the {@code Format} from a File.
-    * @param name the File to check.
+    * @param file the File to check.
     * @return the Format
     */
    public static Format fromFile(File file) throws MalformedURLException {

From 50cd1d39d93ea87682fe234caea80114a81c5069 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 10 Nov 2023 22:43:11 +0100
Subject: [PATCH 159/299] RAT-326: Fix javadoc errors and minor typos

---
 .../apache/rat/analysis/IHeaderMatcher.java   |  3 +--
 .../analysis/matchers/SPDXMatcherFactory.java | 20 ++++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 727426b89..64906580d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -30,12 +30,11 @@
 /**
  * Performs explicit checks against a line from the header of a file.
  * For implementations that need to check multiple lines the implementation must cache the earlier lines.
- * 
  */
 public interface IHeaderMatcher {
     /**
      * The state of the matcher.
-     * </ul>
+     * <ul>
      * <li>{@code t} - The matcher has located a match.</li>
      * <li>{@code f} - The matcher has determined that it will not match the
      * document.</li>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index 4afaf6305..8ba5fadc2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -36,13 +36,13 @@
  * SPDX identifiers are specified by the Software Package Data Exchange(R) also
  * known as SPDX(R) project from the Linux foundation.
  * </p>
- * 
- * @see https://spdx.dev/ids/
+ *
+ * @see <a href="https://spdx.dev/ids/">List of Ids at spdx.dev</a>
  */
 public class SPDXMatcherFactory {
 
     /**
-     * The collectoin of all matchers produced by this factory.
+     * The collection of all matchers produced by this factory.
      */
     private static final Map<String, SPDXMatcherFactory.Match> matchers = new HashMap<>();
 
@@ -52,7 +52,7 @@ public class SPDXMatcherFactory {
     public static final SPDXMatcherFactory INSTANCE = new SPDXMatcherFactory();
 
     /**
-     * The regular expression to locate the SPDX license identifer in the text stream
+     * The regular expression to locate the SPDX license identifier in the text stream
      */
     private static Pattern groupSelector = Pattern.compile(".*SPDX-License-Identifier:\\s([A-Za-z0-9\\.\\-]+)");
 
@@ -72,7 +72,7 @@ private SPDXMatcherFactory() {
     /**
      * Creates the spdx matcher.
      * @param spdxId the spdx name to match.
-     * @return and spdx matcher.
+     * @return a spdx matcher.
      */
     public IHeaderMatcher create(String spdxId) {
         if (StringUtils.isBlank(spdxId)) {
@@ -93,7 +93,7 @@ public IHeaderMatcher create(String spdxId) {
      * @return true if the caller matches the text.
      */
     private boolean check(String line, Match caller) {
-        // if the line is has not been seen yet see if we can extract the SPDX id from the line.
+        // if the line has not been seen yet see if we can extract the SPDX id from the line.
         // if so then see if that name has been registered.  If so then we have a match and set 
         // lastMatch.
         if (lastLine == null || !lastLine.equals(line)) {
@@ -116,9 +116,6 @@ public class Match extends AbstractSimpleMatcher {
          * 
          * @param spdxId A regular expression that matches the @{short-name} of the SPDX
          * Identifier.
-         * @param licenseFamilyCategory the RAT license family category for the license.
-         * @param licenseFamilyName the RAT license family name for the license.
-         * @param notes The notes for this matcher.
          */
         Match(final String spdxId) {
             super("SPDX:" + spdxId);
@@ -130,10 +127,5 @@ public class Match extends AbstractSimpleMatcher {
         protected boolean doMatch(String line) {
             return SPDXMatcherFactory.this.check(line, this);
         }
-
-        @Override
-        public String toString() {
-            return getId();
-        }
     }
 }

From 83e6aafadfec0e630e82f63365a4035c1118d57a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 10 Nov 2023 22:52:12 +0100
Subject: [PATCH 160/299] RAT-326: Fix javadoc errors and minor typos

---
 .../org/apache/rat/ReportConfiguration.java   | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 667cabddf..c23df663c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -128,7 +128,6 @@ public void setFrom(Defaults defaults) {
     /**
      * 
      * @param styleSheet the XSLT style sheet to style the report with.
-     * @throws IOException
      */
     public void setStyleSheet(File styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
@@ -140,8 +139,6 @@ public void setStyleSheet(File styleSheet) {
      * The stylesheet may be opened multiple times so the URI must be capable of being opened
      * multiple times.
      * @param styleSheet the URI of the XSLT style sheet to style the report with.
-     * @throws MalformedURLException 
-     * @throws IOException
      */
     public void setStyleSheet(URI styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
@@ -157,7 +154,6 @@ public void setStyleSheet(URI styleSheet) {
      * The stylesheet may be opened multiple times so the URL must be capable of being opened
      * multiple times.
      * @param styleSheet the URL of the XSLT style sheet to style the report with.
-     * @throws IOException
      */
     public void setStyleSheet(URL styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
@@ -172,7 +168,7 @@ public boolean isStyleReport() {
     }
 
     /**
-     * @param styleReport specifies whether or not the XML report should be styled.
+     * @param styleReport specifies whether the XML report should be styled.
      */
     public void setStyleReport(boolean styleReport) {
         this.styleReport = styleReport;
@@ -254,7 +250,7 @@ public ILicense addLicense(ILicense.Builder builder) {
      * Adds multiple licenses to the list of licenses. Does not add the licenses to
      * the list of approved licenses.
      *
-     * @param license The license to add.
+     * @param licenses The licenses to add.
      */
     public void addLicenses(Collection<ILicense> licenses) {
         this.licenses.addAll(licenses);
@@ -290,7 +286,7 @@ public void addFamily(ILicenseFamily.Builder builder) {
      * Adds multiple families to the list of license families. Does not add the
      * licenses to the list of approved licenses.
      *
-     * @param license The licensefamily to add.
+     * @param families The license families to add.
      */
     public void addFamilies(Collection<ILicenseFamily> families) {
         this.families.addAll(families);
@@ -303,7 +299,7 @@ public SortedSet<ILicenseFamily> getFamilies() {
     /**
      * Adds an ILicenseFamily to the list of approved licenses.
      *
-     * @param approvedILicenseFamily the LicenseFamily to add..
+     * @param approvedILicenseFamily the LicenseFamily to add.
      */
     public void addApprovedLicenseCategory(ILicenseFamily approvedILicenseFamily) {
         approvedLicenseCategories.add(approvedILicenseFamily.getFamilyCategory());
@@ -322,7 +318,7 @@ public void addApprovedLicenseCategory(String familyCategory) {
      * Adds a collection of license family categories to the set of approved license
      * names.
      *
-     * @param approvedLicenseCategories set of approved license categories..
+     * @param approvedLicenseCategories set of approved license categories.
      */
     public void addApprovedLicenseCategories(Collection<String> approvedLicenseCategories) {
         approvedLicenseCategories.stream().forEach(this::addApprovedLicenseCategory);
@@ -330,7 +326,7 @@ public void addApprovedLicenseCategories(Collection<String> approvedLicenseCateg
 
     /**
      * Adds a license family category to the list of approved licenses. <em>Once a
-     * license has been removed from the approved list it can not be re-added</em>
+     * license has been removed from the approved list it cannot be re-added</em>
      * 
      * @param familyCategory the category to add.
      */
@@ -340,7 +336,7 @@ public void removeApprovedLicenseCategory(String familyCategory) {
 
     /**
      * Removes a license family category from the list of approved licenses.
-     * <em>Once a license has been removed from the approved list it can not be
+     * <em>Once a license has been removed from the approved list it cannot be
      * re-added</em>
      * 
      * @param familyCategory the family category to remove.
@@ -351,7 +347,7 @@ public void removeApprovedLicenseCategories(Collection<String> familyCategory) {
 
     /**
      * Gets the SortedSet of approved license categories. <em>Once a license has
-     * been removed from the approved list it can not be re-added</em>
+     * been removed from the approved list it cannot be re-added</em>
      * 
      * @return the Sorted set of approved license categories.
      */
@@ -377,7 +373,7 @@ public String getCopyrightMessage() {
      * This value is ignored, if no license headers are added.
      *
      * @param copyrightMessage message to set.
-     * @see #setAddingLicenses(boolean)
+     * @see #isAddingLicenses()
      */
     public void setCopyrightMessage(String copyrightMessage) {
         this.copyrightMessage = copyrightMessage;
@@ -403,12 +399,12 @@ public boolean isAddingLicenses() {
     }
 
     /**
-     * Sets whether RAT should enable, disable, or force the adidng of license
+     * Sets whether RAT should enable, disable, or force the adding of license
      * headers.
      * 
      * @param addLicenseHeaders enables/disables or forces adding of licenses
      * headers.
-     * @see #setAddingLicensesForced(boolean)
+     * @see #isAddingLicenses()
      * @see #setCopyrightMessage(String)
      */
     public void setAddLicenseHeaders(AddLicenseHeaders addLicenseHeaders) {
@@ -469,13 +465,13 @@ public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
     /**
      * Validates that the configuration is valid.
      * 
-     * @param a String consumer to log warning messages to.
+     * @param logger String consumer to log warning messages to.
      */
     public void validate(Consumer<String> logger) {
         if (reportable == null) {
             throw new ConfigurationException("Reportable may not be null");
         }
-        if (licenses.size() == 0) {
+        if (licenses.isEmpty()) {
             throw new ConfigurationException("You must specify at least one license");
         }
         if (styleSheet != null && !isStyleReport()) {

From 8eca241fc25ca407d8ead76bd5f9951762b0cf2b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 10 Nov 2023 22:55:46 +0100
Subject: [PATCH 161/299] RAT-326: Fix javadoc errors and minor typos

---
 .../configuration/XMLConfigurationReader.java | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 3143732aa..b73dc4e67 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -57,27 +57,27 @@
 /**
  * A class that reads the XML configuration file format.
  * <p>
- * {@code <rat-config>}<br/>
- * {@code   <licenses>}<br/>
- * {@code     <license id=id name=name >}<br/>
- * {@code       <notes></notes>}<br/>
- * {@code       <text>  </text>}<br/>
- * {@code       <copyright start='' end='' owner=''/>}<br/>
- * {@code       <spdx></spdx> }<br/>
- * {@code       <and> <matcher/>...</and>}<br/>
- * {@code       <or> <matcher/>...</or> }<br/>
- * {@code       <matcher_ref refid='' />}<br/>
- * {@code       <not><matcher /></not>}<br/>
- * {@code     </license>}<br/>
- * {@code   </licenses>}<br/>
- * {@code   <approved>}<br/>
- * {@code     <family refid=''>}<br/>
- * {@code   </approved>}<br/>
- * {@code   <matchers>}<br/>
- * {@code     <matcher className=''/>}<br/>
- * {@code     <matcher className=''/>}<br/>
- * {@code   </matchers>}<br/>
- * {@code </rat-config>}<br/>
+ * {@code <rat-config>}<br>
+ * {@code   <licenses>}<br>
+ * {@code     <license id=id name=name >}<br>
+ * {@code       <notes></notes>}<br>
+ * {@code       <text>  </text>}<br>
+ * {@code       <copyright start='' end='' owner=''/>}<br>
+ * {@code       <spdx></spdx> }<br>
+ * {@code       <and> <matcher/>...</and>}<br>
+ * {@code       <or> <matcher/>...</or> }<br>
+ * {@code       <matcher_ref refid='' />}<br>
+ * {@code       <not><matcher /></not>}<br>
+ * {@code     </license>}<br>
+ * {@code   </licenses>}<br>
+ * {@code   <approved>}<br>
+ * {@code     <family refid=''>}<br>
+ * {@code   </approved>}<br>
+ * {@code   <matchers>}<br>
+ * {@code     <matcher className=''/>}<br>
+ * {@code     <matcher className=''/>}<br>
+ * {@code   </matchers>}<br>
+ * {@code </rat-config>}<br>
  * </p>
  */
 
@@ -112,7 +112,7 @@ public class XMLConfigurationReader implements LicenseReader, MatcherReader {
     private final SortedSet<String> approvedFamilies;
 
     /**
-     * Constructs the XML configuration read.
+     * Constructs the XML configuration reader.
      */
     public XMLConfigurationReader() {
         try {
@@ -295,7 +295,7 @@ private ILicense parseLicense(Node licenseNode) {
     public SortedSet<ILicense> readLicenses() {
         readFamilies();
         readMatcherBuilders();
-        if (licenses.size() == 0) {
+        if (licenses.isEmpty()) {
             nodeListConsumer(document.getElementsByTagName(LICENSE), x -> licenses.add(parseLicense(x)));
             document = null;
         }

From 8519fdbe41540ec2847da0b823a56bbb1eb2662c Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 10 Nov 2023 23:00:08 +0100
Subject: [PATCH 162/299] RAT-326: Fix javadoc errors and minor typos

---
 .../src/main/java/org/apache/rat/anttasks/Report.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 0d22147c1..6734c6fd6 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -111,13 +111,17 @@ public void addFamily(Family family) {
     /**
      * 
      * @param styleSheet
-     * @deprecated us {@link #addStyleSheet(File)}
+     * @deprecated use {@link #addStyleSheet(Resource)}
      */
     @Deprecated
     public void addStylesheet(Resource styleSheet) {
         addStyleSheet(styleSheet);
     }
 
+    /**
+     * Adds a given style sheet to the report.
+     * @param styleSheet style sheet to use in this report.
+     */
     public void addStyleSheet(Resource styleSheet) {
         configuration.setStyleSheet(() -> styleSheet.getInputStream());
         configuration.setStyleReport(true);

From ffc9027d50b9aae90f7d4c85622c2c15e8d74e9b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 12 Nov 2023 20:51:33 +0100
Subject: [PATCH 163/299] RAT-326: Fix javadoc warnings

---
 .../rat/api/domain/RatLicenseFamily.java      | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
index 8f1f22307..81f5d3d1f 100644
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
+++ b/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
@@ -25,47 +25,81 @@
  */
 public enum RatLicenseFamily {
 
+	/**
+	 * Apache License Version 2.0
+	 */
 	APACHE(
 			"Apache License Version 2.0",
 			"AL   ",
 			"Note that APACHE requires a NOTICE. All modifications require notes. See http://www.apache.org/licenses/LICENSE-2.0."),
+	/**
+	 * GNU General Public License, version 1
+	 */
 	GPL1(
 			"GNU General Public License, version 1",
 			"GPL1 ",
 			"Note that GPL1 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-1.0.html."),
+	/**
+	 * GNU General Public License, version 2
+	 */
 	GPL2(
 			"GNU General Public License, version 2",
 			"GPL2 ",
 			"Note that GPL2 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-2.0.html."),
+	/**
+	 * GNU General Public License, version 3
+	 */
 	GPL3(
 			"GNU General Public License, version 3",
 			"GPL3 ",
 			"Note that GPL3 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-3.0.html."),
+	/**
+	 * The MIT License
+	 */
 	MIT(
 			"The MIT License",
 			"MIT  ",
 			"Note that MIT requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/MIT."),
+
+	/**
+	 * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
+	 */
 	CDDL1(
 			"COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0",
 			"CDDL1",
 			"Note that CDDL1 requires a NOTICE. All modifications require notes. See https://oss.oracle.com/licenses/CDDL."),
+	/**
+	 * OASIS Open License
+	 */
 	OASIS(
 			"OASIS Open License",
 			"OASIS",
 			"Note that OASIS requires a NOTICE. All modifications require notes. See https://www.oasis-open.org/policies-guidelines/ipr."),
+	/**
+	 * Modified BSD License
+	 */
 	TMF854(
 			"Modified BSD License",
 			"TMF  ",
 			"Note that TMF854 requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/BSD-3-Clause."),
-	 DOJO(
+	/**
+	 * Modified BSD License
+ 	 */
+	DOJO(
 			"Modified BSD License",
 			"DOJO ",
 			"Note that DOJO requires a NOTICE. All modifications require notes. See http://dojotoolkit.org/community/licensing.shtml."),
-    W3C(
+	/**
+	 * W3C Software Copyright
+	 */
+	W3C(
             "W3C Software Copyright",
             "W3C  ",
             "Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231."),
 
+	/**
+	 * W3C Document Copyright
+	 */
     W3C_DOCUMENTATION(
             "W3C Document Copyright",
             "W3CD ",

From d5b1e5c48f4ce35f0bceb83749ee33f7c65c865f Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 12 Nov 2023 20:52:11 +0100
Subject: [PATCH 164/299] RAT-326: Fix javadoc warnings

---
 .../main/java/org/apache/rat/api/domain/RatLicenseFamily.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
index 81f5d3d1f..b1afb1abf 100644
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
+++ b/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
@@ -96,7 +96,6 @@ public enum RatLicenseFamily {
             "W3C Software Copyright",
             "W3C  ",
             "Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231."),
-
 	/**
 	 * W3C Document Copyright
 	 */

From d954744d6a87ff76cf9a99f2309d8d5bcd712ab2 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 12 Nov 2023 22:01:27 +0100
Subject: [PATCH 165/299] RAT-326: Fix javadoc warnings

---
 .../configuration/builders/AbstractBuilder.java  |  3 +++
 .../report/claim/impl/AbstractClaimReporter.java | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
index ba6334ebc..7d546a03a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/AbstractBuilder.java
@@ -28,6 +28,9 @@ public abstract class AbstractBuilder implements IHeaderMatcher.Builder {
 
     private String id;
 
+    /**
+     * Protected empty constructor.
+     */
     protected AbstractBuilder() {
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java b/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
index 8904cfbb6..ee059b649 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
@@ -31,18 +31,34 @@
  * this class.
  */
 public abstract class AbstractClaimReporter extends AbstractReport {
+    /**
+     * Empty default implementation.
+     * @param documentCategoryName name of the category
+     */
     protected void handleDocumentCategoryClaim(String documentCategoryName) {
         // Does nothing
     }
 
+    /**
+     * Empty default implementation.
+     * @param licenseApproved name of the approved license
+     */
     protected void handleApprovedLicenseClaim(String licenseApproved) {
         // Does nothing
     }
 
+    /**
+     * Empty default implementation.
+     * @param licenseFamilyName name of the license family
+     */
     protected void handleLicenseFamilyNameClaim(String licenseFamilyName) {
         // Does Nothing
     }
 
+    /**
+     * Empty default implementation.
+     * @param headerCategory name of the header category
+     */
     protected void handleHeaderCategoryClaim(String headerCategory) {
         // Does nothing
     }

From 22e32eaa9195ebc33d0cbb73cb29cce9fe3fa448 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 12 Nov 2023 22:20:58 +0100
Subject: [PATCH 166/299] RAT-326: Fix javadoc warnings and typos

---
 .../src/main/java/org/apache/rat/Reporter.java         |  8 ++++----
 .../src/main/java/org/apache/rat/api/ContentType.java  |  2 +-
 .../java/org/apache/rat/report/AbstractReport.java     | 10 ++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index 12ca39e49..2be95fb67 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -42,9 +42,9 @@ private Reporter() {
     }
 
     /**
-     * Execut the report.
+     * Execute the report.
      * 
-     * @param configuration The report configuration..
+     * @param configuration The report configuration.
      * @return the currently collected numerical statistics.
      * @throws Exception in case of errors.
      */
@@ -74,8 +74,8 @@ public static ClaimStatistic report(ReportConfiguration configuration) throws Ex
 
     /**
      * Execute the report.
-     * @param coutputWriter the writer to send output to.
-     * @param configuration The report configuration..
+     * @param outputWriter the writer to send output to.
+     * @param configuration The report configuration.
      * @return the currently collected numerical statistics.
      * @throws IOException in case of I/O errors.
      * @throws RatException in case of internal errors.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java b/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
index 84b4ee3b5..d5a2a0ccb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
@@ -32,7 +32,7 @@ public class ContentType {
 
     /**
      * Constructs content types, 
-     * performing an necessary conversions.
+     * performing any necessary conversions.
      * @param mediaType not null
      * @param subType not null
      * @param parameters not null
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java b/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
index 18bfd1fd5..d3d896e90 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/AbstractReport.java
@@ -26,14 +26,24 @@
  * Abstract base class for deriving implementations of {@link RatReport}.
  */
 public abstract class AbstractReport implements RatReport {
+    /**
+     * Empty default implementation.
+     */
     public void startReport() throws RatException {
         // Does nothing
     }
 
+    /**
+     * Empty default implementation.
+     * @param document the actual document
+     */
     public void report(Document document) throws RatException {
         // Does nothing
     }
 
+    /**
+     * Empty default implementation.
+     */
     public void endReport() throws RatException {
         // Does nothing
     }

From 48c4cab53bece3cfbf6d0ee6bc55286b78730f17 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 25 Nov 2023 11:51:38 +0100
Subject: [PATCH 167/299] added architecture.md and javadocs for RatReport

---
 .../java/org/apache/rat/report/RatReport.java | 16 ++++
 src/site/md/architecture.md                   | 80 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 src/site/md/architecture.md

diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java b/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
index d178acf0f..e32357b61 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
@@ -21,11 +21,27 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 
+/**
+ * Interface that defines a RatReport. 
+ * A RatReport examines a document and may report issues or modify the underlying file.
+ */
 public interface RatReport {
 
+    /**
+     * Signals the start of execution for the report.  Will be called before the {@code report()} method
+     * to ensure proper setup.
+     * @throws RatException on error.
+     * @see #report(Document)
+     */
     void startReport() throws RatException;
     
     void report(Document document) throws RatException;
     
+    /**
+     * Signals the end of execution for the report.  Will be called after the {@code report()} method
+     * to ensure proper cleanup.
+     * @throws RatException on error.
+     * @see #report(Document)
+     */
     void endReport() throws RatException;
 }
diff --git a/src/site/md/architecture.md b/src/site/md/architecture.md
new file mode 100644
index 000000000..2fb7b116f
--- /dev/null
+++ b/src/site/md/architecture.md
@@ -0,0 +1,80 @@
+# Overview
+
+The RAT architecture is build around a single engine that parses input files to build an XML based report.  User interfaces (UIs) create and configure a `ReportConfiguration` which is passed to a `Reporter` instance which performs all the processing.
+
+```
+/------\    /------\    /------\
+| CLI  |    |Maven |    | Ant  |
+|  UI  |    |  UI  |    |  UI  |
+\--+---/    \--+---/    \--+---/
+   |           |           |
+   \-----------+-----------/     ReportConfiguration
+               |                   input to Reporter
+          /----+----\
+          | Reporter| <---  Multiple files and directories
+          \----+----/
+               |
+               V
+            Report
+
+```
+
+# Configuration
+
+The `ReportConfiguration` contains all the options for the Reporter class.  User interfaces create a `ReportConfiguration` and pass it to the `Reporter` instance for execution. The configuraiton specifies the configuraiton for:
+
+* License Families -- An identifier for families of licenses that share the same constraints.  The default list is defined in the `o.a.r.default.xml` file in the families section.
+* Licenses -- A the definition of a license that defines the matchers that comprise the test for the license.  The defualt licenses are defined in the  `o.a.r.default.xml` file in the licenses section.
+* Approved License Families -- A list of license families that are approved.  Licenses of families not in this are unapproved.  The defualt approved license families are defined in the  `o.a.r.default.xml` file in the approved section.
+
+## License Families
+
+A license family comprises an ID and a name.  New families may be added to the `o.a.r.default.xml` file or programattically from the UI.  License family IDs must be unique.  Later ID definitions override earlier definitions.
+
+## License
+
+A license definition comprises a family (identified by its ID), and a matcher.  Licenses adopt the ID of their family which may be overridden with an id attribute.  Licenses also adopt the name of their family unless it is overridden by a name attribute.
+
+## Approved Licenses
+
+The approved licenses are enumerated in a list.  Licenses are selected by family and the family ID is specified in the list.
+
+## Matchers
+
+Matchers are classes that implement specific tests.  They are created by builders.  The default builders are specified in the  `o.a.r.default.xml` file in the matchers section.
+
+### Matcher.Builder
+
+New matcher builders may be defined within the `o.a.r.default.xml` file and then used in the license definitions within the file.
+
+Matcher builder class names must be of the form `<name>Builder` where `<name>` becomes the name of the matcher and is used in identifying the matcher to use (e.g. as a tag in the License section of the `o.a.r.default.xml` file).  They must also implement the `o.a.r.analysis.IHeaderMatcher.Builder` interface.
+
+## flags to add licenses and copyrights to files.
+
+The configuration has a set of options to add licenses and optionally copyright notices to files that do not have them.  The `addLicenses` option adds the Apache2 license to files that do not have any license specified.  If the `copyright` text is provided it is also added to the files.  The `addLicensesForced` modifies the way the licenses are added, by default the licenses are added to new files with name of the old file but a `.new` extension added.  If `addLicensesForced` is specified then the files are overwritten.
+
+## file name filter
+
+The file name filter specifies a filter to be used to filter out any files that should not be evaluated.
+
+## out
+
+The `out` parameter specifies an `OutputStream` IOSupplier that is used to create the output stream to write text to.  By default this is the `System.out` stream.
+
+## stylesheet
+
+the `styleSheet` parameter specifies the `InputStream` IOSupplier that is used to read the stylesheet that styles the XML output.
+
+## IReportable
+
+The `IReportable` parameter identifies the objects that the report should run against.  Implementations of `IReportable` generally do things like walk directory  trees, or archives.
+
+# Reporter
+
+The reporter uses the `ReporterConfiguration` to configure the report.  It then begins to read the files.  Each file is a `Document` the reporter determines the Document type and if appropriate reads the header information (50 lines) from the document.
+
+The header information is passed to the licenses.  The processing of the file stops when a license is triggered (found) or the end of the header is reached.
+
+The information retrieved is used to create an XML document that may be styled by the defined Stylesheet.
+
+The reporter utilizes the `RatReport` interface to determine what actions to take with the documents.  Currently the `RatReport` interface is used to define license adding capabilities, report claim aggregation, and multiplexed reports.  Additional capabilities can be implemented by implementing a `RatReport` and inserting it into the processing chain.

From 97f3cef7baddc7638afc6fa63242ed6f1042c59e Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 25 Nov 2023 13:55:03 +0100
Subject: [PATCH 168/299] added license header

---
 src/site/md/architecture.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/site/md/architecture.md b/src/site/md/architecture.md
index 2fb7b116f..987705387 100644
--- a/src/site/md/architecture.md
+++ b/src/site/md/architecture.md
@@ -1,3 +1,20 @@
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 # Overview
 
 The RAT architecture is build around a single engine that parses input files to build an XML based report.  User interfaces (UIs) create and configure a `ReportConfiguration` which is passed to a `Reporter` instance which performs all the processing.

From 45bf247aef8c2a28596841974956da772fb44fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Mon, 20 Nov 2023 17:44:12 +0100
Subject: [PATCH 169/299] RAT-320: add -o/--output option to CLI

---
 .../src/main/java/org/apache/rat/Report.java  |  7 ++++
 .../test/java/org/apache/rat/ReportTest.java  | 36 +++++++++++++++++++
 apache-rat/README-CLI.txt                     | 26 +++++++++-----
 apache-rat/src/site/apt/index.apt.vm          | 21 +++++++----
 4 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 30418ab6b..b87af7456 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -162,6 +162,10 @@ public static final void main(String[] args) throws Exception {
     static ReportConfiguration createConfiguration(String baseDirectory, CommandLine cl) throws IOException {
         final ReportConfiguration configuration = new ReportConfiguration();
 
+        if (cl.hasOption('o')) {
+            configuration.setOut(new File(cl.getOptionValue('o')));
+        }
+
         if (cl.hasOption('a') || cl.hasOption('A')) {
             configuration.setAddLicenseHeaders(cl.hasOption('f') ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
             configuration.setCopyrightMessage(cl.getOptionValue("c"));
@@ -261,6 +265,9 @@ static Options buildOptions() {
         Option help = new Option(HELP, "help", false, "Print help for the RAT command line interface and exit");
         opts.addOption(help);
 
+        Option out = new Option("o", "out", true, "Define the output file where to write report (default is System.out)");
+        opts.addOption(out);
+
         String defaultHandlingText = " By default all approved default licenses are used";
         Option noDefaults = new Option(null, NO_DEFAULTS, false, "Ignore default configuration." + defaultHandlingText);
         opts.addOption(noDefaults);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 3b6da8efb..157bb54f8 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -20,13 +20,20 @@
 
 import static org.junit.Assert.assertNotNull;
 
+import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.List;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class ReportTest {
@@ -45,4 +52,33 @@ public void testDefaultConfiguration() throws ParseException, IOException {
         ReportConfigurationTest.validateDefault(config);
     }
 
+    @Test
+    public void testOutputOption() throws Exception {
+        CommandLine cl = new DefaultParser().parse(Report.buildOptions(), new String[]{ "-o", "target/test" });
+        ReportConfiguration config = Report.createConfiguration("target/test-classes/elements", cl);
+        Reporter.report(config);
+        File output = new File("target/test");
+        Assert.assertTrue(output.exists());
+        String content = FileUtils.readFileToString(output, StandardCharsets.UTF_8);
+        Assert.assertTrue(content.contains("2 Unknown Licenses"));
+        Assert.assertTrue(content.contains("target/test-classes/elements/Source.java"));
+        Assert.assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
+    }
+
+    @Test
+    public void testDefaultOutput() throws Exception {
+        PrintStream origin = System.out;
+        File output = new File("target/sysout");
+        System.setOut(new PrintStream(output));
+        CommandLine cl = new DefaultParser().parse(Report.buildOptions(), new String[]{});
+        ReportConfiguration config = Report.createConfiguration("target/test-classes/elements", cl);
+        Reporter.report(config);
+        Assert.assertTrue(output.exists());
+        String content = FileUtils.readFileToString(output, StandardCharsets.UTF_8);
+        Assert.assertTrue(content.contains("2 Unknown Licenses"));
+        Assert.assertTrue(content.contains("target/test-classes/elements/Source.java"));
+        Assert.assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
+        System.setOut(origin);
+    }
+
 }
diff --git a/apache-rat/README-CLI.txt b/apache-rat/README-CLI.txt
index 0e629a8a8..ad6eb331e 100644
--- a/apache-rat/README-CLI.txt
+++ b/apache-rat/README-CLI.txt
@@ -44,15 +44,17 @@ java -jar apache-rat-${project.version}.jar
 Command Line Options
 ====================
 
-usage: java rat.report [options] [DIR|TARBALL]
-Options
- -A,--addLicense                Add the default license header to any file
+usage: java -jar apache-rat/target/apache-rat-{project.version}.jar
+            [options] [DIR|TARBALL]
+
+Available options
+ -a,--addLicence                Add the default license header to any file
                                 with an unknown license that is not in the
                                 exclusion list. By default new files will
                                 be created with the license header, to
                                 force the modification of existing files
                                 use the --force option.
- -a,--addlicense                Add the default license header to any file
+ -A,--addLicense                Add the default license header to any file
                                 with an unknown license that is not in the
                                 exclusion list. By default new files will
                                 be created with the license header, to
@@ -63,19 +65,27 @@ Options
                                 "Copyright 2008 Foo"
  -d,--dir                       Used to indicate source when using
                                 --exclude
- -E,--exclude-file <fileName>   Excludes files matching regular expression
-                                in <file> Note that --dir is required when
-                                using this parameter.
  -e,--exclude <expression>      Excludes files matching wildcard
                                 <expression>. Note that --dir is required
                                 when using this parameter. Allows multiple
                                 arguments.
+ -E,--exclude-file <fileName>   Excludes files matching regular expression
+                                in <file> Note that --dir is required when
+                                using this parameter.
  -f,--force                     Forces any changes in files to be written
                                 directly to the source files (i.e. new
                                 files are not created)
- -h,--help                      Print help for the Rat command line
+ -h,--help                      Print help for the RAT command line
                                 interface and exit
+    --licenses <arg>            File names or URLs for license definitions
+    --list-approved-families    List all defined license families
+    --list-licenses             List all active licenses
+    --no-default-licenses       Ignore default configuration. By default
+                                all approved default licenses are used
+ -o,--out <arg>                 Define the output file where to write
+                                report (default is System.out)
  -s,--stylesheet <arg>          XSLT stylesheet to use when creating the
                                 report.  Not compatible with -x
  -x,--xml                       Output the report in raw XML format.  Not
                                 compatible with -s
+
diff --git a/apache-rat/src/site/apt/index.apt.vm b/apache-rat/src/site/apt/index.apt.vm
index 1e8dd8c3a..0813a0fa2 100644
--- a/apache-rat/src/site/apt/index.apt.vm
+++ b/apache-rat/src/site/apt/index.apt.vm
@@ -76,16 +76,16 @@ java -jar apache-rat/target/apache-rat-${project.version}.jar
 
 +------------------------------------------+
 usage: java -jar apache-rat/target/apache-rat-${project.version}.jar
- [options] [DIR|TARBALL]
+            [options] [DIR|TARBALL]
 
 Available options
- -A,--addLicense                Add the default license header to any file
+ -a,--addLicence                Add the default license header to any file
                                 with an unknown license that is not in the
                                 exclusion list. By default new files will
                                 be created with the license header, to
                                 force the modification of existing files
                                 use the --force option.
- -a,--addlicense                Add the default license header to any file
+ -A,--addLicense                Add the default license header to any file
                                 with an unknown license that is not in the
                                 exclusion list. By default new files will
                                 be created with the license header, to
@@ -96,18 +96,25 @@ Available options
                                 "Copyright 2008 Foo"
  -d,--dir                       Used to indicate source when using
                                 --exclude
- -E,--exclude-file <fileName>   Excludes files matching regular expression
-                                in <file> Note that --dir is required when
-                                using this parameter.
  -e,--exclude <expression>      Excludes files matching wildcard
                                 <expression>. Note that --dir is required
                                 when using this parameter. Allows multiple
                                 arguments.
+ -E,--exclude-file <fileName>   Excludes files matching regular expression
+                                in <file> Note that --dir is required when
+                                using this parameter.
  -f,--force                     Forces any changes in files to be written
                                 directly to the source files (i.e. new
                                 files are not created)
- -h,--help                      Print help for the Rat command line
+ -h,--help                      Print help for the RAT command line
                                 interface and exit
+    --licenses <arg>            File names or URLs for license definitions
+    --list-approved-families    List all defined license families
+    --list-licenses             List all active licenses
+    --no-default-licenses       Ignore default configuration. By default
+                                all approved default licenses are used
+ -o,--out <arg>                 Define the output file where to write
+                                report (default is System.out)
  -s,--stylesheet <arg>          XSLT stylesheet to use when creating the
                                 report.  Not compatible with -x
  -x,--xml                       Output the report in raw XML format.  Not

From 18da0eec99c370af5fb253f53a5d665ef9978a32 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 26 Nov 2023 18:55:13 +0100
Subject: [PATCH 170/299] RAT-320: Add new CLI option to output a RAT run into
 a file

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 03f7daa30..69bc8b44f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-320" type="add" dev="pottlinger" due-to="Jean Baptiste Onofré">
+         Add new command line option -o/--output to write RAT's output to a file.
+      </action>
       <action issue="RAT-329" type="add" dev="pottlinger" due-to="Claude Warren">
          Add markdown (MD) and yaml (YML/YAML) as a recognized extension for file and license processing.
       </action>

From b5adb3485dab82a8d1c88e30d05d4b1f05bc2350 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 26 Nov 2023 18:57:50 +0100
Subject: [PATCH 171/299] RAT-320: Add new CLI option to output a RAT run into
 a file

---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 69bc8b44f..7a8e8c433 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,7 +60,7 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
-      <action issue="RAT-320" type="add" dev="pottlinger" due-to="Jean Baptiste Onofré">
+      <action issue="RAT-320" type="add" dev="pottlinger" due-to="Jean-Baptiste Onofré">
          Add new command line option -o/--output to write RAT's output to a file.
       </action>
       <action issue="RAT-329" type="add" dev="pottlinger" due-to="Claude Warren">

From ddb409a8d783518ac58c98e5b57a7b8b50083aa0 Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Fri, 24 Nov 2023 23:09:59 +0100
Subject: [PATCH 172/299] RAT-335: Improve the parsing of gitignore files.

---
 apache-rat-plugin/pom.xml                     |  13 ++
 .../org/apache/rat/mp/AbstractRatMojo.java    |  93 ++++++++----
 .../apache/rat/mp/util/ExclusionHelper.java   |  29 ++--
 .../apache/rat/mp/util/ScmIgnoreParser.java   |  87 +++--------
 .../rat/mp/util/ignore/GitIgnoreMatcher.java  |  56 ++++++++
 .../rat/mp/util/ignore/GlobIgnoreMatcher.java | 136 ++++++++++++++++++
 .../rat/mp/util/ignore/IgnoreMatcher.java     |  37 +++++
 .../util/ignore/IgnoringDirectoryScanner.java |  74 ++++++++++
 .../org/apache/rat/mp/RatCheckMojoTest.java   |  40 ++++++
 .../rat/mp/util/ExclusionHelperTest.java      |  24 ++--
 .../rat/mp/util/ScmIgnoreParserTest.java      |  10 +-
 .../unit/RAT-335-GitIgnore/.gitignore         |   7 +
 .../unit/RAT-335-GitIgnore/README.txt         |  12 ++
 .../unit/RAT-335-GitIgnore/dir1/.gitignore    |   3 +
 .../unit/RAT-335-GitIgnore/dir1/dir1.md       |   1 +
 .../unit/RAT-335-GitIgnore/dir1/dir1.txt      |   1 +
 .../unit/RAT-335-GitIgnore/dir1/file1.log     |   1 +
 .../unit/RAT-335-GitIgnore/dir2/dir2.md       |   1 +
 .../unit/RAT-335-GitIgnore/dir2/dir2.txt      |   1 +
 .../unit/RAT-335-GitIgnore/dir3/dir3.log      |   1 +
 .../unit/RAT-335-GitIgnore/dir3/file3.log     |   1 +
 .../unit/RAT-335-GitIgnore/invoker.properties |  16 +++
 .../resources/unit/RAT-335-GitIgnore/pom.xml  |  47 ++++++
 .../resources/unit/RAT-335-GitIgnore/root.md  |   1 +
 pom.xml                                       |   4 +
 25 files changed, 574 insertions(+), 122 deletions(-)
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GitIgnoreMatcher.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoreMatcher.java
 create mode 100644 apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoringDirectoryScanner.java
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/README.txt
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/.gitignore
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.md
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.txt
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/file1.log
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.md
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.txt
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/dir3.log
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/file3.log
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/invoker.properties
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml
 create mode 100644 apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/root.md

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index f7e07e5c4..7d602e723 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -89,6 +89,8 @@
               <exclude>src/test/resources/unit/it2/src.txt</exclude>
               <exclude>src/test/resources/unit/it3/src.apt</exclude>
               <exclude>src/test/resources/unit/it4/*.html</exclude>
+              <exclude>src/test/resources/unit/RAT-335-GitIgnore/*</exclude>
+              <exclude>src/test/resources/unit/RAT-335-GitIgnore/**/*</exclude>
               <exclude>**/*.iml</exclude>
               <!-- RAT-171: needs to be added since SCM ignores are only parsed in project root -->
               <exclude>**/.bzrignore</exclude>
@@ -287,6 +289,17 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.36</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>nl.basjes.gitignore</groupId>
+      <artifactId>gitignore-reader</artifactId>
+      <version>1.2.1</version>
+    </dependency>
   </dependencies>
   <reporting>
     <plugins>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 11ccd8364..89aaa30f3 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -38,9 +38,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.function.Consumer;
 
@@ -53,16 +51,17 @@
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
-import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.config.SourceCodeManagementSystems;
 import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.MatcherReader;
-import org.apache.rat.configuration.MatcherBuilderTracker;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.mp.util.ScmIgnoreParser;
+import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
+import org.apache.rat.mp.util.ignore.IgnoreMatcher;
+import org.apache.rat.mp.util.ignore.IgnoringDirectoryScanner;
 import org.apache.rat.report.IReportable;
 import org.codehaus.plexus.util.DirectoryScanner;
 
@@ -335,7 +334,7 @@ protected void logLicenses(Collection<ILicense> licenses) {
      * UndeclaredThrowableExceptions.
      */
     private IReportable getReportable() throws MojoExecutionException {
-        final DirectoryScanner ds = new DirectoryScanner();
+        final IgnoringDirectoryScanner ds = new IgnoringDirectoryScanner();
         ds.setBasedir(basedir);
         setExcludes(ds);
         setIncludes(ds);
@@ -476,8 +475,8 @@ private List<String> getPatternsFromFile(File pFile, String pCharset) throws Moj
         return patterns;
     }
 
-    private void setExcludes(DirectoryScanner ds) throws MojoExecutionException {
-        final List<String> excludeList = mergeDefaultExclusions();
+    private void setExcludes(IgnoringDirectoryScanner ds) throws MojoExecutionException {
+        final List<IgnoreMatcher> ignoreMatchers = mergeDefaultExclusions();
         if (excludes == null || excludes.length == 0) {
             getLog().debug("No excludes explicitly specified.");
         } else {
@@ -486,47 +485,77 @@ private void setExcludes(DirectoryScanner ds) throws MojoExecutionException {
                 getLog().debug("Exclude: " + exclude);
             }
         }
+
+        final List<String> globExcludes = new ArrayList<>();
+        for (IgnoreMatcher ignoreMatcher : ignoreMatchers) {
+            if (ignoreMatcher instanceof GlobIgnoreMatcher) {
+                // The glob matching we do via the DirectoryScanner
+                globExcludes.addAll(((GlobIgnoreMatcher) ignoreMatcher).getExclusionLines());
+            } else {
+                // All others (git) are used directly
+                ds.addIgnoreMatcher(ignoreMatcher);
+            }
+        }
+
         if (excludes != null) {
-            Collections.addAll(excludeList, excludes);
+            Collections.addAll(globExcludes, excludes);
         }
-        if (!excludeList.isEmpty()) {
-            final String[] allExcludes = excludeList.toArray(new String[excludeList.size()]);
+        if (!globExcludes.isEmpty()) {
+            final String[] allExcludes = globExcludes.toArray(new String[globExcludes.size()]);
             ds.setExcludes(allExcludes);
         }
     }
 
-    private List<String> mergeDefaultExclusions() throws MojoExecutionException {
-        final Set<String> results = new HashSet<>();
+    private List<IgnoreMatcher> mergeDefaultExclusions() throws MojoExecutionException {
+        List<IgnoreMatcher> ignoreMatchers = new ArrayList<>();
+
+        final GlobIgnoreMatcher basicRules = new GlobIgnoreMatcher();
 
-        addPlexusAndScmDefaults(getLog(), useDefaultExcludes, results);
-        addMavenDefaults(getLog(), useMavenDefaultExcludes, results);
-        addEclipseDefaults(getLog(), useEclipseDefaultExcludes, results);
-        addIdeaDefaults(getLog(), useIdeaDefaultExcludes, results);
+        basicRules.addRules(addPlexusAndScmDefaults(getLog(), useDefaultExcludes));
+        basicRules.addRules(addMavenDefaults(getLog(), useMavenDefaultExcludes));
+        basicRules.addRules(addEclipseDefaults(getLog(), useEclipseDefaultExcludes));
+        basicRules.addRules(addIdeaDefaults(getLog(), useIdeaDefaultExcludes));
 
         if (parseSCMIgnoresAsExcludes) {
             getLog().debug("Will parse SCM ignores for exclusions...");
-            results.addAll(ScmIgnoreParser.getExclusionsFromSCM(getLog(), project.getBasedir()));
+            ignoreMatchers.addAll(ScmIgnoreParser.getExclusionsFromSCM(getLog(), project.getBasedir()));
             getLog().debug("Finished adding exclusions from SCM ignore files.");
         }
 
         if (excludeSubProjects && project != null && project.getModules() != null) {
-            for (final Object o : project.getModules()) {
-                final String moduleSubPath = (String) o;
+            for (final String moduleSubPath : project.getModules()) {
                 if (new File(basedir, moduleSubPath).isDirectory()) {
-                    results.add(moduleSubPath + "/**/*");
+                    basicRules.addRule(moduleSubPath + "/**/*");
                 } else {
-                    results.add(StringUtils.substringBeforeLast(moduleSubPath, "/") + "/**/*");
+                    basicRules.addRule(StringUtils.substringBeforeLast(moduleSubPath, "/") + "/**/*");
                 }
             }
         }
 
-        getLog().debug("Finished creating list of implicit excludes.");
-        if (results.isEmpty()) {
-            getLog().debug("No excludes implicitly specified.");
-        } else {
-            getLog().debug(results.size() + " implicit excludes.");
-            for (final String exclude : results) {
-                getLog().debug("Implicit exclude: " + exclude);
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Finished creating list of implicit excludes.");
+            if (basicRules.getExclusionLines().isEmpty() && ignoreMatchers.isEmpty()) {
+                getLog().debug("No excludes implicitly specified.");
+            } else {
+                if (!basicRules.getExclusionLines().isEmpty()) {
+                    getLog().debug(basicRules.getExclusionLines().size() + " implicit excludes.");
+                    for (final String exclude : basicRules.getExclusionLines()) {
+                        getLog().debug("Implicit exclude: " + exclude);
+                    }
+                }
+                for (IgnoreMatcher ignoreMatcher : ignoreMatchers) {
+                    if (ignoreMatcher instanceof GlobIgnoreMatcher) {
+                        GlobIgnoreMatcher globIgnoreMatcher = (GlobIgnoreMatcher) ignoreMatcher;
+                        if (!globIgnoreMatcher.getExclusionLines().isEmpty()) {
+                            getLog().debug(globIgnoreMatcher.getExclusionLines().size() + " implicit excludes from SCM.");
+                            for (final String exclude : globIgnoreMatcher.getExclusionLines()) {
+                                getLog().debug("Implicit exclude: " + exclude);
+                            }
+                        }
+                    } else {
+                        getLog().debug("Implicit exclude: \n" + ignoreMatcher);
+                    }
+                }
             }
         }
         if (excludesFile != null) {
@@ -539,9 +568,13 @@ private List<String> mergeDefaultExclusions() throws MojoExecutionException {
             }
             final String charset = excludesFileCharset == null ? "UTF8" : excludesFileCharset;
             getLog().debug("Loading excludes from file " + f + ", using character set " + charset);
-            results.addAll(getPatternsFromFile(f, charset));
+            basicRules.addRules(getPatternsFromFile(f, charset));
+        }
+
+        if (!basicRules.isEmpty()) {
+            ignoreMatchers.add(basicRules);
         }
 
-        return new ArrayList<>(results);
+        return ignoreMatchers;
     }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
index 0ab75e903..8558e16b5 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
@@ -2,13 +2,17 @@
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.rat.config.SourceCodeManagementSystems;
+import org.codehaus.plexus.util.AbstractScanner;
 import org.codehaus.plexus.util.DirectoryScanner;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static org.codehaus.plexus.util.AbstractScanner.DEFAULTEXCLUDES;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -68,22 +72,22 @@ public final class ExclusionHelper {
                     "*.iws", //
                     ".idea/**/*"));
 
-    public static void addPlexusAndScmDefaults(Log log, final boolean useDefaultExcludes,
-                                               final Set<String> excludeList1) {
+    public static Set<String> addPlexusAndScmDefaults(Log log, final boolean useDefaultExcludes) {
+        Set<String> excludeList = new HashSet<>();
         if (useDefaultExcludes) {
             log.debug("Adding plexus default exclusions...");
-            Collections.addAll(excludeList1, DirectoryScanner.DEFAULTEXCLUDES);
+            Collections.addAll(excludeList, DEFAULTEXCLUDES);
             log.debug("Adding SCM default exclusions...");
-            excludeList1.addAll(//
-                    SourceCodeManagementSystems.getPluginExclusions());
+            excludeList.addAll(SourceCodeManagementSystems.getPluginExclusions());
         } else {
             log.debug("rat.useDefaultExcludes set to false. "
                     + "Plexus and SCM default exclusions will not be added");
         }
+        return excludeList;
     }
 
-    public static void addMavenDefaults(Log log, boolean useMavenDefaultExcludes,
-                                        final Set<String> excludeList) {
+    public static Set<String> addMavenDefaults(Log log, boolean useMavenDefaultExcludes) {
+        Set<String> excludeList = new HashSet<>();
         if (useMavenDefaultExcludes) {
             log.debug("Adding exclusions often needed by Maven projects...");
             excludeList.addAll(MAVEN_DEFAULT_EXCLUDES);
@@ -91,10 +95,11 @@ public static void addMavenDefaults(Log log, boolean useMavenDefaultExcludes,
             log.debug("rat.useMavenDefaultExcludes set to false. "
                     + "Exclusions often needed by Maven projects will not be added.");
         }
+        return excludeList;
     }
 
-    public static void addEclipseDefaults(Log log, boolean useEclipseDefaultExcludes,
-                                          final Set<String> excludeList) {
+    public static Set<String> addEclipseDefaults(Log log, boolean useEclipseDefaultExcludes) {
+        Set<String> excludeList = new HashSet<>();
         if (useEclipseDefaultExcludes) {
             log.debug("Adding exclusions often needed by projects "
                     + "developed in Eclipse...");
@@ -104,10 +109,11 @@ public static void addEclipseDefaults(Log log, boolean useEclipseDefaultExcludes
                     + "Exclusions often needed by projects developed in "
                     + "Eclipse will not be added.");
         }
+        return excludeList;
     }
 
-    public static void addIdeaDefaults(Log log, boolean useIdeaDefaultExcludes,
-                                       final Set<String> excludeList) {
+    public static Set<String> addIdeaDefaults(Log log, boolean useIdeaDefaultExcludes) {
+        Set<String> excludeList = new HashSet<>();
         if (useIdeaDefaultExcludes) {
             log.debug("Adding exclusions often needed by projects "
                     + "developed in IDEA...");
@@ -117,6 +123,7 @@ public static void addIdeaDefaults(Log log, boolean useIdeaDefaultExcludes,
                     + "Exclusions often needed by projects developed in "
                     + "IDEA will not be added.");
         }
+        return excludeList;
     }
 
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java
index a165454f7..675a3644c 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ScmIgnoreParser.java
@@ -20,16 +20,14 @@
  */
 
 
-import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.rat.config.SourceCodeManagementSystems;
+import org.apache.rat.mp.util.ignore.GitIgnoreMatcher;
+import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
+import org.apache.rat.mp.util.ignore.IgnoreMatcher;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -41,41 +39,6 @@ private ScmIgnoreParser() {
         // prevent instantiation of utility class
     }
 
-    private static final List<String> COMMENT_PREFIXES = Arrays.asList("#", "##", "//", "/**", "/*");
-
-    /**
-     * Parses excludes from the given SCM ignore file.
-     *
-     * @param log       Maven log to show output during RAT runs.
-     * @param scmIgnore if <code>null</code> or invalid an empty list of exclusions is returned.
-     * @return all exclusions (=non-comment lines) from the SCM ignore file.
-     */
-    public static List<String> getExcludesFromFile(final Log log, final File scmIgnore) {
-
-        final List<String> exclusionLines = new ArrayList<>();
-
-        if (scmIgnore != null && scmIgnore.exists() && scmIgnore.isFile()) {
-            log.debug("Parsing exclusions from " + scmIgnore);
-            BufferedReader reader = null;
-            try {
-                reader = new BufferedReader(new FileReader(scmIgnore));
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    if (!isComment(line)) {
-                        exclusionLines.add(line);
-                        log.debug("Added " + line);
-                    }
-                }
-            } catch (final IOException e) {
-                log.warn("Cannot parse " + scmIgnore + " for exclusions. Will skip this file.");
-                log.debug("Skip parsing " + scmIgnore + " due to " + e.getMessage());
-            } finally {
-                IOUtils.closeQuietly(reader);
-            }
-        }
-        return exclusionLines;
-    }
-
     /**
      * Parse ignore files from all known SCMs that have ignore files.
      *
@@ -83,36 +46,28 @@ public static List<String> getExcludesFromFile(final Log log, final File scmIgno
      * @param baseDir base directory from which to look for SCM ignores.
      * @return Exclusions from the SCM ignore files.
      */
-    public static List<String> getExclusionsFromSCM(final Log log, final File baseDir) {
-        List<String> exclusions = new ArrayList<>();
+    public static List<IgnoreMatcher> getExclusionsFromSCM(final Log log, final File baseDir) {
+        List<IgnoreMatcher> ignoreMatchers = new ArrayList<>();
         for (SourceCodeManagementSystems scm : SourceCodeManagementSystems.values()) {
-            if (scm.hasIgnoreFile()) {
-                exclusions.addAll(getExcludesFromFile(log, new File(baseDir, scm.getIgnoreFile())));
+            switch (scm) {
+                case GIT:
+                    GitIgnoreMatcher gitIgnoreMatcher = new GitIgnoreMatcher(log, baseDir);
+                    if (!gitIgnoreMatcher.isEmpty()) {
+                        ignoreMatchers.add(gitIgnoreMatcher);
+                    }
+                    break;
+                default:
+                    if (scm.hasIgnoreFile()) {
+                        GlobIgnoreMatcher ignoreMatcher = new GlobIgnoreMatcher(log, new File(baseDir, scm.getIgnoreFile()));
+                        if (!ignoreMatcher.isEmpty()) {
+                            ignoreMatchers.add(ignoreMatcher);
+                        }
+                    }
+                    break;
             }
         }
-        return exclusions;
-
+        return ignoreMatchers;
     }
 
-    /**
-     * Determines whether the given line is a comment or not based on scanning
-     * for prefixes
-     * {@see COMMENT_PREFIXES}.
-     *
-     * @param line line to verify.
-     * @return <code>true</code> if the given line is a commented out line.
-     */
-    static boolean isComment(final String line) {
-        if (line == null || line.length() <= 0) {
-            return false;
-        }
 
-        final String trimLine = line.trim();
-        for (String prefix : COMMENT_PREFIXES) {
-            if (trimLine.startsWith(prefix)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GitIgnoreMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GitIgnoreMatcher.java
new file mode 100644
index 000000000..844ce90c6
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GitIgnoreMatcher.java
@@ -0,0 +1,56 @@
+package org.apache.rat.mp.util.ignore;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import nl.basjes.gitignore.GitIgnoreFileSet;
+import org.apache.maven.plugin.logging.Log;
+
+import java.io.File;
+import java.util.Optional;
+
+public class GitIgnoreMatcher implements IgnoreMatcher {
+
+    private final GitIgnoreFileSet gitIgnoreFileSet;
+
+    public GitIgnoreMatcher(final Log log, final File projectBaseDir) {
+        log.debug("Recursively loading .gitignore files in " + projectBaseDir);
+        // This will walk the project tree and load all .gitignore files
+        gitIgnoreFileSet = new GitIgnoreFileSet(projectBaseDir);
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return gitIgnoreFileSet.isEmpty();
+    }
+
+    @Override
+    public Optional<Boolean> isIgnoredFile(String filename) {
+        Boolean isIgnoredFile = gitIgnoreFileSet.isIgnoredFile(filename);
+        if (isIgnoredFile == null) {
+            return Optional.empty();
+        }
+        return Optional.of(isIgnoredFile);
+    }
+
+    @Override
+    public String toString() {
+        return "Loaded .gitignore data:\n" + gitIgnoreFileSet;
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
new file mode 100644
index 000000000..3df95cd35
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
@@ -0,0 +1,136 @@
+package org.apache.rat.mp.util.ignore;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.plugin.logging.Log;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+public class GlobIgnoreMatcher implements IgnoreMatcher {
+
+    final List<String> exclusionLines = new ArrayList<>();
+
+    private static final List<String> COMMENT_PREFIXES = Arrays.asList("#", "##", "//", "/**", "/*");
+
+    public GlobIgnoreMatcher() {
+        // No rules to load
+    }
+
+    public GlobIgnoreMatcher(final Log log, final File scmIgnore) {
+        loadFile(log, scmIgnore);
+    }
+
+    /**
+     * Add a single rule to the set
+     * @param rule The line that matches some files
+     */
+    public void addRule(final String rule) {
+        if (!exclusionLines.contains(rule)) {
+            exclusionLines.add(rule);
+        }
+    }
+
+    /**
+     * Add a set of rules to the set
+     * @param rules The line that matches some files
+     */
+    public void addRules(final Collection<String> rules) {
+        for (String rule : rules) {
+            if (!exclusionLines.contains(rule)) {
+                exclusionLines.add(rule);
+            }
+        }
+    }
+
+    /**
+     * Parses excludes from the given SCM ignore file.
+     *
+     * @param log       Maven log to show output during RAT runs.
+     * @param scmIgnore if <code>null</code> or invalid an empty list of exclusions is returned.
+     */
+    public void loadFile(final Log log, final File scmIgnore) {
+        if (scmIgnore != null && scmIgnore.exists() && scmIgnore.isFile()) {
+            log.debug("Parsing exclusions from " + scmIgnore);
+            BufferedReader reader = null;
+            try {
+                reader = new BufferedReader(new FileReader(scmIgnore));
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (!isComment(line)) {
+                        exclusionLines.add(line);
+                        log.debug("Added " + line);
+                    }
+                }
+            } catch (final IOException e) {
+                log.warn("Cannot parse " + scmIgnore + " for exclusions. Will skip this file.");
+                log.debug("Skip parsing " + scmIgnore + " due to " + e.getMessage());
+            } finally {
+                IOUtils.closeQuietly(reader);
+            }
+        }
+    }
+
+    /**
+     * Determines whether the given line is a comment or not based on scanning
+     * for prefixes
+     * {@see COMMENT_PREFIXES}.
+     *
+     * @param line line to verify.
+     * @return <code>true</code> if the given line is a commented out line.
+     */
+    public static boolean isComment(final String line) {
+        if (line == null || line.length() <= 0) {
+            return false;
+        }
+
+        final String trimLine = line.trim();
+        for (String prefix : COMMENT_PREFIXES) {
+            if (trimLine.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public List<String> getExclusionLines() {
+        return exclusionLines;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return exclusionLines.isEmpty();
+    }
+
+    @Override
+    public Optional<Boolean> isIgnoredFile(String filename) {
+        // Not used for Glob Rules; using the DirectoryScanner instead
+        // It CAN be moved here if so desired.
+        return Optional.empty() ;
+    }
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoreMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoreMatcher.java
new file mode 100644
index 000000000..c1d1f49fd
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoreMatcher.java
@@ -0,0 +1,37 @@
+package org.apache.rat.mp.util.ignore;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Optional;
+
+public interface IgnoreMatcher {
+    /**
+     * Checks if the file matches the stored expressions.
+     * @param filename The filename to be checked
+     * @return empty: not matched, True: must be ignored, False: it must be UNignored
+     */
+    Optional<Boolean> isIgnoredFile(String filename);
+
+    /**
+     * Returns {@code true} if this IgnoreMatcher contains no rules.
+     * @return {@code true} if this IgnoreMatcher contains no rules
+     */
+    boolean isEmpty();
+}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoringDirectoryScanner.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoringDirectoryScanner.java
new file mode 100644
index 000000000..d8e340a4a
--- /dev/null
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/IgnoringDirectoryScanner.java
@@ -0,0 +1,74 @@
+package org.apache.rat.mp.util.ignore;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.codehaus.plexus.util.DirectoryScanner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+
+public class IgnoringDirectoryScanner extends DirectoryScanner {
+
+    public IgnoringDirectoryScanner() {
+        super();
+    }
+
+    List<IgnoreMatcher> ignoreMatcherList = new ArrayList<>();
+
+    public void addIgnoreMatcher(IgnoreMatcher ignoreMatcher) {
+        ignoreMatcherList.add(ignoreMatcher);
+    }
+
+    private boolean matchesAnIgnoreMatcher(String name) {
+        for (IgnoreMatcher ignoreMatcher : ignoreMatcherList) {
+            if (ignoreMatcher.isIgnoredFile(name).orElse(FALSE) == TRUE) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    protected boolean isExcluded(String name) {
+        if (matchesAnIgnoreMatcher(name)) {
+            return true;
+        }
+        return super.isExcluded(name);
+    }
+
+    @Override
+    protected boolean isExcluded(String name, String[] tokenizedName) {
+        if (matchesAnIgnoreMatcher(name)) {
+            return true;
+        }
+        return super.isExcluded(name, tokenizedName);
+    }
+
+    @Override
+    protected boolean isExcluded(String name, char[][] tokenizedName) {
+        if (matchesAnIgnoreMatcher(name)) {
+            return true;
+        }
+        return super.isExcluded(name, tokenizedName);
+    }
+}
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index d97b6786e..bac6a379c 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.rat.mp;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.rat.mp.RatTestHelpers.ensureRatReportIsCorrect;
 import static org.apache.rat.mp.RatTestHelpers.getSourceDirectory;
 import static org.apache.rat.mp.RatTestHelpers.newArtifactFactory;
@@ -23,7 +24,11 @@
 import static org.apache.rat.mp.RatTestHelpers.newSiteRenderer;
 
 import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.ReportConfigurationTest;
 import org.apache.rat.license.ILicenseFamily;
@@ -75,6 +80,7 @@ private AbstractRatMojo newRatMojo(String pDir, String pGoal, boolean pCreateCop
             setVariableValueToObject(mojo, "siteRenderer", newSiteRenderer(getContainer()));
         } else if (mojo instanceof RatCheckMojo) {
             final File ratTxtFile = new File(buildDirectory, "rat.txt");
+            FileUtils.write(ratTxtFile, "", UTF_8); // Ensure the output file exists and is empty (rerunning the test will append)
             setVariableValueToObject(mojo, "reportFile", ratTxtFile);
         }
         return mojo;
@@ -184,4 +190,38 @@ public void testIt5() throws Exception {
 
         ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
     }
+
+    /**
+     * Tests verifying gitignore parsing
+     */
+    public void testRAT335GitIgnore() throws Exception {
+        final RatCheckMojo mojo = newRatCheckMojo("RAT-335-GitIgnore");
+        final File ratTxtFile = getRatTxtFile(mojo);
+        final String dir = getDir(mojo);
+        final String[] expected = {
+            "Notes: 1",
+            "Binaries: 0",
+            "Archives: 0",
+            "Standards: 5$",
+            "Apache Licensed: 2$",
+            "Generated Documents: 0",
+            "^3 Unknown Licenses",
+            " AL +\\Q" + dir + "pom.xml\\E$",
+            "\\Q!????? " + dir + "dir1/dir1.md\\E$",
+            "\\Q!????? " + dir + "dir2/dir2.txt\\E$",
+            "\\Q!????? " + dir + "dir3/file3.log\\E$",
+            "^== File: \\Q" + dir + "dir1/dir1.md\\E$",
+            "^== File: \\Q" + dir + "dir2/dir2.txt\\E$",
+            "^== File: \\Q" + dir + "dir3/file3.log\\E$"
+        };
+        try {
+            mojo.execute();
+            fail("Expected RatCheckException");
+        } catch (RatCheckException e) {
+            final String msg = e.getMessage();
+            assertTrue("report filename was not contained in '" + msg + "'", msg.contains(ratTxtFile.getName()));
+            assertFalse("no null allowed in '" + msg + "'", (msg.toUpperCase().contains("NULL")));
+            ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
+        }
+    }
 }
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
index ff31723b2..1af2b9aef 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
@@ -56,33 +56,33 @@ public void testNumberOfExclusions() {
     @Test
     public void testAddingEclipseExclusions() {
         final Set<String> exclusion = new HashSet<>();
-        addEclipseDefaults(log, false, exclusion);
+        exclusion.addAll(addEclipseDefaults(log, false));
         assertTrue(exclusion.isEmpty());
-        addEclipseDefaults(log, true, exclusion);
+        exclusion.addAll(addEclipseDefaults(log, true));
         assertEquals(5, exclusion.size());
-        addEclipseDefaults(log, true, exclusion);
+        exclusion.addAll(addEclipseDefaults(log, true));
         assertEquals(5, exclusion.size());
     }
 
     @Test
     public void testAddingIdeaExclusions() {
         final Set<String> exclusion = new HashSet<>();
-        addIdeaDefaults(log, false, exclusion);
+        exclusion.addAll(addIdeaDefaults(log, false));
         assertTrue(exclusion.isEmpty());
-        addIdeaDefaults(log, true, exclusion);
+        exclusion.addAll(addIdeaDefaults(log, true));
         assertEquals(4, exclusion.size());
-        addIdeaDefaults(log, true, exclusion);
+        exclusion.addAll(addIdeaDefaults(log, true));
         assertEquals(4, exclusion.size());
     }
 
     @Test
     public void testAddingMavenExclusions() {
         final Set<String> exclusion = new HashSet<>();
-        addMavenDefaults(log, false, exclusion);
+        exclusion.addAll(addMavenDefaults(log, false));
         assertTrue(exclusion.isEmpty());
-        addMavenDefaults(log, true, exclusion);
+        exclusion.addAll(addMavenDefaults(log, true));
         assertEquals(8, exclusion.size());
-        addMavenDefaults(log, true, exclusion);
+        exclusion.addAll(addMavenDefaults(log, true));
         assertEquals(8, exclusion.size());
     }
 
@@ -91,14 +91,14 @@ public void testAddingPlexusAndScmExclusion() {
         final int expectedSizeMergedFromPlexusDefaultsAndScm = (37 + SourceCodeManagementSystems.getPluginExclusions().size());
 
         final Set<String> exclusion = new HashSet<>();
-        addPlexusAndScmDefaults(log, false, exclusion);
+        exclusion.addAll(addPlexusAndScmDefaults(log, false));
         assertTrue(exclusion.isEmpty());
-        addPlexusAndScmDefaults(log, true, exclusion);
+        exclusion.addAll(addPlexusAndScmDefaults(log, true));
         assertEquals(
                 "Did you upgrade plexus to get more default excludes?",//
                 expectedSizeMergedFromPlexusDefaultsAndScm,//
                 exclusion.size());
-        addPlexusAndScmDefaults(log, true, exclusion);
+        exclusion.addAll(addPlexusAndScmDefaults(log, true));
         assertEquals(
                 "Did you upgrade plexus to get more default excludes?",//
                 expectedSizeMergedFromPlexusDefaultsAndScm,//
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
index 67846108e..342380dc6 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
@@ -18,6 +18,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.logging.Log;
+import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -31,9 +32,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import static org.apache.rat.mp.util.ScmIgnoreParser.getExcludesFromFile;
 import static org.apache.rat.mp.util.ScmIgnoreParser.getExclusionsFromSCM;
-import static org.apache.rat.mp.util.ScmIgnoreParser.isComment;
+import static org.apache.rat.mp.util.ignore.GlobIgnoreMatcher.isComment;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -67,6 +67,9 @@ public void parseAsComments() {
         assertTrue(isComment("     /* comment that is */ "));
     }
 
+    public List<String> getExcludesFromFile(final Log log, final File scmIgnore) {
+        return new GlobIgnoreMatcher(log, scmIgnore).getExclusionLines();
+    }
 
     @Test
     public void parseFromNonExistingFileOrDirectoryOrNull() {
@@ -77,7 +80,8 @@ public void parseFromNonExistingFileOrDirectoryOrNull() {
 
     @Test
     public void parseFromTargetDirectoryHopefullyWithoutSCMIgnores() {
-        assertTrue(getExclusionsFromSCM(log, new File("./target")).isEmpty());
+        // The target directory contains ignore files from other tests
+        assertTrue(getExclusionsFromSCM(log, new File("./target/classes")).isEmpty());
     }
 
     @Test
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore
new file mode 100644
index 000000000..8855fa805
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore
@@ -0,0 +1,7 @@
+*.md
+
+# This makes it ignore dir3/dir3.log and dir3/file3.log
+*.log
+
+# This makes it "unignore" dir3/file3.log
+!file*.log
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/README.txt b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/README.txt
new file mode 100644
index 000000000..8681fb580
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/README.txt
@@ -0,0 +1,12 @@
+Note the output when running in the real commandline version of git
+
+# Files that must be ignored (dropping the gitignore matches outside of this test tree)
+$ git check-ignore --no-index --verbose $(find . -type f|sort) | fgrep 'apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/'
+
+apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/.gitignore:2:!dir1.md  ./dir1/dir1.md
+apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/.gitignore:1:*.txt     ./dir1/dir1.txt
+apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/.gitignore:3:file1.log ./dir1/file1.log
+apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore:1:*.md   ./dir2/dir2.md
+apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore:4:*.log  ./dir3/dir3.log
+apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore:7:!file*.log     ./dir3/file3.log
+apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/.gitignore:1:*.md   ./root.md
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/.gitignore b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/.gitignore
new file mode 100644
index 000000000..26fd5c956
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/.gitignore
@@ -0,0 +1,3 @@
+*.txt
+!dir1.md
+file1.log
\ No newline at end of file
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.md b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.md
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.md
@@ -0,0 +1 @@
+File without a valid license
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.txt b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.txt
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/dir1.txt
@@ -0,0 +1 @@
+File without a valid license
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/file1.log b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/file1.log
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir1/file1.log
@@ -0,0 +1 @@
+File without a valid license
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.md b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.md
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.md
@@ -0,0 +1 @@
+File without a valid license
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.txt b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.txt
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir2/dir2.txt
@@ -0,0 +1 @@
+File without a valid license
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/dir3.log b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/dir3.log
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/dir3.log
@@ -0,0 +1 @@
+File without a valid license
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/file3.log b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/file3.log
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/dir3/file3.log
@@ -0,0 +1 @@
+File without a valid license
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/invoker.properties b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/invoker.properties
new file mode 100644
index 000000000..6e8c3479e
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/invoker.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+invoker.goals = clean apache-rat:check
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml
new file mode 100644
index 000000000..0ec80739b
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.rat.test</groupId>
+  <artifactId>RAT335</artifactId>
+  <version>1.0</version>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>@pom.version@</version>
+        <configuration>
+
+          <!-- Minimize the number of active rules to keep the test minimal -->
+          <excludes>
+            <exclude>**/.gitignore</exclude>
+          </excludes>
+          <useDefaultExcludes>false</useDefaultExcludes>
+          <useMavenDefaultExcludes>false</useMavenDefaultExcludes>
+          <useEclipseDefaultExcludes>false</useEclipseDefaultExcludes>
+          <useIdeaDefaultExcludes>false</useIdeaDefaultExcludes>
+
+          <parseSCMIgnoresAsExcludes>true</parseSCMIgnoresAsExcludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/root.md b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/root.md
new file mode 100644
index 000000000..a31cbc897
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/root.md
@@ -0,0 +1 @@
+File without a valid license
diff --git a/pom.xml b/pom.xml
index c2d73b0dd..ea805ee75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,6 +635,10 @@ agnostic home for software distribution comprehension and audit tools.
       <name>Claude Warren</name>
       <email>claude@apache.org</email>
     </contributor>
+    <contributor>
+      <name>Niels Basjes</name>
+      <email>nielsbasjes@apache.org</email>
+    </contributor>
   </contributors>
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>

From df06e25a81f2f0355bcaf97ce865227dbc4a4cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Thu, 23 Nov 2023 17:55:03 +0100
Subject: [PATCH 173/299] RAT-322: be able to scan hidden directories

---
 apache-rat-core/pom.xml                       |   5 +
 .../src/main/java/org/apache/rat/Report.java  |  11 +-
 .../org/apache/rat/ReportConfiguration.java   |  21 ++
 .../apache/rat/walker/DirectoryWalker.java    |  40 ++-
 .../rat/walker/NameBasedHiddenFileFilter.java |  87 ++++++
 .../java/org/apache/rat/walker/Walker.java    |   4 -
 .../apache/rat/ReportConfigurationTest.java   | 252 +++++++++---------
 .../test/java/org/apache/rat/ReportTest.java  |   2 -
 .../java/org/apache/rat/ReporterTest.java     |   5 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |   3 +-
 .../apache/rat/report/xml/XmlReportTest.java  |   3 +-
 .../rat/walker/DirectoryWalkerTest.java       | 105 ++++++++
 apache-rat-plugin/pom.xml                     |   5 +
 .../java/org/apache/rat/mp/RatCheckMojo.java  |   6 +
 apache-rat-tasks/pom.xml                      |   5 +
 apache-rat/README-CLI.txt                     |   3 +-
 apache-rat/src/site/apt/index.apt.vm          |   1 +
 pom.xml                                       |   6 +
 src/changes/changes.xml                       |   3 +
 19 files changed, 422 insertions(+), 145 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java

diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 079e11943..1f2471d7b 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -130,5 +130,10 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index b87af7456..e94bb31d4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -95,6 +95,10 @@ public class Report {
      * Do not use the default files.
      */
     private static final String NO_DEFAULTS = "no-default-licenses";
+    /**
+     * Scan hidden directories.
+     */
+    private static final String SCAN_HIDDEN_DIRECTORIES = "scan-hidden-directories";
     /**
      * List the licenses that were used for the run.
      */
@@ -166,6 +170,10 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
             configuration.setOut(new File(cl.getOptionValue('o')));
         }
 
+        if (cl.hasOption(SCAN_HIDDEN_DIRECTORIES)) {
+            configuration.setDirectoryFilter(null);
+        }
+
         if (cl.hasOption('a') || cl.hasOption('A')) {
             configuration.setAddLicenseHeaders(cl.hasOption('f') ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
             configuration.setCopyrightMessage(cl.getOptionValue("c"));
@@ -275,6 +283,7 @@ static Options buildOptions() {
         opts.addOption(null, LICENSES, true, "File names or URLs for license definitions");
         opts.addOption(null, LIST_LICENSES, false, "List all active licenses");
         opts.addOption(null, LIST_LICENSE_FAMILIES, false, "List all defined license families");
+        opts.addOption(null, SCAN_HIDDEN_DIRECTORIES, false, "Scan hidden directories");
 
         OptionGroup addLicenseGroup = new OptionGroup();
         String addLicenseDesc = "Add the default license header to any file with an unknown license that is not in the exclusion list. "
@@ -363,7 +372,7 @@ private static IReportable getDirectory(String baseDirectory, ReportConfiguratio
             }
 
             if (base.isDirectory()) {
-                return new DirectoryWalker(base, config.getInputFileFilter());
+                return new DirectoryWalker(base, config.getInputFileFilter(), config.getDirectoryFilter());
             }
 
             try {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index c23df663c..bca38e2cb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -37,6 +37,9 @@
 import java.util.TreeSet;
 import java.util.function.Consumer;
 
+import org.apache.commons.io.filefilter.FalseFileFilter;
+import org.apache.commons.io.filefilter.HiddenFileFilter;
+import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.license.ILicense;
@@ -45,6 +48,7 @@
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
+import org.apache.rat.walker.NameBasedHiddenFileFilter;
 
 /**
  * A configuration object is used by the front end to invoke the
@@ -64,6 +68,7 @@ public class ReportConfiguration {
     private IOSupplier<InputStream> styleSheet = null;
     private IReportable reportable = null;
     private FilenameFilter inputFileFilter = null;
+    private IOFileFilter directoryFilter = NameBasedHiddenFileFilter.HIDDEN;
 
     /**
      * @return The filename filter for the potential input files.
@@ -79,6 +84,22 @@ public void setInputFileFilter(FilenameFilter inputFileFilter) {
         this.inputFileFilter = inputFileFilter;
     }
 
+    public IOFileFilter getDirectoryFilter() {
+        return directoryFilter;
+    }
+
+    public void setDirectoryFilter(IOFileFilter directoryFilter) {
+        if (directoryFilter == null) {
+            this.directoryFilter = FalseFileFilter.FALSE;
+        } else {
+            this.directoryFilter = directoryFilter;
+        }
+    }
+
+    public void addDirectoryFilter(IOFileFilter directoryFilter) {
+        this.directoryFilter = this.directoryFilter.and(directoryFilter);
+    }
+
     /**
      * @return the thing being reported on.
      */
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
index c9b7f12cf..ed590d207 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
@@ -19,6 +19,8 @@
 
 package org.apache.rat.walker;
 
+import org.apache.commons.io.filefilter.HiddenFileFilter;
+import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 import org.apache.rat.document.impl.FileDocument;
@@ -37,27 +39,41 @@ public class DirectoryWalker extends Walker implements IReportable {
 
     protected static final FileNameComparator COMPARATOR = new FileNameComparator();
 
-    public DirectoryWalker(File file) {
-        this(file, (FilenameFilter) null);
+    private IOFileFilter directoryFilter;
+
+    /**
+     * Constructs a walker.
+     *
+     * @param file the directory to walk.
+     * @param directoryFilter directory filter to eventually exclude some directories/files from the scan.
+     */
+    public DirectoryWalker(File file, IOFileFilter directoryFilter) {
+        this(file, (FilenameFilter) null, directoryFilter);
     }
 
     /**
      * Constructs a walker.
      *
-     * @param file   not null
+     * @param file the directory to walk (not null).
      * @param filter filters input files (optional),
      *               or null when no filtering should be performed
+     * @param directoryFilter filters directories (optional), or null when no filtering should be performed.
      */
-    public DirectoryWalker(File file, final FilenameFilter filter) {
+    public DirectoryWalker(File file, final FilenameFilter filter, IOFileFilter directoryFilter) {
         super(file.getPath(), file, filter);
+        this.directoryFilter = directoryFilter;
     }
 
-    public DirectoryWalker(File file, final Pattern ignoreNameRegex) {
+    /**
+     * Constructs a walker.
+     *
+     * @param file the directory to walk (not null).
+     * @param ignoreNameRegex ignore directories/files with name matching the regex.
+     * @param directoryFilter filters directories (optional), or null when no filtering should be performed.
+     */
+    public DirectoryWalker(File file, final Pattern ignoreNameRegex, IOFileFilter directoryFilter) {
         super(file.getPath(), file, regexFilter(ignoreNameRegex));
-    }
-
-    public boolean isRestricted() {
-        return false;
+        this.directoryFilter = directoryFilter;
     }
 
     /**
@@ -68,7 +84,11 @@ public boolean isRestricted() {
      * @throws RatException
      */
     private void processDirectory(RatReport report, final File file) throws RatException {
-        if (!isRestricted(file)) {
+        if (directoryFilter != null) {
+            if (!directoryFilter.accept(file)) {
+                process(report, file);
+            }
+        } else {
             process(report, file);
         }
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java b/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
new file mode 100644
index 000000000..42f0c068a
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.walker;
+
+import org.apache.commons.io.filefilter.AbstractFileFilter;
+import org.apache.commons.io.filefilter.IOFileFilter;
+
+import java.io.File;
+import java.io.Serializable;
+
+/**
+ * This filter accepts {@code File}s that are hidden, e.g. file name starts with .
+ * <p>
+ * Example, showing how to print out a list of the current directory's <i>hidden</i> files:
+ * </p>
+ * <h2>Using Classic IO</h2>
+ * <pre>
+ * File dir = new File(".");
+ * String[] files = dir.list(NameBasedHiddenFileFilter.HIDDEN);
+ * for (String file : files) {
+ *     System.out.println(file);
+ * }
+ * </pre>
+ *
+ * <h2>Using NIO</h2>
+ * <pre>
+ * final Path dir = Paths.get("");
+ * final AccumulatorPathVisitor visitor = AccumulatorPathVisitor.withLongCounters(NameBasedHiddenFileFilter.HIDDEN);
+ * //
+ * // Walk one dir
+ * Files.walkFileTree(dir, Collections.emptySet(), 1, visitor);
+ * System.out.println(visitor.getPathCounters());
+ * System.out.println(visitor.getFileList());
+ * //
+ * visitor.getPathCounters().reset();
+ * //
+ * // Walk dir tree
+ * Files.walkFileTree(dir, visitor);
+ * System.out.println(visitor.getPathCounters());
+ * System.out.println(visitor.getDirList());
+ * System.out.println(visitor.getFileList());
+ * </pre>
+ */
+public class NameBasedHiddenFileFilter extends AbstractFileFilter implements Serializable {
+
+    /**
+     * Singleton instance of <i>hidden</i> filter.
+     */
+    public static final IOFileFilter HIDDEN = new NameBasedHiddenFileFilter();
+
+    /**
+     * Restrictive constructor.
+     */
+    protected NameBasedHiddenFileFilter() {
+    }
+
+    /**
+     * Checks to see if the file is hidden, e.g. file name starts with .
+     *
+     * @param file the File to check
+     * @return {@code true} if the file is <i>hidden</i> (file name starting with .), {@code false} else
+     */
+    @Override
+    public boolean accept(File file) {
+        if (file.getName().startsWith(".")) {
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
index 064d9ed79..76d2424fa 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
@@ -48,10 +48,6 @@ public boolean accept(File dir, String name) {
             }
         };
     }
-
-    protected boolean isRestricted(File file) {
-        return file.getName().startsWith(".");
-    }
  
     protected final boolean isNotIgnored(final File file) {
         boolean result = false;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 9a2524535..33346d539 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -18,12 +18,7 @@
  */
 package org.apache.rat;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -43,6 +38,9 @@
 import java.util.List;
 import java.util.SortedSet;
 
+import org.apache.commons.io.filefilter.AndFileFilter;
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.io.filefilter.FalseFileFilter;
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.ReportConfiguration.NoCloseOutputStream;
 import org.apache.rat.config.AddLicenseHeaders;
@@ -52,6 +50,7 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.testhelpers.TestingLicense;
+import org.apache.rat.walker.NameBasedHiddenFileFilter;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -68,31 +67,29 @@ public void setup() {
     public void testAddAndRemoveApproveLicenseCategories() {
         List<String> expected = new ArrayList<>();
         underTest.addLicense( new TestingLicense("Unapproved"));
-        
-        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
+
+        assertThat(underTest.getApprovedLicenseCategories()).isEmpty();
 
         TestingLicense license = new TestingLicense("TheCat");
         underTest.addLicense(license);
         underTest.addApprovedLicenseCategory(license.getFamily());
         expected.add("TheCa");
         SortedSet<String> result = underTest.getApprovedLicenseCategories();
-        assertEquals(expected.size(), result.size());
-        assertTrue(result.containsAll(expected));
+        assertThat(expected).hasSize(result.size()).containsAll(result);
         SortedSet<ILicenseFamily> families = underTest.getLicenseFamilies(LicenseFilter.approved);
-        assertEquals(expected.size(), families.size());
+        assertThat(expected).hasSize(families.size());
         SortedSet<ILicense> licenses = underTest.getLicenses(LicenseFilter.approved);
-        assertEquals(expected.size(), licenses.size());
+        assertThat(expected).hasSize(licenses.size());
 
         underTest.addLicense(new TestingLicense("ACat"));
         underTest.addApprovedLicenseCategory("ACat");
         expected.add("ACat ");
         result = underTest.getApprovedLicenseCategories();
-        assertEquals(expected.size(), result.size());
-        assertTrue(result.containsAll(expected));
+        assertThat(expected).hasSize(result.size()).containsAll(result);
         families = underTest.getLicenseFamilies(LicenseFilter.approved);
-        assertEquals(expected.size(), families.size());
+        assertThat(expected).hasSize(families.size());
         licenses = underTest.getLicenses(LicenseFilter.approved);
-        assertEquals(expected.size(), licenses.size());
+        assertThat(expected).hasSize(licenses.size());
 
         String[] cats = { "Spot ", "Felix" };
         underTest.addLicense(new TestingLicense("Spot"));
@@ -100,51 +97,47 @@ public void testAddAndRemoveApproveLicenseCategories() {
         underTest.addApprovedLicenseCategories(Arrays.asList(cats));
         expected.addAll(Arrays.asList(cats));
         result = underTest.getApprovedLicenseCategories();
-        assertEquals(expected.size(), result.size());
-        assertTrue(result.containsAll(expected));
+        assertThat(expected).hasSize(result.size()).containsAll(result);
         families = underTest.getLicenseFamilies(LicenseFilter.approved);
-        assertEquals(expected.size(), families.size());
+        assertThat(expected).hasSize(families.size());
         licenses = underTest.getLicenses(LicenseFilter.approved);
-        assertEquals(expected.size(), licenses.size());
+        assertThat(expected).hasSize(licenses.size());
         
         underTest.removeApprovedLicenseCategory("Spot ");
         expected.remove("Spot ");
         result = underTest.getApprovedLicenseCategories();
-        assertEquals(expected.size(), result.size());
-        assertTrue(result.containsAll(expected));
+        assertThat(expected).hasSize(result.size()).containsAll(result);
         families = underTest.getLicenseFamilies(LicenseFilter.approved);
-        assertEquals(expected.size(), families.size());
+        assertThat(expected).hasSize(families.size());
         licenses = underTest.getLicenses(LicenseFilter.approved);
-        assertEquals(expected.size(), licenses.size());
-
+        assertThat(expected).hasSize(licenses.size());
 
         cats[0] = "TheCa";
         underTest.removeApprovedLicenseCategories(Arrays.asList(cats));
         expected.removeAll(Arrays.asList(cats));
         result = underTest.getApprovedLicenseCategories();
-        assertEquals(expected.size(), result.size());
-        assertTrue(result.containsAll(expected));
+        assertThat(expected).hasSize(result.size()).containsAll(result);
         families = underTest.getLicenseFamilies(LicenseFilter.approved);
-        assertEquals(expected.size(), families.size());
+        assertThat(expected).hasSize(families.size());
         licenses = underTest.getLicenses(LicenseFilter.approved);
-        assertEquals(expected.size(), licenses.size());    }
+        assertThat(expected).hasSize(licenses.size());    }
 
     @Test
     public void testRemoveBeforeAddApproveLicenseCategories() {
         underTest.addLicense( new TestingLicense("TheCat"));
-        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
-        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
+        assertThat(underTest.getApprovedLicenseCategories()).isEmpty();
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.approved)).isEmpty();
+        assertThat(underTest.getLicenses(LicenseFilter.approved)).isEmpty();
         
         underTest.removeApprovedLicenseCategory("TheCat");
-        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
-        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
+        assertThat(underTest.getApprovedLicenseCategories()).isEmpty();
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.approved)).isEmpty();
+        assertThat(underTest.getLicenses(LicenseFilter.approved)).isEmpty();
 
         underTest.addApprovedLicenseCategory("TheCat");
-        assertTrue(underTest.getApprovedLicenseCategories().isEmpty());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
-        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
+        assertThat(underTest.getApprovedLicenseCategories()).isEmpty();
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.approved)).isEmpty();
+        assertThat(underTest.getLicenses(LicenseFilter.approved)).isEmpty();
     }
 
     private ILicense testingLicense(String category, String name) {
@@ -157,158 +150,169 @@ private ILicense testingLicense(String category, String name) {
     public void testAddLicense() {
 
         List<ILicense> expected = new ArrayList<>();
-        assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());
+        assertThat(underTest.getLicenses(LicenseFilter.all)).isEmpty();
 
         ILicense lic1 = testingLicense("TheCat", "TheName");
         expected.add(lic1);
         underTest.addLicense(lic1);
         SortedSet<ILicense> result = underTest.getLicenses(LicenseFilter.all);
-        assertEquals(expected.size(), result.size());
-        assertTrue(result.containsAll(expected));
+        assertThat(expected).hasSize(result.size()).containsAll(result);
 
         ILicense[] lics = { testingLicense("Spot", "Data's cat"), testingLicense("Felix", "Cartoon cat") };
         expected.addAll(Arrays.asList(lics));
         underTest.addLicenses(Arrays.asList(lics));
         result = underTest.getLicenses(LicenseFilter.all);
-        assertEquals(expected.size(), result.size());
-        assertTrue(result.containsAll(expected));
+        assertThat(expected).hasSize(result.size()).containsAll(result);
     }
 
     @Test
     public void copyrightMessageTest() {
-        assertNull(underTest.getCopyrightMessage());
+        assertThat(underTest.getCopyrightMessage()).isNull();
         underTest.setCopyrightMessage("This is the message");
-        assertEquals("This is the message", underTest.getCopyrightMessage());
+        assertThat(underTest.getCopyrightMessage()).isEqualTo("This is the message");
     }
 
     @Test
     public void inputFileFilterTest() {
         FilenameFilter filter = mock(FilenameFilter.class);
-        assertNull(underTest.getInputFileFilter());
+        assertThat(underTest.getInputFileFilter()).isNull();
         underTest.setInputFileFilter(filter);
-        assertEquals(filter, underTest.getInputFileFilter());
+        assertThat(underTest.getInputFileFilter()).isEqualTo(filter);
+    }
+
+    @Test
+    public void directoryFilterTest() {
+        assertThat(underTest.getDirectoryFilter()).isNotNull();
+        assertThat(underTest.getDirectoryFilter()).isExactlyInstanceOf(NameBasedHiddenFileFilter.class);
+
+        underTest.setDirectoryFilter(DirectoryFileFilter.DIRECTORY);
+        underTest.addDirectoryFilter(NameBasedHiddenFileFilter.HIDDEN);
+        assertThat(underTest.getDirectoryFilter()).isExactlyInstanceOf(AndFileFilter.class);
+
+        underTest.setDirectoryFilter(null);
+        assertThat(underTest.getDirectoryFilter()).isExactlyInstanceOf(FalseFileFilter.class);
     }
 
     @Test
     public void licenseFamiliesTest() {
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.all).isEmpty());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.all)).isEmpty();
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.approved)).isEmpty();
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.none)).isEmpty();
 
         ILicense[] lics = { testingLicense("TheCat", "TheName"), testingLicense("Spot", "Data's cat"),
                 testingLicense("Felix", "Cartoon cat") };
         underTest.addLicenses(Arrays.asList(lics));
 
-        assertEquals(lics.length, underTest.getLicenseFamilies(LicenseFilter.all).size());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.approved).isEmpty());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.all)).hasSize(lics.length);
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.approved)).isEmpty();
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.none)).isEmpty();
 
         underTest.addApprovedLicenseCategory(lics[1].getLicenseFamily());
-        assertEquals(lics.length, underTest.getLicenseFamilies(LicenseFilter.all).size());
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.all)).hasSize(lics.length);
         SortedSet<ILicenseFamily> result = underTest.getLicenseFamilies(LicenseFilter.approved);
-        assertEquals(1, result.size());
-        assertEquals(lics[1].getLicenseFamily(), result.first());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+        assertThat(result).hasSize(1);
+        assertThat(result.first()).isEqualTo(lics[1].getLicenseFamily());
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.none)).isEmpty();
     }
 
     @Test
     public void licensesTest() {
-        assertTrue(underTest.getLicenses(LicenseFilter.all).isEmpty());
-        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
-        assertTrue(underTest.getLicenses(LicenseFilter.none).isEmpty());
+        assertThat(underTest.getLicenses(LicenseFilter.all)).isEmpty();
+        assertThat(underTest.getLicenses(LicenseFilter.approved)).isEmpty();
+        assertThat(underTest.getLicenses(LicenseFilter.none)).isEmpty();
 
         ILicense[] lics = { testingLicense("TheCat", "TheName"), testingLicense("Spot", "Data's cat"),
                 testingLicense("Felix", "Cartoon cat") };
         underTest.addLicenses(Arrays.asList(lics));
 
-        assertEquals(lics.length, underTest.getLicenses(LicenseFilter.all).size());
-        assertTrue(underTest.getLicenses(LicenseFilter.approved).isEmpty());
-        assertTrue(underTest.getLicenses(LicenseFilter.none).isEmpty());
+        assertThat(underTest.getLicenses(LicenseFilter.all)).hasSize(lics.length);
+        assertThat(underTest.getLicenses(LicenseFilter.approved)).isEmpty();
+        assertThat(underTest.getLicenses(LicenseFilter.none)).isEmpty();
 
         underTest.addApprovedLicenseCategory(lics[1].getLicenseFamily());
-        assertEquals(lics.length, underTest.getLicenses(LicenseFilter.all).size());
+        assertThat(underTest.getLicenses(LicenseFilter.all)).hasSize(lics.length);
         SortedSet<ILicense> result = underTest.getLicenses(LicenseFilter.approved);
-        assertEquals(1, result.size());
-        assertEquals(lics[1], result.first());
-        assertTrue(underTest.getLicenseFamilies(LicenseFilter.none).isEmpty());
+        assertThat(result).hasSize(1);
+        assertThat(result.first()).isEqualTo(lics[1]);
+        assertThat(underTest.getLicenseFamilies(LicenseFilter.none)).isEmpty();
     }
 
     @Test
     public void outputTest() throws IOException {
-        assertTrue(underTest.getOutput().get() instanceof NoCloseOutputStream);
-        assertNotNull(underTest.getWriter());
+        assertThat(underTest.getOutput().get()).isExactlyInstanceOf(NoCloseOutputStream.class);
+        assertThat(underTest.getWriter()).isNotNull();
 
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         underTest.setOut(() -> stream);
-        assertEquals(stream, underTest.getOutput().get());
+        assertThat(underTest.getOutput().get()).isEqualTo(stream);
         PrintWriter writer = underTest.getWriter().get();
-        assertNotNull(writer);
+        assertThat(writer).isNotNull();
         writer.write('a');
         writer.flush();
-        assertEquals('a', stream.toByteArray()[0]);
+        assertThat(stream.toByteArray()[0]).isEqualTo((byte) 'a');
     }
 
     @Test
     public void reportableTest() {
-        assertNull(underTest.getReportable());
+        assertThat(underTest.getReportable()).isNull();
         IReportable reportable = mock(IReportable.class);
         underTest.setReportable(reportable);
-        assertEquals(reportable, underTest.getReportable());
+        assertThat(underTest.getReportable()).isEqualTo(reportable);
         underTest.setReportable(null);
-        assertNull(underTest.getReportable());
+        assertThat(underTest.getReportable()).isNull();
     }
 
     @Test
     public void stylesheetTest() throws IOException, URISyntaxException {
         URL url = this.getClass().getResource("ReportConfigurationTestFile");
 
-        assertNull(underTest.getStyleSheet());
+        assertThat(underTest.getStyleSheet()).isNull();
         InputStream stream = mock(InputStream.class);
         underTest.setStyleSheet(() -> stream);
-        assertEquals(stream, underTest.getStyleSheet().get());
+        assertThat(underTest.getStyleSheet().get()).isEqualTo(stream);
         IOSupplier<InputStream> sup = null;
         underTest.setStyleSheet(sup);
-        assertNull(underTest.getStyleSheet());
+        assertThat(underTest.getStyleSheet()).isNull();
         
         File file = mock(File.class);
         when(file.toURI()).thenReturn(url.toURI());
         underTest.setStyleSheet(file);
         BufferedReader d = new BufferedReader(new InputStreamReader(underTest.getStyleSheet().get()));
-        assertEquals("/*", d.readLine());
-        assertEquals(" * Licensed to the Apache Software Foundation (ASF) under one   *", d.readLine());
+        assertThat(d.readLine()).isEqualTo("/*");
+        assertThat(d.readLine()).isEqualTo(" * Licensed to the Apache Software Foundation (ASF) under one   *");
     }
 
     @Test
     public void testFlags() {
-        assertFalse(underTest.isAddingLicenses());
-        assertFalse(underTest.isAddingLicensesForced());
-        assertTrue(underTest.isStyleReport());
+        assertThat(underTest.isAddingLicenses()).isFalse();
+        assertThat(underTest.isAddingLicensesForced()).isFalse();
+        assertThat(underTest.isStyleReport()).isTrue();
 
         underTest.setAddLicenseHeaders(AddLicenseHeaders.TRUE);
-        assertTrue(underTest.isAddingLicenses());
-        assertFalse(underTest.isAddingLicensesForced());
-        assertTrue(underTest.isStyleReport());
+        assertThat(underTest.isAddingLicenses()).isTrue();
+        assertThat(underTest.isAddingLicensesForced()).isFalse();
+        assertThat(underTest.isStyleReport()).isTrue();
 
         underTest.setAddLicenseHeaders(AddLicenseHeaders.FALSE);
-        assertFalse(underTest.isAddingLicenses());
-        assertFalse(underTest.isAddingLicensesForced());
-        assertTrue(underTest.isStyleReport());
+        assertThat(underTest.isAddingLicenses()).isFalse();
+        assertThat(underTest.isAddingLicensesForced()).isFalse();
+        assertThat(underTest.isStyleReport()).isTrue();
 
         underTest.setAddLicenseHeaders(AddLicenseHeaders.FORCED);
-        assertTrue(underTest.isAddingLicenses());
-        assertTrue(underTest.isAddingLicensesForced());
-        assertTrue(underTest.isStyleReport());
+        assertThat(underTest.isAddingLicenses()).isTrue();
+        assertThat(underTest.isAddingLicensesForced()).isTrue();
+        assertThat(underTest.isStyleReport()).isTrue();
 
         underTest.setAddLicenseHeaders(AddLicenseHeaders.FALSE);
         underTest.setStyleReport(false);
-        assertFalse(underTest.isAddingLicenses());
-        assertFalse(underTest.isAddingLicensesForced());
-        assertFalse(underTest.isStyleReport());
+        assertThat(underTest.isAddingLicenses()).isFalse();
+        assertThat(underTest.isAddingLicensesForced()).isFalse();
+        assertThat(underTest.isStyleReport()).isFalse();
 
         underTest.setStyleReport(true);
-        assertFalse(underTest.isAddingLicenses());
-        assertFalse(underTest.isAddingLicensesForced());
-        assertTrue(underTest.isStyleReport());
+        assertThat(underTest.isAddingLicenses()).isFalse();
+        assertThat(underTest.isAddingLicensesForced()).isFalse();
+        assertThat(underTest.isStyleReport()).isTrue();
     }
 
     @Test
@@ -318,8 +322,8 @@ public void testValidate() {
             underTest.validate(s -> sb.append(s));
             fail("should have thrown ConfigurationException");
         } catch (ConfigurationException e) {
-            assertEquals("Reportable may not be null", e.getMessage());
-            assertEquals(0, sb.length());
+            assertThat(e.getMessage()).isEqualTo("Reportable may not be null");
+            assertThat(sb.length()).isEqualTo(0);
         }
 
         underTest.setReportable(mock(IReportable.class));
@@ -327,8 +331,8 @@ public void testValidate() {
             underTest.validate(s -> sb.append(s));
             fail("should have thrown ConfigurationException");
         } catch (ConfigurationException e) {
-            assertEquals("You must specify at least one license", e.getMessage());
-            assertEquals(0, sb.length());
+            assertThat(e.getMessage()).isEqualTo("You must specify at least one license");
+            assertThat(sb.length()).isEqualTo(0);
         }
 
         underTest.addLicense(testingLicense("valid", "Validation testing license"));
@@ -336,19 +340,19 @@ public void testValidate() {
             underTest.validate(s -> sb.append(s));
             fail("should have thrown ConfigurationException");
         } catch (ConfigurationException e) {
-            assertEquals("Stylesheet must be specified if report styling is selected", e.getMessage());
-            assertEquals(0, sb.length());
+            assertThat(e.getMessage()).isEqualTo("Stylesheet must be specified if report styling is selected");
+            assertThat(sb.length()).isEqualTo(0);
         }
 
         underTest.setStyleSheet(()->mock(InputStream.class));
         underTest.setStyleReport(false);
         underTest.validate(s -> sb.append(s));
-        assertEquals("Ignoring stylesheet because styling is not selected", sb.toString());
+        assertThat(sb.toString()).isEqualTo("Ignoring stylesheet because styling is not selected");
 
         final StringBuilder sb2 = new StringBuilder();
         underTest.setStyleReport(true);
         underTest.validate(s -> sb2.append(s));
-        assertEquals(0, sb2.length());
+        assertThat(sb2.length()).isEqualTo(0);
     }
     
     @Test
@@ -356,15 +360,15 @@ public void testSetOut() throws IOException {
         ReportConfiguration config = new ReportConfiguration();
         OutputStreamIntercepter osi = new OutputStreamIntercepter();
         config.setOut(() -> osi);
-        assertEquals( 0, osi.closeCount);
+        assertThat(osi.closeCount).isEqualTo(0);
         try (OutputStream os = config.getOutput().get()) {
-            assertEquals( 0, osi.closeCount);
+            assertThat(osi.closeCount).isEqualTo(0);
         }
-        assertEquals( 1, osi.closeCount);
+        assertThat(osi.closeCount).isEqualTo(1);
         try (OutputStream os = config.getOutput().get()) {
-            assertEquals( 1, osi.closeCount);
+            assertThat(osi.closeCount).isEqualTo(1);
         }
-        assertEquals( 2, osi.closeCount);
+        assertThat(osi.closeCount).isEqualTo(2);
     }
     
     /**
@@ -380,9 +384,9 @@ public static void validateDefaultApprovedLicenses(ReportConfiguration config) {
      * @param config The configuration to test.
      */
     public static void validateDefaultApprovedLicenses(ReportConfiguration config, int additionalIdCount) {
-        assertEquals("Wrong number of approved licenses", ConfigurationReaderTest.EXPECTED_IDS.length+additionalIdCount,config.getApprovedLicenseCategories().size());
+        assertThat(config.getApprovedLicenseCategories()).hasSize(ConfigurationReaderTest.EXPECTED_IDS.length + additionalIdCount);
         for (String s : ConfigurationReaderTest.EXPECTED_IDS) {
-            assertTrue("Missing apporved license category "+s, config.getApprovedLicenseCategories().contains(ILicenseFamily.makeCategory(s)));
+            assertThat(config.getApprovedLicenseCategories()).contains(ILicenseFamily.makeCategory(s));
         }
     }
     
@@ -392,12 +396,12 @@ public static void validateDefaultApprovedLicenses(ReportConfiguration config, i
      * @param config the configuration to test.
      */
     public static void validateDefaultLicenseFamilies(ReportConfiguration config, String...additionalIds) {
-        assertEquals("wrong number of license families",ConfigurationReaderTest.EXPECTED_IDS.length+additionalIds.length,config.getFamilies().size());
+        assertThat(config.getFamilies()).hasSize(ConfigurationReaderTest.EXPECTED_IDS.length + additionalIds.length);
         List<String> expected = new ArrayList<>();
         expected.addAll(Arrays.asList(ConfigurationReaderTest.EXPECTED_IDS));
         expected.addAll(Arrays.asList(additionalIds));
         for (ILicenseFamily family : config.getFamilies()) {
-            assertTrue("Missing license family "+family.getFamilyCategory(),  expected.contains(family.getFamilyCategory().trim()));
+            assertThat(expected).contains(family.getFamilyCategory().trim());
         }
     }
 
@@ -406,12 +410,12 @@ public static void validateDefaultLicenseFamilies(ReportConfiguration config, St
      * @param config the configuration to test.
      */
     public static void validateDefaultLicenses(ReportConfiguration config, String...additionalLicenses) {
-        assertEquals("wrong number of licenses", ConfigurationReaderTest.EXPECTED_LICENSES.length+additionalLicenses.length, config.getLicenses(LicenseFilter.all).size());
+        assertThat(config.getLicenses(LicenseFilter.all)).hasSize(ConfigurationReaderTest.EXPECTED_LICENSES.length + additionalLicenses.length);
         List<String> expected = new ArrayList<>();
         expected.addAll(Arrays.asList(ConfigurationReaderTest.EXPECTED_LICENSES));
         expected.addAll(Arrays.asList(additionalLicenses));
         for (ILicense license : config.getLicenses(LicenseFilter.all)) {
-            assertTrue("Missing license "+license.getId(), expected.contains(license.getId()));
+            assertThat(expected).contains(license.getId());
         }
     }
     
@@ -421,12 +425,14 @@ public static void validateDefaultLicenses(ReportConfiguration config, String...
      */
     public static void validateDefault(ReportConfiguration config) {
         //config.validate( System.err::println );
-        assertFalse("Adding licenses should be false", config.isAddingLicenses());
-        assertFalse("forced licenses should be false",  config.isAddingLicensesForced());
-        assertNull("copyright message should be null", config.getCopyrightMessage());
-        assertNull("Input file filter should be null", config.getInputFileFilter());
-        assertTrue("Style report should be true", config.isStyleReport());
-        assertNotNull("Stylesheet should not be null", config.getStyleSheet());
+        assertThat(config.isAddingLicenses()).isFalse();
+        assertThat(config.isAddingLicensesForced()).isFalse();
+        assertThat(config.getCopyrightMessage()).isNull();
+        assertThat(config.getInputFileFilter()).isNull();
+        assertThat(config.isStyleReport()).isTrue();
+        assertThat(config.getStyleSheet()).isNotNull().withFailMessage("Stylesheet should not be null");
+        assertThat(config.getDirectoryFilter()).isNotNull().withFailMessage("Directory filter should not be null");
+        assertThat(config.getDirectoryFilter()).isExactlyInstanceOf(NameBasedHiddenFileFilter.class);
         
         validateDefaultApprovedLicenses(config);
         validateDefaultLicenseFamilies(config);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 157bb54f8..e9067c10b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -26,13 +26,11 @@
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.List;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index dd15ad1e6..ed3d96f9a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -30,6 +30,7 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 
+import org.apache.commons.io.filefilter.HiddenFileFilter;
 import org.apache.rat.test.utils.Resources;
 import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.walker.DirectoryWalker;
@@ -51,7 +52,7 @@ public void xmlReportTest() throws Exception {
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setStyleReport(false);
         configuration.setFrom(defaults);
-        configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
+        configuration.setReportable(new DirectoryWalker(new File(elementsPath), HiddenFileFilter.HIDDEN));
         configuration.setOut(() -> out);
         Reporter.report(configuration);
         Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
@@ -91,7 +92,7 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setFrom(defaults);
-        configuration.setReportable(new DirectoryWalker(new File(elementsPath)));
+        configuration.setReportable(new DirectoryWalker(new File(elementsPath), HiddenFileFilter.HIDDEN));
         configuration.setOut(() -> out);
         Reporter.report(configuration);
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index a422ed3d2..c1113d755 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -29,6 +29,7 @@
 import java.io.StringWriter;
 import java.util.regex.Pattern;
 
+import org.apache.commons.io.filefilter.HiddenFileFilter;
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.ReportConfiguration;
 import org.apache.rat.analysis.IHeaderMatcher.State;
@@ -76,7 +77,7 @@ public void standardReport() throws Exception {
         
         final TestingLicense testingLicense = new TestingLicense(new TestingMatcher(true), family);
 
-        DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY);
+        DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY, HiddenFileFilter.HIDDEN);
         final ClaimStatistic statistic = new ClaimStatistic();
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.addLicense(testingLicense);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index ae0dd6857..8f5ad0875 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -33,6 +33,7 @@
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathFactory;
 
+import org.apache.commons.io.filefilter.HiddenFileFilter;
 import org.apache.rat.analysis.DefaultAnalyserFactory;
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.matchers.CopyrightMatcher;
@@ -88,7 +89,7 @@ private void report(DirectoryWalker directory) throws Exception {
     @Test
     public void baseReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE);
+        DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE, HiddenFileFilter.HIDDEN);
         report.startReport();
         report(directory);
         report.endReport();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
new file mode 100644
index 000000000..151df3468
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
+package org.apache.rat.walker;
+
+import org.apache.commons.io.filefilter.FalseFileFilter;
+import org.apache.commons.io.filefilter.HiddenFileFilter;
+import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.report.RatReport;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.attribute.DosFileAttributeView;
+import java.nio.file.attribute.DosFileAttributes;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DirectoryWalkerTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Test
+    public void walk() throws IOException, RatException {
+        File toWalk = folder.newFolder("test");
+        File regular = new File(toWalk, "regular");
+        regular.mkdir();
+        File regularFile = new File(regular, "test");
+        try (FileWriter writer = new FileWriter(regularFile)) {
+            writer.write("test");
+            writer.flush();
+        }
+
+        File hidden = new File(toWalk, ".hidden");
+        hidden.mkdir();
+        File hiddenFile = new File(hidden, "test");
+
+        try (FileWriter writer = new FileWriter(hiddenFile)) {
+            writer.write("test");
+            writer.flush();
+        }
+
+        DirectoryWalker walker = new DirectoryWalker(toWalk, NameBasedHiddenFileFilter.HIDDEN);
+        List<String> scanned = new ArrayList<>();
+        walker.run(new TestRatReport(scanned));
+
+        Assert.assertEquals(1, scanned.size());
+
+        walker = new DirectoryWalker(toWalk, FalseFileFilter.FALSE);
+        scanned = new ArrayList<>();
+        walker.run(new TestRatReport(scanned));
+
+        Assert.assertEquals(2, scanned.size());
+    }
+
+    class TestRatReport implements RatReport {
+
+        private List<String> scanned;
+
+        public TestRatReport(List<String> scanned) {
+            this.scanned = scanned;
+        }
+
+        @Override
+        public void startReport() {
+            // no-op
+        }
+
+        @Override
+        public void report(Document document) throws RatException {
+            scanned.add(document.getName());
+        }
+
+        @Override
+        public void endReport() {
+            // no-op
+        }
+
+    }
+
+}
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index f7e07e5c4..9d5169589 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -278,6 +278,11 @@
       <version>3.3.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index a28df5608..80f3190c1 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -46,6 +46,9 @@ public class RatCheckMojo extends AbstractRatMojo {
     @Parameter(property = "rat.outputFile", defaultValue = "${project.build.directory}/rat.txt")
     private File reportFile;
 
+    @Parameter(property = "rat.scanHiddenDirectories", defaultValue = "false")
+    private boolean scanHiddenDirectories;
+
     /**
      * Output style of the report. Use "plain" (the default) for a plain text report
      * or "xml" for the raw XML report. Alternatively you can give the path of an
@@ -169,6 +172,9 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
         if (StringUtils.isNotBlank(copyrightMessage)) {
             configuration.setCopyrightMessage(copyrightMessage);
         }
+        if (scanHiddenDirectories) {
+            configuration.setDirectoryFilter(null);
+        }
         if (reportFile != null) {
             if (!reportFile.exists()) {
                 reportFile.getParentFile().mkdirs();
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index da8532fbe..414be753f 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -43,6 +43,11 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
diff --git a/apache-rat/README-CLI.txt b/apache-rat/README-CLI.txt
index ad6eb331e..225034e25 100644
--- a/apache-rat/README-CLI.txt
+++ b/apache-rat/README-CLI.txt
@@ -44,7 +44,7 @@ java -jar apache-rat-${project.version}.jar
 Command Line Options
 ====================
 
-usage: java -jar apache-rat/target/apache-rat-{project.version}.jar
+usage: java -jar apache-rat/target/apache-rat-${project.version}.jar
             [options] [DIR|TARBALL]
 
 Available options
@@ -86,6 +86,7 @@ Available options
                                 report (default is System.out)
  -s,--stylesheet <arg>          XSLT stylesheet to use when creating the
                                 report.  Not compatible with -x
+    --scan-hidden-directories   Scan hidden directories
  -x,--xml                       Output the report in raw XML format.  Not
                                 compatible with -s
 
diff --git a/apache-rat/src/site/apt/index.apt.vm b/apache-rat/src/site/apt/index.apt.vm
index 0813a0fa2..53348ab90 100644
--- a/apache-rat/src/site/apt/index.apt.vm
+++ b/apache-rat/src/site/apt/index.apt.vm
@@ -117,6 +117,7 @@ Available options
                                 report (default is System.out)
  -s,--stylesheet <arg>          XSLT stylesheet to use when creating the
                                 report.  Not compatible with -x
+    --scan-hidden-directories   Scan hidden directories
  -x,--xml                       Output the report in raw XML format.  Not
                                 compatible with -s
 +------------------------------------------+
diff --git a/pom.xml b/pom.xml
index c2d73b0dd..e49a42ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,12 @@ agnostic home for software distribution comprehension and audit tools.
         <artifactId>maven-plugin-annotations</artifactId>
         <version>${mavenPluginPluginVersion}</version>
       </dependency>
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>3.24.2</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <reporting>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7a8e8c433..08f1bff43 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-322" type="add" dev="pottlinger" due-to="Jean-Baptiste Onofré">
+        Add configuration to scan hidden directories, include --scan-hidden-directories option on the command line, scanHiddenDirectories parameter on Maven plugin.
+      </action>
       <action issue="RAT-320" type="add" dev="pottlinger" due-to="Jean-Baptiste Onofré">
          Add new command line option -o/--output to write RAT's output to a file.
       </action>

From 93955452b3157953eacc689c0822a005c3aab59a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 29 Nov 2023 22:09:54 +0100
Subject: [PATCH 174/299] RAT-322: Adapt changelog entry for configuration
 option to scan hidden files

---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 08f1bff43..f32c7621d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -61,7 +61,7 @@ The <action> type attribute can be add,update,fix,remove.
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
       <action issue="RAT-322" type="add" dev="pottlinger" due-to="Jean-Baptiste Onofré">
-        Add configuration to scan hidden directories, include --scan-hidden-directories option on the command line, scanHiddenDirectories parameter on Maven plugin.
+        Add configuration option to scan hidden directories: --scan-hidden-directories on the command line and scanHiddenDirectories as a Maven plugin parameter.
       </action>
       <action issue="RAT-320" type="add" dev="pottlinger" due-to="Jean-Baptiste Onofré">
          Add new command line option -o/--output to write RAT's output to a file.

From 25e33f22669caaca8a746b9b2a0147b13e28e0c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2023 00:48:36 +0000
Subject: [PATCH 175/299] Bump actions/setup-java from 3.13.0 to 4.0.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.13.0 to 4.0.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.13.0...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2c19aa520..3c66d5b40 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}

From 482767c8d847370f5b11e58cf2383bed64a7476c Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 5 Dec 2023 13:36:20 +0100
Subject: [PATCH 176/299] RAT-335: Add changelog for new .gitignore parsing in
 RAT

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f32c7621d..3683c4082 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-335" type="add" dev="pottlinger" due-to="Niels Basjes">
+        Enhance .gitignore handling; support multiple .gitignore files and allow a more complete parsing of Git's ignore files.
+      </action>
       <action issue="RAT-322" type="add" dev="pottlinger" due-to="Jean-Baptiste Onofré">
         Add configuration option to scan hidden directories: --scan-hidden-directories on the command line and scanHiddenDirectories as a Maven plugin parameter.
       </action>

From b49ead719c9ff219251c7b9910ee87002a93387e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:13:40 +0000
Subject: [PATCH 177/299] Bump org.slf4j:slf4j-simple from 1.7.36 to 2.0.9

Bumps org.slf4j:slf4j-simple from 1.7.36 to 2.0.9.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 95a3bdfc3..1218d9f2b 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -297,7 +297,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.36</version>
+      <version>2.0.9</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 4a134fa888fb24ae519ac4bad602bc1e58135862 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 00:42:32 +0000
Subject: [PATCH 178/299] Bump org.apache.maven.plugins:maven-pmd-plugin from
 3.20.0 to 3.21.2

Bumps [org.apache.maven.plugins:maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.20.0 to 3.21.2.
- [Release notes](https://github.com/apache/maven-pmd-plugin/releases)
- [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.20.0...maven-pmd-plugin-3.21.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-pmd-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 115be97eb..ddcc8e062 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
-    <mavenPmdPluginVersion>3.20.0</mavenPmdPluginVersion>
+    <mavenPmdPluginVersion>3.21.2</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
     <previousRatVersion>0.16</previousRatVersion>
     <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>

From 45c3c6aac2fd835ff5c5062099b113a6d9c31172 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 00:43:07 +0000
Subject: [PATCH 179/299] Bump org.apache.maven.plugins:maven-dependency-plugin

Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.0 to 3.6.1.
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 115be97eb..06d20ff74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.6.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 590cf83af971fa1bdf4c5d39d33dd4cb2aa12490 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 00:43:10 +0000
Subject: [PATCH 180/299] Bump org.apache.commons:commons-compress from 1.24.0
 to 1.25.0

Bumps org.apache.commons:commons-compress from 1.24.0 to 1.25.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 115be97eb..279403051 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.24.0</version>
+        <version>1.25.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>

From 77ad15a61ea25e4b1525ad038f7ccd1a2f001acb Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 8 Dec 2023 23:07:38 +0100
Subject: [PATCH 181/299] Bulk refresh for plugin

Refresh deps but also code.
---
 .../main/java/org/apache/rat/Defaults.java    | 12 ++------
 .../src/main/java/org/apache/rat/Report.java  | 17 ++++++-----
 .../org/apache/rat/ReportConfiguration.java   | 22 +++++++-------
 .../rat/analysis/DefaultAnalyserFactory.java  |  4 +--
 .../apache/rat/analysis/IHeaderMatcher.java   |  2 +-
 .../rat/analysis/LicenseCollection.java       |  4 +--
 .../matchers/AbstractHeaderMatcher.java       |  2 +-
 .../matchers/AbstractMatcherContainer.java    |  2 +-
 .../analysis/matchers/CopyrightMatcher.java   |  4 +--
 .../analysis/matchers/FullTextMatcher.java    |  8 ++---
 .../analysis/matchers/SimpleRegexMatcher.java |  2 +-
 .../analysis/matchers/SimpleTextMatcher.java  |  2 +-
 .../annotation/AbstractLicenseAppender.java   |  4 +--
 .../org/apache/rat/config/ReportFormat.java   |  2 +-
 .../config/SourceCodeManagementSystems.java   |  2 +-
 .../org/apache/rat/configuration/Format.java  |  4 +--
 .../configuration/MatcherBuilderTracker.java  |  4 +--
 .../configuration/XMLConfigurationReader.java |  8 ++---
 .../builders/ChildContainerBuilder.java       |  5 ++--
 .../configuration/builders/NotBuilder.java    |  2 +-
 .../rat/document/ToNameTransformer.java       |  6 ++--
 .../document/impl/guesser/ArchiveGuesser.java |  4 +--
 .../document/impl/guesser/BinaryGuesser.java  | 30 ++++++++-----------
 .../rat/document/impl/guesser/GuessUtils.java |  2 +-
 .../document/impl/guesser/NoteGuesser.java    |  4 +--
 .../java/org/apache/rat/license/ILicense.java |  4 +--
 .../apache/rat/license/ILicenseFamily.java    |  2 +-
 .../rat/license/LicenseFamilySetFactory.java  |  2 +-
 .../apache/rat/license/LicenseSetFactory.java |  2 +-
 .../rat/license/SimpleLicenseFamily.java      |  4 +--
 .../org/apache/rat/policy/DefaultPolicy.java  |  4 +--
 .../rat/report/xml/XmlReportFactory.java      |  4 +--
 .../org/apache/rat/walker/ArchiveWalker.java  |  7 +++--
 .../apache/rat/walker/DirectoryWalker.java    |  4 +--
 .../rat/walker/NameBasedHiddenFileFilter.java |  5 +---
 .../java/org/apache/rat/walker/Walker.java    | 16 +++++-----
 apache-rat-plugin/pom.xml                     |  2 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    | 14 ++++-----
 .../main/java/org/apache/rat/mp/Family.java   |  2 +-
 .../org/apache/rat/mp/FilesReportable.java    |  8 ++---
 .../main/java/org/apache/rat/mp/License.java  |  2 +-
 .../java/org/apache/rat/mp/RatCheckMojo.java  |  5 ++--
 .../apache/rat/mp/util/ExclusionHelper.java   |  2 --
 .../java/org/apache/rat/anttasks/All.java     |  2 +-
 .../java/org/apache/rat/anttasks/Any.java     |  2 +-
 .../org/apache/rat/anttasks/Copyright.java    |  2 +-
 .../java/org/apache/rat/anttasks/Family.java  |  2 +-
 .../java/org/apache/rat/anttasks/License.java |  2 +-
 .../java/org/apache/rat/anttasks/Not.java     |  2 +-
 .../java/org/apache/rat/anttasks/Regex.java   |  2 +-
 .../java/org/apache/rat/anttasks/Report.java  |  8 ++---
 .../anttasks/ResourceCollectionContainer.java |  2 +-
 .../java/org/apache/rat/anttasks/Spdx.java    |  2 +-
 .../java/org/apache/rat/anttasks/Text.java    |  2 +-
 pom.xml                                       | 21 ++++++-------
 55 files changed, 140 insertions(+), 156 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 84885c366..686823189 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -55,7 +55,7 @@ public class Defaults {
      */
     public static final String UNAPPROVED_LICENSES_STYLESHEET = "org/apache/rat/unapproved-licenses.xsl";
 
-    private LicenseSetFactory setFactory;
+    private final LicenseSetFactory setFactory;
     
     /**
      * Initialize the system configuration reader..
@@ -90,7 +90,7 @@ private static LicenseSetFactory readConfigFiles(Collection<URL> urls) {
 
         SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
 
-        SortedSet<String> approvedLicenseIds = new TreeSet<String>();
+        SortedSet<String> approvedLicenseIds = new TreeSet<>();
 
         for (URL url : urls) {
             Format fmt = Format.fromURL(url);
@@ -147,13 +147,7 @@ public SortedSet<String> getLicenseIds(LicenseFilter filter) {
      * The Defaults builder.
      */
     public static class Builder {
-        private Set<URL> fileNames = new TreeSet<>(new Comparator<URL>() {
-
-            @Override
-            public int compare(URL url1, URL url2) {
-                return url1.toString().compareTo(url2.toString());
-            }
-        });
+        private final Set<URL> fileNames = new TreeSet<>(Comparator.comparing(URL::toString));
 
         private Builder() {
             fileNames.add(DEFAULT_CONFIG_URL);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index e94bb31d4..bb72df175 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -19,12 +19,13 @@
 package org.apache.rat;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Serializable;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -128,10 +129,10 @@ public class Report {
      * @param args the arguments.
      * @throws Exception on error.
      */
-    public static final void main(String[] args) throws Exception {
+    public static void main(String[] args) throws Exception {
         Options opts = buildOptions();
 
-        CommandLine cl = null;
+        CommandLine cl;
         try {
             cl = new DefaultParser().parse(opts, args);
         } catch (ParseException e) {
@@ -151,7 +152,7 @@ public static final void main(String[] args) throws Exception {
             printUsage(opts);
         } else {
             ReportConfiguration configuration = createConfiguration(args[0],cl);
-            configuration.validate(s -> System.err.println(s));
+            configuration.validate(System.err::println);
 
             if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
                 listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
@@ -189,7 +190,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
             String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
             if (excludeFileName != null) {
                 final FilenameFilter filter = parseExclusions(
-                        FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
+                        FileUtils.readLines(new File(excludeFileName), StandardCharsets.UTF_8));
                 configuration.setInputFileFilter(filter);
             }
         }
@@ -204,7 +205,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
                     System.err.println("please specify a single stylesheet");
                     System.exit(1);
                 }
-                configuration.setStyleSheet(() -> new FileInputStream(style[0]));
+                configuration.setStyleSheet(() -> Files.newInputStream(Paths.get(style[0])));
             }
         }
 
@@ -231,7 +232,7 @@ private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, Prin
 
     private static void listLicenses(SortedSet<ILicense> licenses, PrintStream out) {
         out.println("Licenses:");
-        licenses.stream().forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
+        licenses.forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
                 lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
         out.println();
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index bca38e2cb..f02a60f92 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -29,7 +29,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
@@ -38,7 +38,6 @@
 import java.util.function.Consumer;
 
 import org.apache.commons.io.filefilter.FalseFileFilter;
-import org.apache.commons.io.filefilter.HiddenFileFilter;
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.config.AddLicenseHeaders;
@@ -56,10 +55,10 @@
  * configuration and invoke the {@link Reporter}.
  */
 public class ReportConfiguration {
-    private SortedSet<ILicenseFamily> families = LicenseFamilySetFactory.emptyLicenseFamilySet();
-    private SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
-    private SortedSet<String> approvedLicenseCategories = new TreeSet<>();
-    private SortedSet<String> removedLicenseCategories = new TreeSet<>();
+    private final SortedSet<ILicenseFamily> families = LicenseFamilySetFactory.emptyLicenseFamilySet();
+    private final SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
+    private final SortedSet<String> approvedLicenseCategories = new TreeSet<>();
+    private final SortedSet<String> removedLicenseCategories = new TreeSet<>();
     private boolean addingLicenses;
     private boolean addingLicensesForced;
     private String copyrightMessage;
@@ -178,7 +177,7 @@ public void setStyleSheet(URI styleSheet) {
      */
     public void setStyleSheet(URL styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
-        setStyleSheet(() -> styleSheet.openStream());
+        setStyleSheet(styleSheet::openStream);
     }
     
     /**
@@ -236,7 +235,7 @@ public IOSupplier<OutputStream> getOutput() {
      * @see #getOutput()
      */
     public IOSupplier<PrintWriter> getWriter() {
-        return () -> new PrintWriter(new OutputStreamWriter(getOutput().get(), Charset.forName("UTF-8")));
+        return () -> new PrintWriter(new OutputStreamWriter(getOutput().get(), StandardCharsets.UTF_8));
     }
 
     /**
@@ -342,7 +341,7 @@ public void addApprovedLicenseCategory(String familyCategory) {
      * @param approvedLicenseCategories set of approved license categories.
      */
     public void addApprovedLicenseCategories(Collection<String> approvedLicenseCategories) {
-        approvedLicenseCategories.stream().forEach(this::addApprovedLicenseCategory);
+        approvedLicenseCategories.forEach(this::addApprovedLicenseCategory);
     }
 
     /**
@@ -363,7 +362,7 @@ public void removeApprovedLicenseCategory(String familyCategory) {
      * @param familyCategory the family category to remove.
      */
     public void removeApprovedLicenseCategories(Collection<String> familyCategory) {
-        familyCategory.stream().forEach(this::removeApprovedLicenseCategory);
+        familyCategory.forEach(this::removeApprovedLicenseCategory);
     }
 
     /**
@@ -507,10 +506,9 @@ public void validate(Consumer<String> logger) {
      * A wrapper around an output stream that does not close the output stream.
      */
     public static class NoCloseOutputStream extends OutputStream {
-        private OutputStream delegate;
+        private final OutputStream delegate;
 
         public NoCloseOutputStream(OutputStream delegate) {
-            super();
             this.delegate = delegate;
         }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index eaa38c8e8..b81055e73 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -40,8 +40,8 @@ public class DefaultAnalyserFactory {
      * @param licenses The licenses to use in  the Analyser.
      * @return A document analyser that uses the provides licenses.
      */
-    public static final IDocumentAnalyser createDefaultAnalyser(Collection<ILicense> licenses) {
-        if (licenses.size() ==0) {
+    public static IDocumentAnalyser createDefaultAnalyser(Collection<ILicense> licenses) {
+        if (licenses.isEmpty()) {
             throw new ConfigurationException("At least one license must be defined");
         }
         return new DefaultAnalyser(new LicenseCollection(licenses));
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
index 64906580d..a4aacf8f6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java
@@ -45,7 +45,7 @@ public interface IHeaderMatcher {
     enum State {
         t("true"), f("false"), i("indeterminent");
 
-        private String desc;
+        private final String desc;
 
         State(String desc) {
             this.desc = desc;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
index 5bb0a42d7..308f06da4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
@@ -35,7 +35,7 @@ class LicenseCollection extends AbstractMatcherContainer implements ILicense {
 
     private static final ILicenseFamily DEFAULT = ILicenseFamily.builder().setLicenseFamilyCategory("Dummy")
             .setLicenseFamilyName("HeaderMatcherCollection default license family").build();
-    private Collection<ILicense> enclosed;
+    private final Collection<ILicense> enclosed;
     private ILicense matchingLicense;
     private State lastState;
 
@@ -57,7 +57,7 @@ public String getId() {
 
     @Override
     public void reset() {
-        enclosed.stream().forEach(ILicense::reset);
+        enclosed.forEach(ILicense::reset);
         this.lastState = State.i;
         this.matchingLicense = null;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
index 7559bf66e..64e2cc696 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractHeaderMatcher.java
@@ -28,7 +28,7 @@
  */
 public abstract class AbstractHeaderMatcher implements IHeaderMatcher {
 
-    private String id;
+    private final String id;
 
     /**
      * Constructs the IHeaderMatcher with an id value.  If {@code id} is null then a unique random id is created.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
index 92eeb8fe3..d15dd4258 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/AbstractMatcherContainer.java
@@ -57,7 +57,7 @@ public AbstractMatcherContainer(Collection<? extends IHeaderMatcher> enclosed) {
 
     @Override
     public void reset() {
-        enclosed.stream().forEach(x -> x.reset());
+        enclosed.forEach(IHeaderMatcher::reset);
     }
 
     @Override
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index d9fb3899a..43e960e9c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -115,9 +115,7 @@ protected boolean doMatch(String line) {
             }
             if (ownerDatePattern != null) {
                 matcher = ownerDatePattern.matcher(buffer);
-                if (matcher.find() && matcher.start() == 0) {
-                    return true;
-                }
+                return matcher.find() && matcher.start() == 0;
             }
         }
         return false;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
index 11621d641..ece1118f1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -36,11 +36,11 @@ public class FullTextMatcher extends AbstractSimpleMatcher {
     // Number of match characters assumed to be present on first line
     private static final int DEFAULT_INITIAL_LINE_LENGTH = 20;
 
-    private String fullText;
+    private final String fullText;
 
-    private String firstLine;
+    private final String firstLine;
 
-    private boolean seenFirstLine = false;
+    private boolean seenFirstLine;
 
     private final StringBuilder buffer = new StringBuilder();
 
@@ -76,7 +76,7 @@ public FullTextMatcher(String id, String fullText) {
      * @param text The text to remove extra chars from.
      * @return the pruned text.
      */
-    public static final String prune(String text) {
+    public static String prune(String text) {
         final int length = text.length();
         final StringBuilder buffer = new StringBuilder(length);
         for (int i = 0; i < length; i++) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
index abe2362d6..641f7ab43 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleRegexMatcher.java
@@ -24,7 +24,7 @@
  * A simple regular expression matching IHeaderMatcher
  */
 public class SimpleRegexMatcher extends AbstractSimpleMatcher {
-    private Pattern pattern;
+    private final Pattern pattern;
 
     /**
      * Constructs a regex pattern matcher with a unique random id and the specified Regex pattern.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
index 75afd8ac1..f7ae6ef90 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SimpleTextMatcher.java
@@ -24,7 +24,7 @@
  * A simple text matching IHeaderMatcher implementation.
  */
 public class SimpleTextMatcher extends AbstractSimpleMatcher {
-    private String pattern;
+    private final String pattern;
 
     /**
      * Constructs the simple text matcher for the simple string.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
index 3950c4579..e10747be2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
@@ -77,7 +77,7 @@ public abstract class AbstractLicenseAppender {
     /**
      * the line separator for this OS
      */
-    private static final String LINE_SEP = System.getProperty("line.separator");
+    private static final String LINE_SEP = System.lineSeparator();
 
     private static final int[] FAMILY_C = new int[]{
             TYPE_JAVA, TYPE_JAVASCRIPT, TYPE_C, TYPE_H, TYPE_SCALA,
@@ -299,7 +299,7 @@ private boolean attachLicense(Writer writer, File document,
                     doFirstLine(document, writer, line, "@echo");
                 } else if (first && expectsMSVSSF) {
                     written = true;
-                    if ("".equals(line)) {
+                    if (line.isEmpty()) {
                         line = passThroughReadNext(writer, line, br);
                     }
                     if (line.startsWith("Microsoft Visual Studio Solution"
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java b/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
index 6215585db..cd915be8f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
@@ -25,6 +25,6 @@ public enum ReportFormat {
     XML;
 
     public boolean is(String optionGiven) {
-        return optionGiven != null && optionGiven.length() != 0 && name().equalsIgnoreCase(optionGiven);
+        return optionGiven != null && !optionGiven.isEmpty() && name().equalsIgnoreCase(optionGiven);
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java b/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
index 908ec8291..71973d3b1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
@@ -74,7 +74,7 @@ public List<String> getExclusions() {
     }
 
     public boolean hasIgnoreFile() {
-        return ignoreFile != null && ignoreFile.length() != 0;
+        return ignoreFile != null && !ignoreFile.isEmpty();
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index 95f9d89e2..a25797efd 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -37,7 +37,7 @@ public enum Format {
     /** A plain text file */
     TXT(null, "txt", "text");
 
-    private String[] suffix;
+    private final String[] suffix;
 
     private Constructor<MatcherReader> matcherReader;
     private Constructor<LicenseReader> licenseReader;
@@ -92,7 +92,7 @@ public static Format fromName(String name) {
         String[] parts = name.split("\\.");
         String suffix = parts[parts.length - 1];
         for (Format f : Format.values()) {
-            if (Arrays.stream(f.suffix).anyMatch(suffix::equals)) {
+            if (Arrays.asList(f.suffix).contains(suffix)) {
                 return f;
             }
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
index 95f9bfe38..447ad82e3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherBuilderTracker.java
@@ -65,9 +65,9 @@ public static AbstractBuilder getMatcherBuilder(String name) {
         Class<? extends AbstractBuilder> clazz = instance().matcherBuilders.get(name);
         if (clazz == null) {
             StringBuilder sb = new StringBuilder("\nValid builders\n");
-            instance().matcherBuilders.keySet().stream().forEach(x -> sb.append(x).append("\n"));
+            instance().matcherBuilders.keySet().forEach(x -> sb.append(x).append("\n"));
             sb.append("ERROR MSG\n");
-            throw new ConfigurationException(sb.append("No matcher builder named " + name).toString());
+            throw new ConfigurationException(sb.append("No matcher builder named ").append(name).toString());
         }
         try {
             return clazz.getConstructor().newInstance();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index b73dc4e67..b05711b07 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
@@ -307,9 +307,9 @@ public SortedSet<ILicense> readLicenses() {
     public SortedSet<ILicenseFamily> readFamilies() {
         if (licenseFamilies.isEmpty()) {
             nodeListConsumer(document.getElementsByTagName(FAMILIES),
-                    x -> nodeListConsumer(x.getChildNodes(), y -> parseFamily(y)));
+                    x -> nodeListConsumer(x.getChildNodes(), this::parseFamily));
             nodeListConsumer(document.getElementsByTagName(APPROVED),
-                    x -> nodeListConsumer(x.getChildNodes(), y -> parseApproved(y)));
+                    x -> nodeListConsumer(x.getChildNodes(), this::parseApproved));
         }
         return Collections.unmodifiableSortedSet(licenseFamilies);
     }
@@ -373,7 +373,7 @@ private void parseMatcherBuilder(Node classNode) {
 
     @Override
     public void readMatcherBuilders() {
-        nodeListConsumer(document.getElementsByTagName(MATCHER), x -> parseMatcherBuilder(x));
+        nodeListConsumer(document.getElementsByTagName(MATCHER), this::parseMatcherBuilder);
     }
 
     @Override
@@ -384,7 +384,7 @@ public void addMatchers(URL url) {
     /**
      * An abstract builder that delegates to another abstract builder.
      */
-    abstract class DelegatingBuilder extends AbstractBuilder {
+    abstract static class DelegatingBuilder extends AbstractBuilder {
         protected final AbstractBuilder delegate;
 
         DelegatingBuilder(AbstractBuilder delegate) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
index 60f21201b..6c41d5306 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -41,7 +42,7 @@ public abstract class ChildContainerBuilder extends AbstractBuilder {
     /**
      * The list of builders that will build the enclosed matchers.
      */
-    protected final List<IHeaderMatcher.Builder> children = new ArrayList<IHeaderMatcher.Builder>();
+    protected final List<IHeaderMatcher.Builder> children = new ArrayList<>();
 
     protected ChildContainerBuilder() {
     }
@@ -55,7 +56,7 @@ protected ChildContainerBuilder() {
     public AbstractBuilder setResource(String resourceName) {
           URL url = this.getClass().getResource(resourceName);
             try (final InputStream in = url.openStream()) {
-                BufferedReader buffer = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+                BufferedReader buffer = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
                 String txt;
                 while (null != (txt = buffer.readLine())) {
                     txt = txt.trim();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
index 57aec79cf..61e264b8b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/NotBuilder.java
@@ -37,6 +37,6 @@ public IHeaderMatcher build() {
     
     @Override
     public String toString() {
-        return String.format( "NotBuilder: %s", children.size()>0 ? children.get(0) : null );
+        return String.format( "NotBuilder: %s", !children.isEmpty() ? children.get(0) : null );
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java b/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
index 0f8809599..860e8a914 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/ToNameTransformer.java
@@ -21,11 +21,11 @@
 import org.apache.commons.collections4.Transformer;
 import org.apache.rat.api.Document;
 
-public class ToNameTransformer implements Transformer {
+public class ToNameTransformer implements Transformer<Object, Object> {
 
-    private static final Transformer TO_NAME_TRANSFORMER = new ToNameTransformer();
+    private static final Transformer<Object, Object> TO_NAME_TRANSFORMER = new ToNameTransformer();
     
-    public static final Transformer toNameTransformer() {
+    public static Transformer<Object, Object> toNameTransformer() {
         return TO_NAME_TRANSFORMER;
     }
     
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
index d3d44e676..f213d6090 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
@@ -44,7 +44,7 @@ public class ArchiveGuesser {
      * @param document the current document.
      * @return whether the given document is an archive.
      */
-    public static final boolean isArchive(final Document document) {
+    public static boolean isArchive(final Document document) {
         return isArchive(document.getName());
     }
 
@@ -52,7 +52,7 @@ public static final boolean isArchive(final Document document) {
      * @return Is a file by that name an archive?
      * @param name file name to check against.
      */
-    public static final boolean isArchive(final String name) {
+    public static boolean isArchive(final String name) {
         if (name == null) {return false;}
         String nameToLower = name.toLowerCase(Locale.US);
         for (int i = 0; i < ArchiveGuesser.ARCHIVE_EXTENSIONS.length; i++) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
index 312140e6b..1a900f65b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
@@ -26,11 +26,7 @@
 import java.io.Reader;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CoderResult;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.UnsupportedCharsetException;
+import java.nio.charset.*;
 import java.util.Locale;
 
 /**
@@ -41,10 +37,10 @@ public class BinaryGuesser {
     private static final String DOT = ".";
 
     static final String FILE_ENCODING = "file.encoding";
-    private static Charset CHARSET_FROM_FILE_ENCODING_OR_UTF8 = getFileEncodingOrUTF8AsFallback();
+    private static final Charset CHARSET_FROM_FILE_ENCODING_OR_UTF8 = getFileEncodingOrUTF8AsFallback();
 
     private static boolean isBinaryDocument(Document document) {
-        boolean result = false;
+        boolean result;
         InputStream stream = null;
         try {
             stream = document.inputStream();
@@ -141,7 +137,7 @@ static Charset getFileEncodingOrUTF8AsFallback() {
         try {
             return Charset.forName(System.getProperty(FILE_ENCODING));
         } catch (UnsupportedCharsetException e) {
-            return Charset.forName("UTF-8");
+            return StandardCharsets.UTF_8;
         }
     }
 
@@ -149,7 +145,7 @@ static Charset getFileEncodingOrUTF8AsFallback() {
      * @param name current file name.
      * @return whether given name is binary.
      */
-    public static final boolean isBinaryData(final String name) {
+    public static boolean isBinaryData(final String name) {
         return extensionMatches(name, DATA_EXTENSIONS);
     }
 
@@ -157,7 +153,7 @@ public static final boolean isBinaryData(final String name) {
      * @param name current file name.
      * @return Is a file by that name a known non-binary file?
      */
-    public static final boolean isNonBinary(final String name) {
+    public static boolean isNonBinary(final String name) {
         return name != null && extensionMatches(name.toUpperCase(Locale.US), BinaryGuesser.NON_BINARY_EXTENSIONS);
     }
 
@@ -165,7 +161,7 @@ public static final boolean isNonBinary(final String name) {
      * @param name current file name.
      * @return Is a file by that name an executable/binary file?
      */
-    public static final boolean isExecutable(final String name) {
+    public static boolean isExecutable(final String name) {
         return name.equals(BinaryGuesser.JAVA) || extensionMatches(name, EXE_EXTENSIONS)
                 || containsExtension(name, EXE_EXTENSIONS);
     }
@@ -194,15 +190,15 @@ public static boolean isBytecode(final String name) {
         return BinaryGuesser.extensionMatches(name, BYTECODE_EXTENSIONS);
     }
 
-    public static final boolean isImage(final String name) {
+    public static boolean isImage(final String name) {
         return BinaryGuesser.extensionMatches(name, IMAGE_EXTENSIONS);
     }
 
-    public static final boolean isKeystore(final String name) {
+    public static boolean isKeystore(final String name) {
         return BinaryGuesser.extensionMatches(name, KEYSTORE_EXTENSIONS);
     }
 
-    public static final boolean isAudio(final String name) {
+    public static boolean isAudio(final String name) {
         return BinaryGuesser.extensionMatches( name, AUDIO_EXTENSIONS );
     }
 
@@ -210,7 +206,7 @@ public static final boolean isAudio(final String name) {
      * @param name file name.
      * @return Is a file by that name a known binary file?
      */
-    public static final boolean isBinary(final String name) {
+    public static boolean isBinary(final String name) {
         if (name == null) {
             return false;
         }
@@ -266,7 +262,7 @@ public static final boolean isBinary(final String name) {
     };
     
     /**
-     * Based on https://www.apache.org/dev/svn-eol-style.txt
+     * Based on <a href="https://www.apache.org/dev/svn-eol-style.txt">https://www.apache.org/dev/svn-eol-style.txt</a>
      */
     private static final String[] NON_BINARY_EXTENSIONS = {
             "AART",
@@ -363,7 +359,7 @@ public static final boolean isBinary(final String name) {
     public static final int NON_ASCII_THRESHOLD = 256;
     public static final int ASCII_CHAR_THRESHOLD = 8;
 
-    public static final boolean isBinary(final Document document) {
+    public static boolean isBinary(final Document document) {
         // TODO: reimplement the binary test algorithm?
         // TODO: more efficient to move into standard analysis
         // TODO: then use binary as default
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
index d6b7f4d5e..ec3368549 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
@@ -31,7 +31,7 @@ public class GuessUtils {
      * @param name not null
      * @return not null
      */
-    public static final String normalise(final String name) {
+    public static String normalise(final String name) {
         String result = name.toUpperCase(Locale.US);
         final int lastSeparatorIndex = StringUtils.lastIndexOfAny(result, SEPARATORS);
         final int length = result.length();
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java
index d0b9901f0..cbf636fd8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java
@@ -58,7 +58,7 @@ public class NoteGuesser {
      * @return Is a file by that name a note file?
      * @param name file name.
      */
-    public static final boolean isNote(final String name) {
+    public static boolean isNote(final String name) {
         if (name == null) {return false;}
 
         List<String> l = Arrays.asList(NoteGuesser.NOTE_FILE_NAMES);
@@ -77,7 +77,7 @@ public static final boolean isNote(final String name) {
         return false;
     }
 
-    public static final boolean isNote(final Document document) {
+    public static boolean isNote(final Document document) {
         return isNote(document.getName());
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
index 1279cf3aa..4d30ff2d7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicense.java
@@ -52,7 +52,7 @@ public interface ILicense extends IHeaderMatcher, Comparable<ILicense> {
     /**
      * @return An ILicense.Builder instance.
      */
-    public static ILicense.Builder builder() {
+    static ILicense.Builder builder() {
         return new Builder();
     }
 
@@ -60,7 +60,7 @@ public static ILicense.Builder builder() {
      * @return The comparator for used to sort Licenses. 
      */
     static Comparator<ILicense> getComparator() {
-        return (x, y) ->  x.getId().compareTo( y.getId() );
+        return Comparator.comparing(IHeaderMatcher::getId);
     }
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
index 5e301b203..501a59e89 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java
@@ -40,7 +40,7 @@ static ILicenseFamily.Builder builder() {
     }
 
     /**
-     * Convert a potential category string into a category string of exactly 5 characters either buy truncating
+     * Convert a potential category string into a category string of exactly 5 characters either by truncating
      * the string or appending spaces as necessary.
      * @param cat the string to convert.
      * @return a string of exactly 5 characters.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
index 076367ba9..c58d4c14f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
@@ -81,7 +81,7 @@ public SortedSet<String> getFamilyIds(LicenseFilter filter) {
         SortedSet<String> result = new TreeSet<>();
         switch (filter) {
         case all:
-            families.stream().map(x -> x.getFamilyCategory())
+            families.stream().map(ILicenseFamily::getFamilyCategory)
                     .forEach(result::add);
             break;
         case approved:
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
index bf63bda81..24ff1dff5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -23,7 +23,7 @@
 import java.util.TreeSet;
 
 /**
- * Class to take a set of ILicenses and collecton of approved license categories and extract Subsets.
+ * Class to take a set of ILicenses and collection of approved license categories and extract Subsets.
  */
 public class LicenseSetFactory {
     
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
index 75d9064b2..a7d8799e2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
@@ -22,8 +22,8 @@
  * An implementation of the ILicenseFamily.
  */
 class SimpleLicenseFamily implements ILicenseFamily {
-    private String familyName;
-    private String familyCategory;
+    private final String familyName;
+    private final String familyCategory;
 
     SimpleLicenseFamily(String familyId, String familyName) {
         this.familyCategory = ILicenseFamily.makeCategory(familyId);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index d019a6121..69c5fec09 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -32,7 +32,7 @@
  * A default Document Analyser that determines if the matched license is in the set of approved licenses.
  */
 public class DefaultPolicy implements IDocumentAnalyser {
-    private SortedSet<ILicenseFamily> approvedLicenseFamilies;
+    private final SortedSet<ILicenseFamily> approvedLicenseFamilies;
 
     /**
      * Constructor with the list of approved license families.
@@ -54,7 +54,7 @@ public void add(ILicenseFamily approvedLicense) {
     @Override
     public void analyse(final Document document) {
         if (document != null) {
-            boolean approval = false;
+            boolean approval;
             if (document.getMetaData().value(MetaData.RAT_URL_HEADER_CATEGORY) != null) {
                 ILicenseFamily licenseFamily = ILicenseFamily.builder()
                         .setLicenseFamilyCategory(
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
index 78bb9d171..1a9a48d1e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
@@ -49,8 +49,8 @@ public class XmlReportFactory {
      * @param configuration The report configuration.
      * @return a RatReport instance.
      */
-    public static final RatReport createStandardReport(IXmlWriter writer,
-            final ClaimStatistic statistic, ReportConfiguration configuration) {
+    public static RatReport createStandardReport(IXmlWriter writer,
+                                                 final ClaimStatistic statistic, ReportConfiguration configuration) {
         final List<RatReport> reporters = new ArrayList<>();
         if (statistic != null) {
             reporters.add(new ClaimAggregator(statistic));
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
index 4e5ec3b70..f6b64701b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
@@ -24,6 +24,7 @@
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.nio.file.Files;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveInputStream;
@@ -68,12 +69,12 @@ public void run(final RatReport report) throws RatException {
             /* I am really sad that classes aren't first-class objects in
                Java :'( */
             try {
-                input = new TarArchiveInputStream(new GzipCompressorInputStream(new FileInputStream(file)));
+                input = new TarArchiveInputStream(new GzipCompressorInputStream(Files.newInputStream(file.toPath())));
             } catch (IOException e) {
                 try {
-                    input = new TarArchiveInputStream(new BZip2CompressorInputStream(new FileInputStream(file)));
+                    input = new TarArchiveInputStream(new BZip2CompressorInputStream(Files.newInputStream(file.toPath())));
                 } catch (IOException e2) {
-                    input = new ZipArchiveInputStream(new FileInputStream(file));
+                    input = new ZipArchiveInputStream(Files.newInputStream(file.toPath()));
                 }
             }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
index ed590d207..74b2b878e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
@@ -37,9 +37,9 @@
  */
 public class DirectoryWalker extends Walker implements IReportable {
 
-    protected static final FileNameComparator COMPARATOR = new FileNameComparator();
+    private static final FileNameComparator COMPARATOR = new FileNameComparator();
 
-    private IOFileFilter directoryFilter;
+    private final IOFileFilter directoryFilter;
 
     /**
      * Constructs a walker.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java b/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
index 42f0c068a..7d3f39353 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
@@ -78,10 +78,7 @@ protected NameBasedHiddenFileFilter() {
      */
     @Override
     public boolean accept(File file) {
-        if (file.getName().startsWith(".")) {
-            return true;
-        }
-        return false;
+        return file.getName().startsWith(".");
     }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
index 76d2424fa..daecbd154 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
@@ -36,16 +36,14 @@ public abstract class Walker implements IReportable {
     protected final FilenameFilter filter;
 
     protected static FilenameFilter regexFilter(final Pattern pattern) {
-        return new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                final boolean result;
-                if (pattern == null) {
-                    result = true;
-                } else {
-                    result = !pattern.matcher(name).matches();
-                }
-                return result;
+        return (dir, name) -> {
+            final boolean result;
+            if (pattern == null) {
+                result = true;
+            } else {
+                result = !pattern.matcher(name).matches();
             }
+            return result;
         };
     }
  
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 1218d9f2b..f47238ac3 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -30,7 +30,7 @@
                 to audit the source to be distributed.</description>
   <inceptionYear>2007</inceptionYear>
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${mavenMinVersion}</maven>
   </prerequisites>
   <properties>
     <currentVersion>${project.version}</currentVersion>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 89aaa30f3..6591af1b7 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -26,7 +26,6 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -34,6 +33,7 @@
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -241,11 +241,11 @@ protected MavenProject getProject() {
     protected Defaults.Builder getDefaultsBuilder() {
         Defaults.Builder result = Defaults.builder();
         if (defaultLicenseFiles != null) {
-            for (int i = 0; i < defaultLicenseFiles.length; i++) {
+            for (String defaultLicenseFile : defaultLicenseFiles) {
                 try {
-                    result.add(defaultLicenseFiles[i]);
+                    result.add(defaultLicenseFile);
                 } catch (MalformedURLException e) {
-                    throw new ConfigurationException(defaultLicenseFiles[i] + " is not a valid license file", e);
+                    throw new ConfigurationException(defaultLicenseFile + " is not a valid license file", e);
                 }
             }
         }
@@ -392,7 +392,7 @@ private void setIncludes(DirectoryScanner ds) throws MojoExecutionException {
                 }
                 includeList.addAll(getPatternsFromFile(f, charset));
             }
-            ds.setIncludes(includeList.toArray(new String[includeList.size()]));
+            ds.setIncludes(includeList.toArray(new String[0]));
         }
     }
 
@@ -404,7 +404,7 @@ private List<String> getPatternsFromFile(File pFile, String pCharset) throws Moj
         Throwable th = null;
         final List<String> patterns = new ArrayList<>();
         try {
-            is = new FileInputStream(pFile);
+            is = Files.newInputStream(pFile.toPath());
             bis = new BufferedInputStream(is);
             r = new InputStreamReader(bis, pCharset);
             br = new BufferedReader(r);
@@ -501,7 +501,7 @@ private void setExcludes(IgnoringDirectoryScanner ds) throws MojoExecutionExcept
             Collections.addAll(globExcludes, excludes);
         }
         if (!globExcludes.isEmpty()) {
-            final String[] allExcludes = globExcludes.toArray(new String[globExcludes.size()]);
+            final String[] allExcludes = globExcludes.toArray(new String[0]);
             ds.setExcludes(allExcludes);
         }
     }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
index d2b2acf34..2cdbc61e0 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
@@ -23,7 +23,7 @@
 
 public class Family {
 
-    private ILicenseFamily.Builder builder = ILicenseFamily.builder();
+    private final ILicenseFamily.Builder builder = ILicenseFamily.builder();
 
     @Parameter(required = true)
     private String id;
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
index e49e2f89b..82c2c8cbe 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
@@ -1,11 +1,11 @@
 package org.apache.rat.mp;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.file.Files;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -62,7 +62,7 @@ public void run(RatReport report) throws RatException {
         }
     }
 
-    private class FileDocument implements Document {
+    private static class FileDocument implements Document {
         private File file;
         private final MetaData metaData = new MetaData();
 
@@ -77,7 +77,7 @@ public boolean isComposite() {
 
         @Override
         public Reader reader() throws IOException {
-            final InputStream in = new FileInputStream(file);
+            final InputStream in = Files.newInputStream(file.toPath());
             return new InputStreamReader(in);
         }
 
@@ -93,7 +93,7 @@ public MetaData getMetaData() {
 
         @Override
         public InputStream inputStream() throws IOException {
-            return new FileInputStream(file);
+            return Files.newInputStream(file.toPath());
         }
 
         @Override
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
index 32f0a0277..411e9fa51 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
@@ -27,7 +27,7 @@
 
 public class License extends EnclosingMatcher {
 
-    private ILicense.Builder builder = ILicense.builder();
+    private final ILicense.Builder builder = ILicense.builder();
 
     @Parameter(required = false)
     private String notes;
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
index 80f3190c1..e2b9cb610 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
@@ -20,7 +20,8 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -187,7 +188,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
             } else {
                 configuration.setStyleReport(true);
                 if (!"plain".equalsIgnoreCase(reportStyle)) {
-                    configuration.setStyleSheet(() -> new FileInputStream(reportStyle));
+                    configuration.setStyleSheet(() -> Files.newInputStream(Paths.get(reportStyle)));
                 }
             }
         }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
index 8558e16b5..0c7346473 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ExclusionHelper.java
@@ -2,8 +2,6 @@
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.rat.config.SourceCodeManagementSystems;
-import org.codehaus.plexus.util.AbstractScanner;
-import org.codehaus.plexus.util.DirectoryScanner;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
index 3bb9de23f..ff94c3b96 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/All.java
@@ -24,7 +24,7 @@
 
 public class All implements IHeaderMatcher.Builder {
 
-    private AllBuilder builder = Builder.all();
+    private final AllBuilder builder = Builder.all();
 
     @Override
     public IHeaderMatcher build() {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
index 61a0c5fbe..964dcc6e0 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Any.java
@@ -24,7 +24,7 @@
 
 public class Any implements IHeaderMatcher.Builder {
 
-    private AnyBuilder builder = Builder.any();
+    private final AnyBuilder builder = Builder.any();
 
     @Override
     public IHeaderMatcher build() {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
index 006851222..ce3af10dd 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Copyright.java
@@ -23,7 +23,7 @@
 
 public class Copyright implements IHeaderMatcher.Builder {
 
-    private CopyrightBuilder builder = new CopyrightBuilder();
+    private final CopyrightBuilder builder = new CopyrightBuilder();
     
     public void setStart(String start) {
         builder.setStart(start);
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java
index 45662fbb8..820ae35a8 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Family.java
@@ -22,7 +22,7 @@
 
 public class Family {
 
-    private ILicenseFamily.Builder builder = ILicenseFamily.builder();
+    private final ILicenseFamily.Builder builder = ILicenseFamily.builder();
 
     public ILicenseFamily build() {
         return builder.build();
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
index 2ba0db6a2..6d42088fc 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/License.java
@@ -27,7 +27,7 @@
 
 public class License {
 
-    private ILicense.Builder builder = ILicense.builder();
+    private final ILicense.Builder builder = ILicense.builder();
     
     ILicense.Builder asBuilder() {
         return builder;
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
index d0aec75d9..734682c32 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Not.java
@@ -24,7 +24,7 @@
 
 public class Not implements IHeaderMatcher.Builder {
 
-    private NotBuilder builder = Builder.not();
+    private final NotBuilder builder = Builder.not();
 
     @Override
     public IHeaderMatcher build() {
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
index 4b910620c..f212c4115 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Regex.java
@@ -23,7 +23,7 @@
 
 public class Regex implements IHeaderMatcher.Builder {
 
-    private RegexBuilder builder = new RegexBuilder();
+    private final RegexBuilder builder = new RegexBuilder();
 
     public void setRegex(String pattern) {
         builder.setExpr(pattern);
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 6734c6fd6..880a43285 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -65,10 +65,10 @@
  */
 public class Report extends Task {
 
-    private Defaults.Builder defaultsBuilder;
+    private final Defaults.Builder defaultsBuilder;
     private final ReportConfiguration configuration;
-    private List<License> licenses = new ArrayList<>();
-    private List<Family> families = new ArrayList<>();
+    private final List<License> licenses = new ArrayList<>();
+    private final List<Family> families = new ArrayList<>();
     /**
      * will hold any nested resource collection
      */
@@ -123,7 +123,7 @@ public void addStylesheet(Resource styleSheet) {
      * @param styleSheet style sheet to use in this report.
      */
     public void addStyleSheet(Resource styleSheet) {
-        configuration.setStyleSheet(() -> styleSheet.getInputStream());
+        configuration.setStyleSheet(styleSheet::getInputStream);
         configuration.setStyleReport(true);
     }
 
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
index 667fb3bcc..3b24fc739 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
@@ -57,7 +57,7 @@ public void run(RatReport report) throws RatException {
         }
     }
 
-    private class ResourceDocument implements Document {
+    private static class ResourceDocument implements Document {
 
         private Resource resource;
         private final MetaData metaData = new MetaData();
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
index e809a77b4..369c7a4cd 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Spdx.java
@@ -23,7 +23,7 @@
 
 public class Spdx implements IHeaderMatcher.Builder  {
     
-    private SpdxBuilder builder = new SpdxBuilder();
+    private final SpdxBuilder builder = new SpdxBuilder();
 
     public void setName(String spdxId) {
         builder.setName(spdxId);
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
index 7eb7b5f12..6d5857896 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Text.java
@@ -23,7 +23,7 @@
 
 public class Text implements IHeaderMatcher.Builder {
     
-    private TextBuilder builder = new TextBuilder();
+    private final TextBuilder builder = new TextBuilder();
     
     public void addText(String text) {
         builder.setText(text);
diff --git a/pom.xml b/pom.xml
index 14d8150e8..14e45be8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>29</version>
+    <version>31</version>
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>
@@ -52,12 +52,13 @@ agnostic home for software distribution comprehension and audit tools.
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>
     <!-- This is the version of Maven required to use the Rat Maven Plugin -->
-    <mavenVersion>3.2.5</mavenVersion>
+    <mavenMinVersion>3.2.5</mavenMinVersion>
+    <mavenVersion>3.9.6</mavenVersion>
     <creadur.jira.id>RAT</creadur.jira.id>
     <!-- maven plugin versions -->
-    <mavenPluginPluginVersion>3.9.0</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.10.2</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
-    <mavenJavadocPluginVersion>3.5.0</mavenJavadocPluginVersion>
+    <mavenJavadocPluginVersion>3.6.3</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.21.2</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
     <previousRatVersion>0.16</previousRatVersion>
@@ -236,7 +237,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.1</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -261,7 +262,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.4.3</version>
+        <version>3.5.0</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -380,7 +381,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.0.1</version>
           <configuration>
             <!-- Only prompt once for the release version -->
             <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -395,7 +396,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.2</version>
           <configuration>
             <forkCount>1</forkCount>
             <argLine>-Dfile.encoding=ISO-8859-1</argLine>
@@ -452,7 +453,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <!-- This checks the bytecode version of the dependencies transitively -->
@@ -466,7 +467,7 @@ agnostic home for software distribution comprehension and audit tools.
                   <maxJdkVersion>${javaVersion}</maxJdkVersion>
                 </enforceBytecodeVersion>
                 <requireMavenVersion>
-                  <version>3.0.5</version>
+                  <version>${mavenMinVersion}</version>
                 </requireMavenVersion>
               </rules>
               <fail>true</fail>

From b8d9f1ab8a2a9df350c1a188079d59cdd56d4c53 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 8 Dec 2023 23:43:14 +0100
Subject: [PATCH 182/299] Pass array properly sized

---
 .../src/main/java/org/apache/rat/mp/AbstractRatMojo.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 6591af1b7..5f02b1175 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -392,7 +392,7 @@ private void setIncludes(DirectoryScanner ds) throws MojoExecutionException {
                 }
                 includeList.addAll(getPatternsFromFile(f, charset));
             }
-            ds.setIncludes(includeList.toArray(new String[0]));
+            ds.setIncludes(includeList.toArray(new String[includeList.size()]));
         }
     }
 
@@ -501,7 +501,7 @@ private void setExcludes(IgnoringDirectoryScanner ds) throws MojoExecutionExcept
             Collections.addAll(globExcludes, excludes);
         }
         if (!globExcludes.isEmpty()) {
-            final String[] allExcludes = globExcludes.toArray(new String[0]);
+            final String[] allExcludes = globExcludes.toArray(new String[globExcludes.size()]);
             ds.setExcludes(allExcludes);
         }
     }

From 13b4bf72349c7308d7fcf0295f8a4a22af25c415 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sat, 9 Dec 2023 12:48:07 +0100
Subject: [PATCH 183/299] RAT-311, RAT-338: Add changelog entries for maven
 updates and code fixes

---
 src/changes/changes.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3683c4082..aacbd269d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,12 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update to ASF parent pom 31 and update multiple maven plugin versions as well (surefire, release, project-info, enforcer, jxr).
+      </action>
+      <action issue="RAT-338" type="add" dev="pottlinger" due-to="Tamas Cservenak">
+        Update minimal build Maven version to 3.2.5 and maven dependencies to 3.9.6. Remove pre-JDK8 code constructs and minor refactorings.
+      </action>
       <action issue="RAT-335" type="add" dev="pottlinger" due-to="Niels Basjes">
         Enhance .gitignore handling; support multiple .gitignore files and allow a more complete parsing of Git's ignore files.
       </action>

From 96baee41bb282545eeb9cc9b88358a13caf2e267 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sat, 9 Dec 2023 21:46:33 +0100
Subject: [PATCH 184/299] RAT-338: Fix typo in name - sry

---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index aacbd269d..d7562342d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,7 +63,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update to ASF parent pom 31 and update multiple maven plugin versions as well (surefire, release, project-info, enforcer, jxr).
       </action>
-      <action issue="RAT-338" type="add" dev="pottlinger" due-to="Tamas Cservenak">
+      <action issue="RAT-338" type="add" dev="pottlinger" due-to="Tamás Cservenák">
         Update minimal build Maven version to 3.2.5 and maven dependencies to 3.9.6. Remove pre-JDK8 code constructs and minor refactorings.
       </action>
       <action issue="RAT-335" type="add" dev="pottlinger" due-to="Niels Basjes">

From 1d6ced7a8b52e8d05f02b3ad790b03babc17ab33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 01:02:25 +0000
Subject: [PATCH 185/299] Bump commons-io:commons-io from 2.11.0 to 2.15.1

Bumps commons-io:commons-io from 2.11.0 to 2.15.1.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 14e45be8d..a4b99203e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.11.0</version>
+        <version>2.15.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>

From 287452540769690cde8c95a8c6dbea6a0fa49b3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 01:02:29 +0000
Subject: [PATCH 186/299] Bump commons-cli:commons-cli from 1.5.0 to 1.6.0

Bumps commons-cli:commons-cli from 1.5.0 to 1.6.0.

---
updated-dependencies:
- dependency-name: commons-cli:commons-cli
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 14e45be8d..dee0117a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
-        <version>1.5.0</version>
+        <version>1.6.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>

From a7fc84770a20345c4fbfac3c1c462b9e53ad9b8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 01:02:45 +0000
Subject: [PATCH 187/299] Bump org.apache.commons:commons-lang3 from 3.12.0 to
 3.14.0

Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.14.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 14e45be8d..6d491826c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.12.0</version>
+        <version>3.14.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>

From ee90acb3d9968f5b0045230e917a724d784f3a88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 01:02:57 +0000
Subject: [PATCH 188/299] Bump org.apache.maven.shared:maven-shared-utils from
 3.4.1 to 3.4.2

Bumps [org.apache.maven.shared:maven-shared-utils](https://github.com/apache/maven-shared-utils) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/apache/maven-shared-utils/releases)
- [Commits](https://github.com/apache/maven-shared-utils/compare/maven-shared-utils-3.4.1...maven-shared-utils-3.4.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.shared:maven-shared-utils
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index f47238ac3..0280ddf69 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -272,7 +272,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-shared-utils</artifactId>
-      <version>3.4.1</version>
+      <version>3.4.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>

From 4c6777ba0876e678ad76f90ac7a8f267017762d2 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 12 Dec 2023 21:37:11 +0100
Subject: [PATCH 189/299] RAT-326: Fix more javadoc build errors

---
 .../main/java/org/apache/rat/mp/RatReportMojo.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 11d328e1b..069312d16 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -228,9 +228,9 @@ public void generate(org.codehaus.doxia.sink.Sink sink, Locale locale) throws Ma
     /**
      * Generate a report.
      *
-     * @param sink
-     * @param locale
-     * @throws MavenReportException
+     * @param sink the sink to use for the generation.
+     * @param locale the wanted locale to generate the report, could be null.
+     * @throws MavenReportException if any
      * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
      */
     @Deprecated
@@ -242,10 +242,10 @@ public void generate(Sink sink, Locale locale) throws MavenReportException {
      * This method is called when the report generation is invoked by
      * maven-site-plugin.
      *
-     * @param sink
-     * @param sinkFactory
-     * @param locale
-     * @throws MavenReportException
+     * @param sink the sink to use for the generation.
+     * @param sinkFactory the sink factory to use for the generation.
+     * @param locale the wanted locale to generate the report, could be null.
+     * @throws MavenReportException if any
      */
     @Override
     public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException {

From f6aa0edffc7903abed51735b38695e1249ee27d0 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 12 Dec 2023 21:39:03 +0100
Subject: [PATCH 190/299] RAT-326: Add explicit goal on GHA to break the build
 in case of javadoc errors

---
 .github/workflows/maven.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3c66d5b40..b221a34ba 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -61,7 +61,10 @@ jobs:
         run: mvn -e -B -V -ntp clean install
         
       - name: Build site
-        run: mvn -e -B -V -ntp site
+        run: mvn -e -B -V -ntp site:site
+
+      - name: Generate javadoc
+        run: mvn -e -B -V -ntp javadoc:javadoc 
 
 # as of 20220505:  Invalid workflow file
 # The workflow is not valid. .github/workflows/maven.yml (Line: 55, Col: 1): Unexpected value 'notifications'

From c3106cac76e4a792205032ebd64cc0fba15c6f31 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 12 Dec 2023 21:41:33 +0100
Subject: [PATCH 191/299] RAT-326: Fix javadoc build errors

---
 .../java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
index 3df95cd35..4f5adccd2 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
@@ -99,7 +99,7 @@ public void loadFile(final Log log, final File scmIgnore) {
     /**
      * Determines whether the given line is a comment or not based on scanning
      * for prefixes
-     * {@see COMMENT_PREFIXES}.
+     * @see #COMMENT_PREFIXES
      *
      * @param line line to verify.
      * @return <code>true</code> if the given line is a commented out line.

From e5dabb9063dbf7d685cceeaad25c76c8be390b4d Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 12 Dec 2023 21:45:37 +0100
Subject: [PATCH 192/299] RAT-326: Add changelog about introduction of
 javadoc:javadoc into GHA build

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d7562342d..15b0c802d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-326" type="fix" dev="pottlinger">
+        Fix existing javadoc build errors and add javadoc generation to GithubActions to not introduce build errors via merge requests.
+      </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update to ASF parent pom 31 and update multiple maven plugin versions as well (surefire, release, project-info, enforcer, jxr).
       </action>

From 478a1eacf71227fc906921f3ed0eef098943e993 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sat, 23 Dec 2023 13:41:15 +0100
Subject: [PATCH 193/299] RAT-311: Replace placeholder for upcoming release

---
 ant-task-examples.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ant-task-examples.xml b/ant-task-examples.xml
index 8f0cb03cd..343f073b5 100644
--- a/ant-task-examples.xml
+++ b/ant-task-examples.xml
@@ -25,7 +25,7 @@
   </description>
 
   <property name="src-dir" location="apache-rat-core/src/main/java"/>
-  <property name="version" value="0.15"/>
+  <property name="version" value="0.16"/>
   <property name="src-jar"
             location="apache-rat-core/target/apache-rat-core-${version}-sources.jar"/>
 

From f3420ca2c86182c504cfdfe9345adbc00ceea29a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 00:28:17 +0000
Subject: [PATCH 194/299] Bump org.apache.maven.plugins:maven-surefire-plugin
 from 3.2.2 to 3.2.3

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.2...surefire-3.2.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f267c4dba..68cb6bb36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,7 +396,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>3.2.3</version>
           <configuration>
             <forkCount>1</forkCount>
             <argLine>-Dfile.encoding=ISO-8859-1</argLine>

From fa0068b6503d59d00f69332ff4b806b3164b1095 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 00:28:27 +0000
Subject: [PATCH 195/299] Bump org.apache.maven.plugins:maven-compiler-plugin

Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f267c4dba..430a5adfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,7 +312,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.11.0</version>
+          <version>3.12.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 261920aff45d4c7405f98fa24b6317511778ccf8 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 27 Dec 2023 00:46:55 +0100
Subject: [PATCH 196/299] Reformat poms in order to cleanup before releasing

---
 .buildtools/formatPom                                         | 0
 .../src/test/resources/unit/RAT-335-GitIgnore/pom.xml         | 4 ----
 2 files changed, 4 deletions(-)
 mode change 100644 => 100755 .buildtools/formatPom

diff --git a/.buildtools/formatPom b/.buildtools/formatPom
old mode 100644
new mode 100755
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml
index 0ec80739b..ac5104dfd 100644
--- a/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-335-GitIgnore/pom.xml
@@ -17,11 +17,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <groupId>org.apache.rat.test</groupId>
   <artifactId>RAT335</artifactId>
   <version>1.0</version>
-
   <build>
     <plugins>
       <plugin>
@@ -29,7 +27,6 @@
         <artifactId>apache-rat-plugin</artifactId>
         <version>@pom.version@</version>
         <configuration>
-
           <!-- Minimize the number of active rules to keep the test minimal -->
           <excludes>
             <exclude>**/.gitignore</exclude>
@@ -38,7 +35,6 @@
           <useMavenDefaultExcludes>false</useMavenDefaultExcludes>
           <useEclipseDefaultExcludes>false</useEclipseDefaultExcludes>
           <useIdeaDefaultExcludes>false</useIdeaDefaultExcludes>
-
           <parseSCMIgnoresAsExcludes>true</parseSCMIgnoresAsExcludes>
         </configuration>
       </plugin>

From 830b239d992a600a07358b714525ecf083e732f5 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 27 Dec 2023 01:09:05 +0100
Subject: [PATCH 197/299] RAT-311: Prepare changelog for upcoming release

---
 src/changes/changes.xml | 48 ++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 15b0c802d..1591b0cd3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,12 +21,10 @@ This file is also used by the maven-changes-plugin to generate the release notes
 Useful ways of finding items to add to this file are:
 
 1.  Add items when you fix a bug or add a feature (this makes the
-release process easy :-).
+release process easier :-).
 
 2.  Do a JIRA search for tickets closed since the previous release.
-
-3.  Use the report generated by the maven-changelog-plugin to see all
-SVN commits. TBA how to use this with SVN.
+  https://issues.apache.org/jira/projects/RAT?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page
 
 To generate the release notes from this file:
 
@@ -59,13 +57,46 @@ The <action> type attribute can be add,update,fix,remove.
       </action>
     </release>
     -->
-    <release version="0.16-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
-      <action issue="RAT-326" type="fix" dev="pottlinger">
-        Fix existing javadoc build errors and add javadoc generation to GithubActions to not introduce build errors via merge requests.
+    <release version="0.16" date="2023-12-27" description="Apart from dependency updates and multiple bugfixes, this release brings the ability to use SPDX license identifiers and enhances the .gitignore-exclusion filterung during RAT runs. Furthermore new CLI options were added and new file types can be used by default.">
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-pmd-plugin from 3.18.0 to 3.21.2.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update mockito-core from 4.7.0 to 4.11.0, newer versions 5.x cannot be applied due to our JDK8-compatibility restriction.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update actions/setup-java from 3.4.1 to 4.0.0.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update plexus-utils from 3.4.2 to 3.5.1, versions 4.x are for upcoming Maven4 and must not be applied here.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update commons-compress from 1.21 to 1.25.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.16.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.16.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.16.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.16.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.16.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.16.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update to ASF parent pom 31 and update multiple maven plugin versions as well (surefire, release, project-info, enforcer, jxr).
       </action>
+      <action issue="RAT-326" type="fix" dev="pottlinger">
+        Fix existing javadoc build errors and add javadoc generation to existing GithubActions to not introduce build errors via merge requests.
+      </action>
       <action issue="RAT-338" type="add" dev="pottlinger" due-to="Tamás Cservenák">
         Update minimal build Maven version to 3.2.5 and maven dependencies to 3.9.6. Remove pre-JDK8 code constructs and minor refactorings.
       </action>
@@ -108,9 +139,6 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="RAT-312" type="fix" dev="pottlinger">
         Remove Travis build as they are unreliable. Builds with ASF Jenkins and Github Actions remain as before.
       </action>
-      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.16.
-      </action>
     </release>
     <release version="0.15" date="2022-08-31" description="This release fixes a warning during site builds and updates various dependencies.">
       <action issue="RAT-305" type="update" dev="pottlinger" due-to="dependabot">

From b0138419231242e56f0ed6a505e8300e1e321734 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 27 Dec 2023 01:27:39 +0100
Subject: [PATCH 198/299] RAT-311: Prepare changelog for upcoming release

---
 src/changes/changes.xml | 62 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1591b0cd3..0267c1fde 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -67,6 +67,12 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update actions/setup-java from 3.4.1 to 4.0.0.
       </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update actions/cache from 3.0.11 to 3.3.2
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update actions/checkout from 3 to 4.
+      </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update plexus-utils from 3.4.2 to 3.5.1, versions 4.x are for upcoming Maven4 and must not be applied here.
       </action>
@@ -74,25 +80,67 @@ The <action> type attribute can be add,update,fix,remove.
         Update commons-compress from 1.21 to 1.25.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.16.
+        Update maven-plugin-version from 3.6.4 to 3.8.2.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-dependency-plugin from 3.3.0 to 3.6.1.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update wagon-ssh from 3.5.2 to 3.5.3.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update Ant from 1.10.12 to 1.10.14.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update to ASF parent pom from 27 to 31 and update multiple maven plugin versions implicitly (surefire, release, project-info, enforcer, jxr).
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update doxiaVersion from 1.11.1 to 1.12.0.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-compiler-plugin from 3.10.1 to 3.12.1.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update commons-lang3 from 3.5 to 3.14.0.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-javadoc-plugin from 3.4.1 to 3.6.3.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+         Update maven-release-plugin from 2.5.3 to 3.0.1.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-enforcer-plugin from 3.1.0 to 3.4.1.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update extra-enforcer-rules from 1.6.1 to 1.7.0
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-release-plugin from 2.5.3 to 3.0.1.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update animal-sniffer-maven-plugin from 1.22 to 1.23.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-project-info-reports-plugin from 3.4.1 to 3.5.0.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.16.
+        Update maven-shared-utils from 3.3.4 to 3.4.2.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.16.
+        Update org.slf4j:slf4j-simple from 1.7.36 to 2.0.9.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.16.
+        Update commons-io from 2.11.0 to 2.15.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.16.
+        Update commons-io from 2.11.0 to 2.15.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.16.
+        Update commons-cli from 1.5.0 to 1.6.0.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update to ASF parent pom 31 and update multiple maven plugin versions as well (surefire, release, project-info, enforcer, jxr).
+        Update maven-surefire-plugin from 3.2.2 to 3.2.3.
       </action>
       <action issue="RAT-326" type="fix" dev="pottlinger">
         Fix existing javadoc build errors and add javadoc generation to existing GithubActions to not introduce build errors via merge requests.

From e7b51fe90719a6b8ab7c34899fc5fd7ed749a630 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 27 Dec 2023 01:40:25 +0100
Subject: [PATCH 199/299] RAT-311: Prepare changelog for upcoming release -
 sort and fix bugs/typos

---
 src/changes/changes.xml | 60 ++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0267c1fde..97c9e31e6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -57,13 +57,14 @@ The <action> type attribute can be add,update,fix,remove.
       </action>
     </release>
     -->
-    <release version="0.16" date="2023-12-27" description="Apart from dependency updates and multiple bugfixes, this release brings the ability to use SPDX license identifiers and enhances the .gitignore-exclusion filterung during RAT runs. Furthermore new CLI options were added and new file types can be used by default.">
-      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-pmd-plugin from 3.18.0 to 3.21.2.
-      </action>
-      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update mockito-core from 4.7.0 to 4.11.0, newer versions 5.x cannot be applied due to our JDK8-compatibility restriction.
-      </action>
+    <release version="0.16" date="2023-12-27" description=
+"Apart from dependency updates and multiple bugfixes,
+this release brings the ability to use SPDX license identifiers and enhances the .gitignore-exclusion filterung during RAT runs.
+
+Furthermore new CLI options were added and new file types can be used by default.
+This release makes RAT a fully Maven3-compatible plugin and removes deprecated Maven2 completely.
+
+Thanks to all new contributors for improving RAT!">
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update actions/setup-java from 3.4.1 to 4.0.0.
       </action>
@@ -74,17 +75,14 @@ The <action> type attribute can be add,update,fix,remove.
         Update actions/checkout from 3 to 4.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update plexus-utils from 3.4.2 to 3.5.1, versions 4.x are for upcoming Maven4 and must not be applied here.
+        Update mockito-core from 4.7.0 to 4.11.0, newer versions 5.x cannot be applied due to our JDK8-compatibility restriction.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update commons-compress from 1.21 to 1.25.
+        Update plexus-utils from 3.4.2 to 3.5.1, versions 4.x are for upcoming Maven4 and must not be applied here.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update maven-plugin-version from 3.6.4 to 3.8.2.
       </action>
-      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-dependency-plugin from 3.3.0 to 3.6.1.
-      </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update wagon-ssh from 3.5.2 to 3.5.3.
       </action>
@@ -92,52 +90,58 @@ The <action> type attribute can be add,update,fix,remove.
         Update Ant from 1.10.12 to 1.10.14.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update to ASF parent pom from 27 to 31 and update multiple maven plugin versions implicitly (surefire, release, project-info, enforcer, jxr).
+        Update ASF parent pom from 27 to 31 and update multiple maven plugin versions implicitly (surefire, release, project-info, enforcer, jxr).
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update doxiaVersion from 1.11.1 to 1.12.0.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-compiler-plugin from 3.10.1 to 3.12.1.
+        Update maven-shared-utils from 3.3.4 to 3.4.2.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update org.slf4j:slf4j-simple from 1.7.36 to 2.0.9.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update commons-lang3 from 3.5 to 3.14.0.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-javadoc-plugin from 3.4.1 to 3.6.3.
+        Update commons-compress from 1.21 to 1.25.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-         Update maven-release-plugin from 2.5.3 to 3.0.1.
+        Update commons-io from 2.11.0 to 2.15.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-enforcer-plugin from 3.1.0 to 3.4.1.
+        Update commons-cli from 1.5.0 to 1.6.0.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update extra-enforcer-rules from 1.6.1 to 1.7.0
+        Update maven-pmd-plugin from 3.18.0 to 3.21.2.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-release-plugin from 2.5.3 to 3.0.1.
+        Update maven-dependency-plugin from 3.3.0 to 3.6.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update animal-sniffer-maven-plugin from 1.22 to 1.23.
+        Update maven-compiler-plugin from 3.10.1 to 3.12.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-project-info-reports-plugin from 3.4.1 to 3.5.0.
+        Update maven-javadoc-plugin from 3.4.1 to 3.6.3.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update maven-shared-utils from 3.3.4 to 3.4.2.
+         Update maven-release-plugin from 2.5.3 to 3.0.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update org.slf4j:slf4j-simple from 1.7.36 to 2.0.9.
+        Update maven-enforcer-plugin from 3.1.0 to 3.4.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update commons-io from 2.11.0 to 2.15.1.
+        Update extra-enforcer-rules from 1.6.1 to 1.7.0
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update commons-io from 2.11.0 to 2.15.1.
+        Update maven-release-plugin from 2.5.3 to 3.0.1.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
-        Update commons-cli from 1.5.0 to 1.6.0.
+        Update animal-sniffer-maven-plugin from 1.22 to 1.23.
+      </action>
+      <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
+        Update maven-project-info-reports-plugin from 3.4.1 to 3.5.0.
       </action>
       <action issue="RAT-311" type="update" dev="pottlinger" due-to="dependabot">
         Update maven-surefire-plugin from 3.2.2 to 3.2.3.
@@ -185,7 +189,7 @@ The <action> type attribute can be add,update,fix,remove.
         Add default recursive exclusion for maven-induced build artifacts in folder .mvn.
       </action>
       <action issue="RAT-312" type="fix" dev="pottlinger">
-        Remove Travis build as they are unreliable. Builds with ASF Jenkins and Github Actions remain as before.
+        Remove Travis build as it is unreliable. Builds with ASF Jenkins and Github Actions remain as before.
       </action>
     </release>
     <release version="0.15" date="2022-08-31" description="This release fixes a warning during site builds and updates various dependencies.">
@@ -438,7 +442,7 @@ The <action> type attribute can be add,update,fix,remove.
         Download section does not work if SNAPSHOT is deployed, add download of previous RAT release.
       </action>
       <action issue="RAT-224" type="fix" due-to="John Patrick" dev="pottlinger">
-        Fixed example on webpage abozt usage of custom licenses.
+        Fixed example on webpage about usage of custom licenses.
       </action>
       <action issue="RAT-223" type="fix" due-to="Eric Friedrich" dev="pottlinger">
         Add support for Golang and Perl module files.

From 9505d2c2f1cee41ec49fbb4c37b13728f95bc619 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 27 Dec 2023 01:46:18 +0100
Subject: [PATCH 200/299] RAT-311: Prepare release

---
 RELEASE-NOTES.txt | 69 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b1d93d6b1..3168c5205 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,7 +1,7 @@
-              Apache Creadur Rat 0.15
+              Apache Creadur Rat 0.16
                   RELEASE NOTES
 
-The Apache Creadur Rat team is pleased to announce the release of Apache Creadur Rat 0.15
+The Apache Creadur Rat team is pleased to announce the release of Apache Creadur Rat 0.16
 
 Apache Rat is a release audit tool. It improves accuracy and efficiency when checking
 releases. It is heuristic in nature: making guesses about possible problems. It
@@ -15,30 +15,59 @@ Note that binary compatibility is not guaranteed between 0.x releases.
 Apache Rat is developed by the Apache Creadur project, a language and build
 agnostic home for software distribution comprehension and audit tools.
 
-This release fixes a warning during site builds and updates various dependencies.
+Apart from dependency updates and multiple bugfixes, this release brings the ability to use SPDX license identifiers and enhances the .gitignore-exclusion filterung during RAT runs.
+Furthermore new CLI options were added and new file types can be used by default. This release makes RAT a fully Maven3-compatible plugin and removes deprecated Maven2 completely.
+Thanks to all new contributors for improving RAT!
 
 Changes in this version include:
 
+New features:
+o RAT-338:  Update minimal build Maven version to 3.2.5 and maven dependencies to 3.9.6. Remove pre-JDK8 code constructs and minor refactorings. Thanks to Tamás Cservenák.
+o RAT-335:  Enhance .gitignore handling; support multiple .gitignore files and allow a more complete parsing of Git's ignore files. Thanks to Niels Basjes.
+o RAT-322:  Add configuration option to scan hidden directories: --scan-hidden-directories on the command line and scanHiddenDirectories as a Maven plugin parameter. Thanks to Jean-Baptiste Onofré.
+o RAT-320:  Add new command line option -o/--output to write RAT's output to a file. Thanks to Jean-Baptiste Onofré.
+o RAT-329:  Add markdown (MD) and yaml (YML/YAML) as a recognized extension for file and license processing. Thanks to Claude Warren.
+o RAT-316:  Add default exclusion of MANIFEST.MF as it must not contain comment lines to include a license.
+o RAT-321:  Allow text-based XML configuration of RAT. Thanks to Claude Warren.
+
 Fixed Bugs:
-o RAT-309:  Site builds could not be generated properly due to API changes: solution was to upgrade Maven Reporting API to 3.1.1 and use details of Maven Reporting Implementation 3.2.0 in RAT's Mojo hierarchy. Thanks to Michael Osipov, Gary Gregory.
-o RAT-309:  Updated internal data structures from deprecated ArrayStack to JDK's ArrayDeque.
-o RAT-306:  Add note about hierarchy of changelogs in RAT project structure when publishing the project webpage.
-o RAT-307:  Update to focal (Ubuntu 20.04) on Travis to circumvent build errors and be able to use more modern JDK versions. Deprecate openJDK8 build with focal as it is not supported on Travis.
+o RAT-326:  Fix existing javadoc build errors and add javadoc generation to existing GithubActions to not introduce build errors via merge requests.
+o RAT-328:  Ensure that System.out does not get closed during report generation and updated javadocs. Thanks to Claude Warren.
+o RAT-311:  Update commons-compress to 1.24.0 in order to circumvent CVE-2023-42503.
+o RAT-251:  Added SPDX processing for default licenses. Thanks to Claude Warren.
+o RAT-315:  Fix warnings when using RAT with newer Maven versions as methods from Maven v2 are deprecated. Minimum version of required Maven changed to 3.2.5. Thanks to Guillaume Nodet.
+o RAT-317:  Change log output level of SCM ignore parser from info to debug in order to produce less log output in RAT runs. Thanks to Gary Gregory.
+o RAT-314:  Add default recursive exclusion for maven-induced build artifacts in folder .mvn. Thanks to François Guillot.
+o RAT-312:  Remove Travis build as it is unreliable. Builds with ASF Jenkins and Github Actions remain as before.
 
 Changes:
-o RAT-305:  Update maven-project-info-reports-plugin from 3.3.0 to 3.4.1. Thanks to dependabot.
-o RAT-305:  Update maven-javadoc-plugin from 3.4.0 to 3.4.1. Thanks to dependabot.
-o RAT-305:  Update maven-jxr-plugin from 3.2.0 to 3.3.0. Thanks to dependabot.
-o RAT-305:  Update animal-sniffer-maven-plugin from 1.21 to 1.22. Thanks to dependabot.
-o RAT-305:  Update maven-site-plugin from 3.12.0 to 3.12.1. Thanks to dependabot.
-o RAT-305:  Update maven-pmd-plugin from 3.16.0 to 3.18.0. Thanks to dependabot.
-o RAT-305:  Update mockito-core from 4.6.0 to 4.7.0. Thanks to dependabot.
-o RAT-305:  Update extra-enforcer-rules from 1.5.1 to 1.6.1. Thanks to dependabot.
-o RAT-305:  Update Apache parent pom from 26 to 27. Thanks to dependabot.
-o RAT-305:  Update wagon-ssh from 3.5.1 to 3.5.2. Thanks to dependabot.
-o RAT-305:  Update maven-enforcer-plugin from 3.0.0 to 3.1.0. Thanks to dependabot.
-o RAT-305:  Update actions/setup-java from 3.3.0 to 3.4.1. Thanks to dependabot.
-o RAT-310:  Fix deprecation warnings in tests. Use hamcrest's annotations instead of ones from JUnit.
+o RAT-311:  Update actions/setup-java from 3.4.1 to 4.0.0. Thanks to dependabot.
+o RAT-311:  Update actions/cache from 3.0.11 to 3.3.2 Thanks to dependabot.
+o RAT-311:  Update actions/checkout from 3 to 4. Thanks to dependabot.
+o RAT-311:  Update mockito-core from 4.7.0 to 4.11.0, newer versions 5.x cannot be applied due to our JDK8-compatibility restriction. Thanks to dependabot.
+o RAT-311:  Update plexus-utils from 3.4.2 to 3.5.1, versions 4.x are for upcoming Maven4 and must not be applied here. Thanks to dependabot.
+o RAT-311:  Update maven-plugin-version from 3.6.4 to 3.8.2. Thanks to dependabot.
+o RAT-311:  Update wagon-ssh from 3.5.2 to 3.5.3. Thanks to dependabot.
+o RAT-311:  Update Ant from 1.10.12 to 1.10.14. Thanks to dependabot.
+o RAT-311:  Update ASF parent pom from 27 to 31 and update multiple maven plugin versions implicitly (surefire, release, project-info, enforcer, jxr). Thanks to dependabot.
+o RAT-311:  Update doxiaVersion from 1.11.1 to 1.12.0. Thanks to dependabot.
+o RAT-311:  Update maven-shared-utils from 3.3.4 to 3.4.2. Thanks to dependabot.
+o RAT-311:  Update org.slf4j:slf4j-simple from 1.7.36 to 2.0.9. Thanks to dependabot.
+o RAT-311:  Update commons-lang3 from 3.5 to 3.14.0. Thanks to dependabot.
+o RAT-311:  Update commons-compress from 1.21 to 1.25. Thanks to dependabot.
+o RAT-311:  Update commons-io from 2.11.0 to 2.15.1. Thanks to dependabot.
+o RAT-311:  Update commons-cli from 1.5.0 to 1.6.0. Thanks to dependabot.
+o RAT-311:  Update maven-pmd-plugin from 3.18.0 to 3.21.2. Thanks to dependabot.
+o RAT-311:  Update maven-dependency-plugin from 3.3.0 to 3.6.1. Thanks to dependabot.
+o RAT-311:  Update maven-compiler-plugin from 3.10.1 to 3.12.1. Thanks to dependabot.
+o RAT-311:  Update maven-javadoc-plugin from 3.4.1 to 3.6.3. Thanks to dependabot.
+o RAT-311:  Update maven-release-plugin from 2.5.3 to 3.0.1. Thanks to dependabot.
+o RAT-311:  Update maven-enforcer-plugin from 3.1.0 to 3.4.1. Thanks to dependabot.
+o RAT-311:  Update extra-enforcer-rules from 1.6.1 to 1.7.0 Thanks to dependabot.
+o RAT-311:  Update maven-release-plugin from 2.5.3 to 3.0.1. Thanks to dependabot.
+o RAT-311:  Update animal-sniffer-maven-plugin from 1.22 to 1.23. Thanks to dependabot.
+o RAT-311:  Update maven-project-info-reports-plugin from 3.4.1 to 3.5.0. Thanks to dependabot.
+o RAT-311:  Update maven-surefire-plugin from 3.2.2 to 3.2.3. Thanks to dependabot.
 
 
 Historical list of changes: https://creadur.apache.org/rat/changes-report.html

From 69f850042db093d240692ab4796a30d8f8ba1f8a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Wed, 27 Dec 2023 01:48:48 +0100
Subject: [PATCH 201/299] RAT-311: Fill historic releaseNotes/changelog

---
 RELEASE_NOTES.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index c88e22a94..3fd8df1cb 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,57 @@
+Rat 0.16
+========
+Apart from dependency updates and multiple bugfixes, this release brings the ability to use SPDX license identifiers and enhances the .gitignore-exclusion filterung during RAT runs.
+Furthermore new CLI options were added and new file types can be used by default. This release makes RAT a fully Maven3-compatible plugin and removes deprecated Maven2 completely.
+Thanks to all new contributors for improving RAT!
+
+New features:
+o RAT-338:  Update minimal build Maven version to 3.2.5 and maven dependencies to 3.9.6. Remove pre-JDK8 code constructs and minor refactorings. Thanks to Tamás Cservenák.
+o RAT-335:  Enhance .gitignore handling; support multiple .gitignore files and allow a more complete parsing of Git's ignore files. Thanks to Niels Basjes.
+o RAT-322:  Add configuration option to scan hidden directories: --scan-hidden-directories on the command line and scanHiddenDirectories as a Maven plugin parameter. Thanks to Jean-Baptiste Onofré.
+o RAT-320:  Add new command line option -o/--output to write RAT's output to a file. Thanks to Jean-Baptiste Onofré.
+o RAT-329:  Add markdown (MD) and yaml (YML/YAML) as a recognized extension for file and license processing. Thanks to Claude Warren.
+o RAT-316:  Add default exclusion of MANIFEST.MF as it must not contain comment lines to include a license.
+o RAT-321:  Allow text-based XML configuration of RAT. Thanks to Claude Warren.
+
+Fixed Bugs:
+o RAT-326:  Fix existing javadoc build errors and add javadoc generation to existing GithubActions to not introduce build errors via merge requests.
+o RAT-328:  Ensure that System.out does not get closed during report generation and updated javadocs. Thanks to Claude Warren.
+o RAT-311:  Update commons-compress to 1.24.0 in order to circumvent CVE-2023-42503.
+o RAT-251:  Added SPDX processing for default licenses. Thanks to Claude Warren.
+o RAT-315:  Fix warnings when using RAT with newer Maven versions as methods from Maven v2 are deprecated. Minimum version of required Maven changed to 3.2.5. Thanks to Guillaume Nodet.
+o RAT-317:  Change log output level of SCM ignore parser from info to debug in order to produce less log output in RAT runs. Thanks to Gary Gregory.
+o RAT-314:  Add default recursive exclusion for maven-induced build artifacts in folder .mvn. Thanks to François Guillot.
+o RAT-312:  Remove Travis build as it is unreliable. Builds with ASF Jenkins and Github Actions remain as before.
+
+Changes:
+o RAT-311:  Update actions/setup-java from 3.4.1 to 4.0.0. Thanks to dependabot.
+o RAT-311:  Update actions/cache from 3.0.11 to 3.3.2 Thanks to dependabot.
+o RAT-311:  Update actions/checkout from 3 to 4. Thanks to dependabot.
+o RAT-311:  Update mockito-core from 4.7.0 to 4.11.0, newer versions 5.x cannot be applied due to our JDK8-compatibility restriction. Thanks to dependabot.
+o RAT-311:  Update plexus-utils from 3.4.2 to 3.5.1, versions 4.x are for upcoming Maven4 and must not be applied here. Thanks to dependabot.
+o RAT-311:  Update maven-plugin-version from 3.6.4 to 3.8.2. Thanks to dependabot.
+o RAT-311:  Update wagon-ssh from 3.5.2 to 3.5.3. Thanks to dependabot.
+o RAT-311:  Update Ant from 1.10.12 to 1.10.14. Thanks to dependabot.
+o RAT-311:  Update ASF parent pom from 27 to 31 and update multiple maven plugin versions implicitly (surefire, release, project-info, enforcer, jxr). Thanks to dependabot.
+o RAT-311:  Update doxiaVersion from 1.11.1 to 1.12.0. Thanks to dependabot.
+o RAT-311:  Update maven-shared-utils from 3.3.4 to 3.4.2. Thanks to dependabot.
+o RAT-311:  Update org.slf4j:slf4j-simple from 1.7.36 to 2.0.9. Thanks to dependabot.
+o RAT-311:  Update commons-lang3 from 3.5 to 3.14.0. Thanks to dependabot.
+o RAT-311:  Update commons-compress from 1.21 to 1.25. Thanks to dependabot.
+o RAT-311:  Update commons-io from 2.11.0 to 2.15.1. Thanks to dependabot.
+o RAT-311:  Update commons-cli from 1.5.0 to 1.6.0. Thanks to dependabot.
+o RAT-311:  Update maven-pmd-plugin from 3.18.0 to 3.21.2. Thanks to dependabot.
+o RAT-311:  Update maven-dependency-plugin from 3.3.0 to 3.6.1. Thanks to dependabot.
+o RAT-311:  Update maven-compiler-plugin from 3.10.1 to 3.12.1. Thanks to dependabot.
+o RAT-311:  Update maven-javadoc-plugin from 3.4.1 to 3.6.3. Thanks to dependabot.
+o RAT-311:  Update maven-release-plugin from 2.5.3 to 3.0.1. Thanks to dependabot.
+o RAT-311:  Update maven-enforcer-plugin from 3.1.0 to 3.4.1. Thanks to dependabot.
+o RAT-311:  Update extra-enforcer-rules from 1.6.1 to 1.7.0 Thanks to dependabot.
+o RAT-311:  Update maven-release-plugin from 2.5.3 to 3.0.1. Thanks to dependabot.
+o RAT-311:  Update animal-sniffer-maven-plugin from 1.22 to 1.23. Thanks to dependabot.
+o RAT-311:  Update maven-project-info-reports-plugin from 3.4.1 to 3.5.0. Thanks to dependabot.
+o RAT-311:  Update maven-surefire-plugin from 3.2.2 to 3.2.3. Thanks to dependabot.
+
 Rat 0.15
 ========
 This release fixes a warning during site builds and updates various dependencies.

From c2200fb2651a9ca3960650e7a8d808b6cc886d31 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 28 Dec 2023 00:57:33 +0100
Subject: [PATCH 202/299] Prepare release 0.16

---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 97c9e31e6..0feb25fbb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -57,7 +57,7 @@ The <action> type attribute can be add,update,fix,remove.
       </action>
     </release>
     -->
-    <release version="0.16" date="2023-12-27" description=
+    <release version="0.16" date="2023-12-28" description=
 "Apart from dependency updates and multiple bugfixes,
 this release brings the ability to use SPDX license identifiers and enhances the .gitignore-exclusion filterung during RAT runs.
 

From f26cb24b790cacd6740ce7a088bd6f99301b7fb0 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 28 Dec 2023 01:34:55 +0100
Subject: [PATCH 203/299] [maven-release-plugin] prepare release
 apache-rat-project-0.16

---
 apache-rat-api/pom.xml    |  2 +-
 apache-rat-core/pom.xml   |  2 +-
 apache-rat-plugin/pom.xml |  4 ++--
 apache-rat-tasks/pom.xml  | 24 ++++++++++++------------
 apache-rat/pom.xml        |  4 ++--
 pom.xml                   | 10 +++++-----
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
index 74ff54f2c..f2291e3ab 100644
--- a/apache-rat-api/pom.xml
+++ b/apache-rat-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>apache-rat-api</artifactId>
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 1f2471d7b..8c6a2ca57 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>apache-rat-core</artifactId>
   <packaging>jar</packaging>
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 0280ddf69..e992e1ff9 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>apache-rat-project</artifactId>
     <groupId>org.apache.rat</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>apache-rat-plugin</artifactId>
@@ -116,7 +116,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 414be753f..e6aedb73a 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>apache-rat-tasks</artifactId>
   <packaging>jar</packaging>
@@ -113,18 +113,18 @@
             <configuration>
               <target>
                 <ant antfile="src/test/resources/antunit/report-bad-configurations.xml" inheritAll="false" inheritRefs="false">
-                  <property name="jar.name" location="${project.build.outputDirectory}"/>
-                  <property name="base.dir" location="${basedir}"/>
-                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
-                  <property name="test.skipped" value="${maven.test.skip}"/>
-                  <property name="test.classpath" refid="maven.test.classpath"/>
+                  <property name="jar.name" location="${project.build.outputDirectory}" />
+                  <property name="base.dir" location="${basedir}" />
+                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar" />
+                  <property name="test.skipped" value="${maven.test.skip}" />
+                  <property name="test.classpath" refid="maven.test.classpath" />
                 </ant>
                 <ant antfile="src/test/resources/antunit/report-normal-operation.xml" inheritAll="false" inheritRefs="false">
-                  <property name="jar.name" location="${project.build.outputDirectory}"/>
-                  <property name="base.dir" location="${basedir}"/>
-                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
-                  <property name="test.skipped" value="${maven.test.skip}"/>
-                  <property name="test.classpath" refid="maven.test.classpath"/>
+                  <property name="jar.name" location="${project.build.outputDirectory}" />
+                  <property name="base.dir" location="${basedir}" />
+                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar" />
+                  <property name="test.skipped" value="${maven.test.skip}" />
+                  <property name="test.classpath" refid="maven.test.classpath" />
                 </ant>
               </target>
             </configuration>
@@ -162,7 +162,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index fdc7e324d..b1c50ea96 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>apache-rat</artifactId>
   <packaging>jar</packaging>
@@ -149,7 +149,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/pom.xml b/pom.xml
index 1f6734823..8b8334bab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>
-  <version>0.16-SNAPSHOT</version>
+  <version>0.16</version>
   <packaging>pom</packaging>
   <name>Apache Creadur Rat</name>
   <url>https://creadur.apache.org/rat/</url>
@@ -45,7 +45,7 @@ agnostic home for software distribution comprehension and audit tools.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>10</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1703723669</project.build.outputTimestamp>
     <ant.version>1.10.14</ant.version>
     <mockito.version>4.11.0</mockito.version>
     <javaVersion>1.8</javaVersion>
@@ -422,7 +422,7 @@ agnostic home for software distribution comprehension and audit tools.
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -444,7 +444,7 @@ agnostic home for software distribution comprehension and audit tools.
             </goals>
             <configuration>
               <target>
-                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false"/>
+                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false" />
               </target>
             </configuration>
           </execution>
@@ -651,7 +651,7 @@ agnostic home for software distribution comprehension and audit tools.
     <connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf?p=creadur-rat.git</url>
-    <tag>HEAD</tag>
+    <tag>apache-rat-project-0.16</tag>
   </scm>
   <modules>
     <module>apache-rat-api</module>

From 195c99fd992d42a5b741d0e322078aa05adee071 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 28 Dec 2023 01:35:04 +0100
Subject: [PATCH 204/299] [maven-release-plugin] prepare for next development
 iteration

---
 apache-rat-api/pom.xml    | 2 +-
 apache-rat-core/pom.xml   | 2 +-
 apache-rat-plugin/pom.xml | 2 +-
 apache-rat-tasks/pom.xml  | 2 +-
 apache-rat/pom.xml        | 2 +-
 pom.xml                   | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
index f2291e3ab..2ebca482a 100644
--- a/apache-rat-api/pom.xml
+++ b/apache-rat-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16</version>
+    <version>0.17-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>apache-rat-api</artifactId>
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 8c6a2ca57..360ed454f 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16</version>
+    <version>0.17-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat-core</artifactId>
   <packaging>jar</packaging>
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index e992e1ff9..fef6b24c1 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>apache-rat-project</artifactId>
     <groupId>org.apache.rat</groupId>
-    <version>0.16</version>
+    <version>0.17-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>apache-rat-plugin</artifactId>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index e6aedb73a..3dcab27a7 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16</version>
+    <version>0.17-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat-tasks</artifactId>
   <packaging>jar</packaging>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index b1c50ea96..73c90056c 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.16</version>
+    <version>0.17-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat</artifactId>
   <packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 8b8334bab..292d4177f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>
-  <version>0.16</version>
+  <version>0.17-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Creadur Rat</name>
   <url>https://creadur.apache.org/rat/</url>
@@ -45,7 +45,7 @@ agnostic home for software distribution comprehension and audit tools.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>1703723669</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1703723704</project.build.outputTimestamp>
     <ant.version>1.10.14</ant.version>
     <mockito.version>4.11.0</mockito.version>
     <javaVersion>1.8</javaVersion>
@@ -651,7 +651,7 @@ agnostic home for software distribution comprehension and audit tools.
     <connection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/creadur-rat.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf?p=creadur-rat.git</url>
-    <tag>apache-rat-project-0.16</tag>
+    <tag>HEAD</tag>
   </scm>
   <modules>
     <module>apache-rat-api</module>

From 946f7b2a0cf0b31895d2b1d36a5048f14ffa7b67 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 28 Dec 2023 01:54:03 +0100
Subject: [PATCH 205/299] RAT-339: Prepare for next release

---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index 2c2d58d97..67d6aa00a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Creadur Rat
-Copyright 2006-2021 The Apache Software Foundation
+Copyright 2006-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).

From 71b2d19c52a030a512c80f6d3a1d9387a4976f13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 00:20:20 +0000
Subject: [PATCH 206/299] Bump org.slf4j:slf4j-simple from 2.0.9 to 2.0.10

Bumps org.slf4j:slf4j-simple from 2.0.9 to 2.0.10.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index fef6b24c1..cbac5333d 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -297,7 +297,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.9</version>
+      <version>2.0.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 7ed01f9bdeebdc3903bcdfa10c687764bbad8b59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 00:49:41 +0000
Subject: [PATCH 207/299] Bump org.apache.maven.plugins:maven-jxr-plugin from
 3.3.1 to 3.3.2

Bumps [org.apache.maven.plugins:maven-jxr-plugin](https://github.com/apache/maven-jxr) from 3.3.1 to 3.3.2.
- [Commits](https://github.com/apache/maven-jxr/compare/jxr-3.3.1...jxr-3.3.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jxr-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 292d4177f..3458c2b0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,7 +237,7 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2</version>
         <reportSets>
           <reportSet>
             <reports>

From 5f3e3537cfea9638def376d5810b218e87509e88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 00:56:14 +0000
Subject: [PATCH 208/299] Bump org.assertj:assertj-core from 3.24.2 to 3.25.1

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 292d4177f..612f6be86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@ agnostic home for software distribution comprehension and audit tools.
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
-        <version>3.24.2</version>
+        <version>3.25.1</version>
         <scope>test</scope>
       </dependency>
     </dependencies>

From 94c039f6dd9c7cff47f90206f480edea7e73dfbf Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 8 Jan 2024 22:48:06 +0100
Subject: [PATCH 209/299] RAT-339: Prepare for next release and use v0.16 in
 RAT's builds

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 292d4177f..38396ea75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenJavadocPluginVersion>3.6.3</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.21.2</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
-    <previousRatVersion>0.16</previousRatVersion>
-    <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
+    <previousRatVersion>0.17</previousRatVersion>
+    <currentSnapshotRatVersion>0.18-SNAPSHOT</currentSnapshotRatVersion>
   </properties>
   <distributionManagement>
     <site>

From b1071b6b1c487dc0e1dce0b753126341d0e8bf69 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 9 Jan 2024 00:08:52 +0100
Subject: [PATCH 210/299] RAT-339: Prepare for new development cycle

---
 pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 38396ea75..293c3fab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -354,7 +354,7 @@ agnostic home for software distribution comprehension and audit tools.
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <!-- Do not use property values here as this causes problems during release -->
-          <version>0.15</version>
+          <version>0.16</version>
           <configuration>
             <excludes>
               <exclude>.asf.yaml</exclude>
@@ -416,7 +416,7 @@ agnostic home for software distribution comprehension and audit tools.
                     <artifactId>
         							apache-rat-plugin
         						</artifactId>
-                    <versionRange>[0.15,)</versionRange>
+                    <versionRange>[0.16,)</versionRange>
                     <goals>
                       <goal>check</goal>
                     </goals>
@@ -525,7 +525,6 @@ agnostic home for software distribution comprehension and audit tools.
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>
-        <!-- Last version that is compatible with Maven 2 -->
         <version>3.5.3</version>
       </extension>
     </extensions>
@@ -754,8 +753,8 @@ agnostic home for software distribution comprehension and audit tools.
   <!-- in order to test new releases this reference can be activated locally-->
   <pluginRepositories>
     <pluginRepository>
-      <id>staged-releases-rat-015</id>
-      <url>https://repository.apache.org/content/repositories/orgapachecreadur-1008/</url>
+      <id>staged-releases-rat-016</id>
+      <url>https://repository.apache.org/content/repositories/orgapachecreadur-1010/</url>
     </pluginRepository>
   </pluginRepositories>
 </project>

From 585f24af608c975e26e2e7d45b7d489563786ac5 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 9 Jan 2024 00:12:35 +0100
Subject: [PATCH 211/299] RAT-339: Add new 0.17 changelog

---
 src/changes/changes.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0feb25fbb..e104ef1cf 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -51,12 +51,17 @@ The <action> type attribute can be add,update,fix,remove.
   </properties>
 
   <body>
-    <!--release version="0.17-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+    <!--release version="0.18-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
       <action issue="RAT-xxx" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.17.
+        TODO: collect all dependabot updates for release 0.18.
       </action>
     </release>
     -->
+    <release version="0.17-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.17.
+      </action>
+    </release>
     <release version="0.16" date="2023-12-28" description=
 "Apart from dependency updates and multiple bugfixes,
 this release brings the ability to use SPDX license identifiers and enhances the .gitignore-exclusion filterung during RAT runs.

From 04d48f1993b8c461c353287a13d565e58a59d72c Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 9 Jan 2024 00:19:32 +0100
Subject: [PATCH 212/299] RAT-314,RAT-339: Prepare for next release.

---
 pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 293c3fab8..1f4a7dfb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -366,8 +366,6 @@ agnostic home for software distribution comprehension and audit tools.
               <exclude>apache-rat-plugin/src/test/resources/**</exclude>
               <exclude>apache-rat-plugin/src/it/**</exclude>
               <exclude>apache-rat-tasks/src/test/resources/**</exclude>
-              <!-- RAT-314: Can be removed after 0.16 is used for scanning -->
-              <exclude>**/.mvn/**</exclude>
               <exclude>**/iso-8859-1.html</exclude>
               <exclude>**/velocity.log</exclude>
             </excludes>
@@ -750,11 +748,11 @@ agnostic home for software distribution comprehension and audit tools.
       </build>
     </profile>
   </profiles>
-  <!-- in order to test new releases this reference can be activated locally-->
+  <!-- in order to test new releases this reference can be activated locally
   <pluginRepositories>
     <pluginRepository>
       <id>staged-releases-rat-016</id>
       <url>https://repository.apache.org/content/repositories/orgapachecreadur-1010/</url>
     </pluginRepository>
-  </pluginRepositories>
+  </pluginRepositories-->
 </project>

From 9e5715be41cda25dccda9648354acdc46fe24542 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 9 Jan 2024 00:20:05 +0100
Subject: [PATCH 213/299] RAT-342: Add maven wrapper

---
 .mvn/wrapper/maven-wrapper.jar        | Bin 0 -> 62547 bytes
 .mvn/wrapper/maven-wrapper.properties |  18 ++
 mvnw                                  | 308 ++++++++++++++++++++++++++
 mvnw.cmd                              | 205 +++++++++++++++++
 4 files changed, 531 insertions(+)
 create mode 100644 .mvn/wrapper/maven-wrapper.jar
 create mode 100644 .mvn/wrapper/maven-wrapper.properties
 create mode 100755 mvnw
 create mode 100644 mvnw.cmd

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..cb28b0e37c7d206feb564310fdeec0927af4123a
GIT binary patch
literal 62547
zcmb5V1CS=sk~Z9!wr$(CZEL#U=Co~N+O}=mwr$(Cds^S@-Tij=#=rmlVk@E|Dyp8$
z$UKz?`Q$l@GN3=8fq)=^fVx`E)Pern1@-q?PE1vZPD);!LGdpP^)C$aAFx&{CzjH`
zpQV9;fd0PyFPNN=yp*_@iYmRFcvOrKbU!1a*o)t$0ex(~3z5?bw11HQYW_uDngyer
za60w&wz^`W&Z!0XSH^cLNR&k>%)Vr|$}(wfBzmSbuK^)dy#xr@_NZVszJASn12dw;
z-KbI5yz=2awY0>OUF)&crfPu&tVl|!>g*#ur@K=$@8N05<_Mldg}X`N6O<~3|Dpk3
z<UIRcbhf^wCy5@WX~(j;#aN);In?VFeoy+)_ZgQb$iI2^KR3XSzn<ATnEu1}{}}=E
z9|!|G14A?8e*r}LXP~u#i?PkWfMfkna90NdJ3C{Ce<6nVufz<k%>RWb!e7z<{Mr96
z^C<tn;J@ue|L?6p{|{;U|F^a5{|hbu&`I~-b^cc{W=ISH+yB)C^EVjL{<}_5F-0+X
zQ89TDDKV9*Xd!42CRni-J~8^-u8>{%ROigEIapRGbFA5g4XoQAe_Y1ii3Ci!KV`?$
zZ2Hy<C%~!g%>1VP#hVp>OOqe~m|lo@^276Ik<~*6eRSOe;$wn_0@St#cJy}qI#RP=
zHVMXyFYYX%T_k3MNbtOX{<*_6Htq*o|7~MkS|A|A|8AqKl!%zTirAJGz;R<3&F7_N
z)uC9$9K1M-)g0#}tnM(lO2k~W&4xT7gshgZ1-y2Yo-q9Li7%zguh7W#kGfnjo7Cl6
z!^wTtP392HU0aVB!$cPHjdK}yi7xNMp+KVZy3_u}+lBCloJ&C?#NE@y$_{Uv83*iV
zhDOcv`=|CiyQ5)C4fghUmxmwBP0fvuR>aV`bZ3{Q4&6-(M@5sHt0M(}WetqItGB1C
z<I^6UkIt-$#>CU-)_n-VD;(6T1%0(@6%U`UgUwgJCCdXvI#f%79Elbg4^yucgfW1^
zNF!|C39SaXsqU9kIimX0vZ`U29)>O|Kfs*hXBXC;Cs9_Zos3%8lu)JGm~c19+j8Va
z)~kFfHouwMbfRHJ``%9mLj_bCx!<)O9XNq&uH(>(Q0V7-gom7$kxSpjpPiYGG{IT8
zKdjoDkkMTL9-|vXDuUL=B-K)nVaSFd5TsX0v1C$ETE1Ajnhe9ept?d;xVCWMc$MbR
zL{-oP*vjp_3%f0b8h!Qija6rzq~E!#7X~8^ZUb#@rnF~sG0hx^Ok?G9dwmit494OT
z_WQzm_sR_#%|I`jx5(6aJYTLv;3U#e@*^jms9#~U`eHOZZEB~yn=4UA(=_U#pYn5e
zeeaDmq-$-)&)5Y}h1zDbftv>|?GjQ=)qUw*^<?4Qug_064CXwb#|8rsLI=CxwcLMz
zHjR>CkcAG#o%I8i186AbS@;qrezPCQYWHe=q-5zF>xO*Kk|VTZD<z}3d$|FhBQ-9;
zqXBmTu5iJ4hp;Gs+m1*Vmumq~RFG#&_!3&SYE_j%M~{|r=-+{W#^QN9Rw+$1+{%u6
ztTEKsz<ibfGp7oB*V_V?r`nNQhejgKB9M!aO%fqpSOLYrkD4c!#z&skA|))ZO{*`k
zJiGGtOZX4GRzoXF0Sim5*SgIy_(pgr5T!XTFXdq0d|T}AI&|e)cS&s~zT6ahCt1l1
zT|;3k<!J&(m^dI)-x>;t={XqrKfR|{itr~k71VS?cBc=9zgeFbpeQf*Wad-tAW7(o
ze6RbNeu31Uebi}b0>|=7ZjH*J+zSj8fy|+T)+X{N8Vv^d+USG3arWZ?pz)WD)VW}P
z0!D>}01W#e@VWTL8w1m|h`D(EnHc*C5#1WK4<w{2hR-Qu&>G|C5ViXO$YzKfJkda#
z2c2*qXI-StLW*7_c-%Dws+D#Kkv^gL!_=GMn?Y^0J7*3le!!fTzSux%=1T$O8oy8j
z%)PQ9!O+>+y+Dw*r`*}y4SpUa21pWJ$gEDXCZg8L+B!pYWd8X;jRBQkN_b=#tb6Nx
zVodM4k?gF&R&P=s`B3d@M5Qvr;1;i_w1AI=*rH(G1kVRMC`_nohm~Ie5^YW<LklCW
zh?^^=kj`^XEK69~Ax?b9{=IxK!iA{9zQKS!OQBs_q=bOVeg`#Vca$a>YqZMV2<`J*
z`i)p799U_mcUjKYn!^T&hu7`Lw$PkddV&W(ni)y|9f}rGr|i-7nnfH6nyB$Q{(*Nv
zZz@~rzWM#V@sjT3ewv9c`pP@xM6D!StnV@qCdO${loe(4Gy00NDF5&@Ku;h2P+Vh7
z(X6De$cX5@V}DH<wT@;7^h<^tnD`tVgF}!?NK3t*7|j8KqjdQQ5uVLe^{23OdE6J2
zi-0=62~C{kkvIc0W}2vwiFG56-KK++>XG?K^6mV>XiT768Ee^ye&Cs=2yefVcFn|G
zBz$~J(ld&1j@%`sBK^^0Gs$I$q9{R}!HhVu|B@Bhb29PF(%U6#P|T|{ughrfjB@s-
zZ)nWbT=6f6aVyk86h(0{NqFg#_d-&q^A@E2l0Iu0(C1@^s6Y-G0r32qll>aW3cHP#
zyH`KWu&2?XrIGVB6LOgb+$1zrsW>c2!a(2Y!TnGSAg(|akb#ROpk$~$h}jiY&nWEz
zmMxk4&H$8yk(6GKOLQCx$Ji-5H%$Oo4l7~@gbHzNj;iC%_g-+`hCf=YA>Z&F)I1sI
z%?Mm27>#i5b5x*U%#QE0wgsN|L73Qf%Mq)<FQ&Mo1iYC<$9{B|SppV_E$JUy-=H_z
zz06Apsrs`HuztjT{?R!3GII}_EH}V95C%MNxuHj3L8US5&QZJw;l36?K5xH)l_K$0
znUElOm7XhO^~p0~<$C#{JI1?hYqwbOII}7vSC7<aaLW3&Kdf9hYl)%8s&MQZ0xq59
zwdB?`0fITRbCh@%dfBfS*U0Po3sibYz+b*`qUs70(HMcC_8}J)bfq(-w&j^SzhbH(
zn{4Ql+5QMT3&Y1k8*+0S&jQqiY{<T32~TidB2;UMTbhU4Qj8dR#m&VJ6+W<d8N^6l
zY!*TBo0I_bAo_K=Ui&{JN?&n%mE`n?vTU0YGMTwf5TnsP=8#pum}G~F<1i^z%*4Hm
z1I0;>QW@O+)a;#mQN?b8e#X%wHbZyA_F+`P%-1SZVnTPPMermk1Rpm#(;z^tMJqwt
zDMHw=^c9%?#BcjyPGZFlGOC12RN(i`QAez>VM4#BK&Tm~MZ_!#U8PR->|l+38rIqk
zap{3_ei_txm=KL<4p_ukI`9GAEZ+--)Z%)I+9LYO!c|rF=Da5DE@8%g-Zb*O-z8Tv
zzbvTzeUcYFgy{b)<cdkL$=7b>8Q6+BPl*C}p~DiX%RHMlZf;NmCH;xy=D6Ii;tGU~
zM?k;9X_E?)-wP|VRChb4LrAL*?XD6R2L(MxRFolr6GJ$C>Ihr*nv#lBU>Yklt`-bQ
zr;5c(o}R!m4PRz=CnYcQv}m?O=CA(PWBW0?)UY)5d4Kf;8-HU@=xMnA#uw{g`hK{U
zB-EQG%T-7FMuUQ;r2xgBi1w69b-Jk8Kujr>`C#&kw-kx_R_GLRC}oum#c{je^h&x9
zoEe)8uUX|SahpME4SEog-5X^wQE0^I!YEHlwawJ|l^^0kD)z{o4^I$Eha$5tzD*A8
zR<*lss4U5N*JCYl;sxBaQkB3M8VT|gXibxFR-NH4Hsmw|{={*Xk)%!$IeqpW&($DQ
zuf$~fL+;QIaK?EUfKSX;Gpbm8{<=v#$SrH~P-it--v1kL>3SbJS@>hAE2x_k1-iK#
zRN~My-v@dGN3E#c!V1(nOH>vJ{rcOVCx$5s7B?7EKe%B`bb<ObEfr$*j`M4kQDF;^
z$)<Ep9ojr!n+?@Fw@c#)27Pxjsx};#DZb2Y&}NG1g?*LP#{7$EO((8w#!RKKv8+s!
zmv=7waG@<#niQdBy4YRHFJYrx3N5-4$8=1zh$))fFm1IA*BJyQ#7kx>x(8}km#t2a
z1A~COG(S4C7~h~k+3;NkxdA4gbB7bRVbm%$DXK0TSBI=Ph6f+PA@$t){_NrRLb`jp
zn1u=O0C8%&`rdQgO3kEi#QqiBQcBcbG3<hi%oScTlJZoPB79~!s@@L+Y$N(R9Hx$4
zV5*-?&7y$QGs;^8evwiVm6-BL!fam-?7{M?Mz0#DP0!a3UjblLaFBgObQXLaEa7QC
zDpwbhz~C1Q3t7E>wqPrJ8+0r<`L0Co-n8y-NbWbx;}DTq@F<bOLiVNd9q}vMnA%*P
zTc~6w2P#ybh5aX13s80NZKZzTE}CBpehKRdZ&stlyBvCO(}_UMi#aFz(mWPfxAV>D
z1b)B$b>Nwx^2;+oIcgW(4I`5DeLE$mWYYc7#tishbd;Y!oQLxI>?6_zq7Ej)92xAZ
z!D0mfl|v4EC<3(06V8m+BS)Vx90b=xBSTwTznptIbt5u5KD54$vwl|kp#RpZuJ*k)
z>jw52JS&x<m<yy)V<(rx5_MF@vO5QoqfZORCiaA`)1Q1l`h33tsqFS>)9&g3RDXGV
zE<BxgBMRv3bbTT<YJb#v^>lux37>A=`#5(UuRx&d4qxrV<38_w?#plbw03l9>Nz$Y
zZS;fNq6>cGvoASa2y(D&qR9_{@tVrnvduek+riBR#VCG|4Ne^w@mf2<b0Xn$^ftK!
zUQQ=+H;=)de`O~X*S(2dn6pgOy`*q?!IKY(-85~U2Gh@^{B#GK&9Ncm`w8x~G+T?}
z6e!Pw(-fFN3z<tqfaPSdVWzKF)K0r^?aG98G(0wAdhqEV1~UDK(?ujKF>Y;-k90%V
zpA6dVw|naH;pM~VAwLcQZ|pyTEr;_S2GpkB?7)+?cW{0yE$G43`viTn+^}IPNlDo3
zmE`*)*tFe^=p+a{a5xR;H0r=&!u9y)kYUv@;NU<!rIJfL66+0T%iYwZHC+LgKD!GA
zL2IuLX8^c^t$6){JO|ImKi}$)?tUU7S6^uOiZVyRkp*dn$0c%G9<kf89AYO}@9xx9
z9}W$KUx0n+k54zm6XQXH_DXzKo%rRiC%91{+rV3g0E`)|+bwNc=}IWGAm7f`2V%5y
zS}OkQ*mi}5r`P)1wTtFn;fX9JUa%smlf(Kflj`0L3o$nkMG5TjYE`e$?2%mjPk2<<
z@~hjWcveKi26iD=1NNvKVI*7kpxS`Rlp3vF-c*L}o_Sy)!+^VjHA9NQDkE0RH5Qc2
zX$jj#Cpi}!WUiJT^gN>KZ)`u-KFTv0S&FTEQc;D3d|KEKSxirI9TtAWe#h<v>vOXV
z>807~TWI~^rL?)WMmi!T!j-vjsw@f11?#jNTu^cmjp!+A1f__Dw!7oqF>&r$V7gc<
z?6D92h~Y?faUD+I8V!w~8Z%ws5<LtywtI0$0z0`d=2}3Z9=A0Nhc(xGwuR&T+hlz^
zpBVI%AC{;K=EAv4;Pu18IQ)TS;&I$>S{20(AkaTZc>=z`ZK=>ik1td7Op#vAnD;8S
zh<>2tmEZiSm-nEjua<oYdF>WVE)aUXp$BumSS;qw#Xy7-yeq)(<{2G#ap8z)+lTi(
ziMb<AO!rU+vI9Y9hi52#H5Z_Oqm-X<*c418GCXRIFf$<tw{O+jDt#P>-iig6!==yk
zb6{;1hs`#qO5OJQlcJ|62g!?fbI^6v-(`tAQ%Drjcm!`-$%Q#@yw3pf`mXjN>=BSH
z(Nftnf50zUUTK;htPt0ONKJq1_d0!a^g>DeNCNpoyZhsnch+s|jXg1!NnEv%li2yw
zL}Y=P3u`S%Fj)lhWv0vF4}R;rh4&}2YB8B!|7^}a{#O<YYC_ba{El6}Ou&a<3Fhm!
zWDn>ac|%oFdMToRrWxEIEN<0CG@_j#R4%R4i0$*6xzzr}^`rI!#y9Xkr{+Rt9G$*@
zQ}XJ+_dl^9@(QYdlXLIMI_Q2uSl>N9g*YXMjddFvVouadTFwyNOT0uG$p!rGF5*`1
z&xsKPj&;t10m&pdPv+LpZd$pyI_v1IJnMD%kWn{vY=O3k1sJRYwPoDV1S4OfVz4FB
z$^ygjgHCW=ySKSsoSA&wSlq83JB+O-)s>>e@a{_FjB{@=AlrX7wq>JE=n@<VNDUqc
zh~=-r|3**!2l@2xq|N`ONQ7-|ogAJ1GDdO+<~Ax$1`bZf4)lgr29AzN8kU|oLufuD
z$&K}$P+@i;(ygU(QN|<5(uAyWa738GnWHWiN6I6!PGnV8a)&y`P4!vLsPn~CvoI^o
zKg{wpJQ(t-7z+J-&O^Qme5kxli`1H)xp|*RZZ0#qPA0i-+9of1z8>}@fba(;n4EG|
zge1i<k^HPrn!xB(<|f-FjrKZqoqiCL1e<flKspuwQ5ZoKOYu()w<!e?N#;wLE7z*4
zG(Bzt+nS_Z*J>)?NE@M@DC5eEv<yyjW!;#w_S-OlYe-x;CkMMU#HIo*%j_sJ|Cy#)
zkZ&q)Chy)V5L&8V(Tf)awl$WSJ|3mss6}ULPPV09D<^2JcPWnBLUXEA2g(DskHZEX
zh<A}_J$sedQb5DQjysSgNx53|i{tv92H!GN?ub3~h|&e&S}j)f4$Dhjf8=}CibXBg
zRNnPI#Uh&jhJ=FG`GQQlD@SFHCdozVHPGau7-azcajduK#~&3I9~JgFQV~wyE@*Hy
zSfZ<l*RlF4OEN#Yp?10_&j<V*9k}ya)dzR97ej*2%CqTGW9~ok2aaYM7AiFPZi>4;
z#R~0aNssmFHANL@-eDq2_jFn=MXE9y>1FZH4&v<}vEdB6Kz^l)X%%X@E#4)ahB(KY
zx8RH+1*6b|o1$_lRqi^)qoLs;eV5zkKSN;HDwJIx#ceKS!A$ZJ-BpJSc*zl+D~EM2
zm@Kpq2M*kX`;gES_Dd1Y#UH`i!#1HdehqP^{DA-AW^dV(UPu|O<jvzCHjx?S&$X_@
zI63*jpF(JzqsSD70uo-eumPq+*u>@Hvr>?X3^~=1i<W7`R1=`lXYRLQ>aRa~AVXbj
z-yGL<(5}*)su2Tj#oIt+c6Gh}$0|sUYGGDzNMX+$Oi$e&UJt3&kwu)HX+XP{es(S3
z%9C9y({_fu>^BKjI7k;mZ4DKrdqxw`IM#8{Sh?X(6WE4S6-9M}U0&e32fV$2w{`19
zd=9JfCaYm@J$;nSG3(|byYDqh>c%`JW)W*Y0&K~g6)W?AvVP&DsF_6!fG3i%j^Q>R
zR_j5@NguaZB{&XjXF+~6m|utO*pxq$8?0GjW0J-e6Lnf0c@}hvom8KOnirhjOM7!n
zP#Iv^0_BqJI?hR5+Dl}p!7X}^NvFOCGvh9y*hgik<&X)3UcEBCdUr$Dt8?0f&LSur
ze*n!(V(7umZ%UCS>Hf(g=}39OcvGbf2+D;OZ089m_nUbdCE0PXJfnyrIlLXGh2D!m
zK=C#{JmoHY1ws47L0zeWkxxV=A%V8a&E^w%;fBp`PN_ndicD@oN?p?Bu~20>;h;W`
ztV=hI*Ts$6JXOwOY?sOk_1xjzNYA#40dD}|js#3V{SLhPEkn5>Ma+cGQ<o%qL<Q%n
z)p-m&QK15=GqmN<;E8=EA~$;A7zz7Gvv;^(c7@{n0c?w(sxQfHbV|Xpndn6B*C-VZ
zEgAOnx3+LF)@Qm`l532w37Q*TT(kKzuIq(^E9dw?fI0f$1gWd$=7wA+rX4l87liYB
z-Dx?;<Z)WFw+M|B0>i*#`g-*g56Q&@!dg)|1YpLai3Bu8a;l2fnD6&)MZ~hS%&J}k
z2p-wG=S|5YGy*Rcnm<9VIVq%~`Q{g(Vq4V)CP257v06=M2W|8AgZO0CC_}HVQ>`VU
zy;2LDlG1iwIeMj?l40_`21Qsm?d=1~6f4@_&`lp~pIeXnR)wF0z7FH&wu~L~mfmMr
zY4_w6tc{ZP&sa&Ui@UxZ*!UovRT})(p!GtQh~+AMZ6wcqMXM*4r@EaUdt>;Qs2Nt8
zDCJi#^Rwx|T|j_kZi6K!X>Ir%%UxaH>m6I9Yp;Sr;DKJ@{)dz4hpG>jX?>iiXzVQ0
zR$IzL8q11KPvIWIT{hU`TrFyI0YQh`#>J4XE*3;v^07C004~FC7TlRVVC}<}LC4h_
zZjZ)2*#)JyXPHcwte!}{y%i_!{^KwF9qzIRst@oUu~4m;1J_qR;Pz1KSI{rXY5_I_
z%gWC*%bNsb;v?>+TbM$qT`_U8{-g@egY=7+SN#(?RE<2nfrWrOn2OXK!ek7v`aDrH
zxCoFHyA&@^@m+#Y(*cohQ4B76me;)(t}{#7?E$_u#1fv)vUE5K;jmlgYI0$Mo!*EA
zf?dx$4L(?nyFbv|AF1kB!$P_q)wk1*@L<tI7)z|y;PAN-6?~)dmYAN5!m0%1M~LEF
z_<N}*>0>m<Jl7mrsl1+U-CsdkE{<0<uQ+i9Ep&l3?XC6Qx3CRj#I$i6V|7Gr^YPk6
zhuACdME6iF5tO0Sp&bG~!gP0FuN>SC(A8f4Rgmv1HG;QDWFj<(1oz)JHr+cP|EPET
zSD~QW&W(W?1PF-iZ()b|UrnB(#wG^NR!*X}t~OS-21dpXq)h)YcdA(1A`2n<G!shH
zgorijds{aB^i!X<=rORMTpWa4MGZ>zVFax9rx~WuN=SVt`OIR=eE@$^9&Gx_HCfN=
zI(V`)Jn+tJPF~mS?ED7#InwS&6<j%wm+|6WL34>OfH;qDzI_8@t>In6<x;*Gw*Yw%
z?iUIMsuaBB=x1Cv6H=|API5-Qjn3UQjCj{RP52pTmlOdCLoPdsSxY-;mqhdyM_>nl
zo}q{Ds*cTG*w3CH{Mw9*Zs|iDH^KqmhlLp_+wfw<q}t*Kwoi;C?nA6#x0ph>IS24G
z{c@fdgqy^Y)RNpI7va^nYr9;18t|j=AYDMpj)j1oNE;8+QQ)ap8O??lv%jbrb*a;}
z?OvnGXbtE9zt;TOyWc|$9BeSGQbfNZR`o_C!kMr|mzFvN+5;g2TgFo8DzgS2kkuw@
z=`Gq?xbAPzyf3MQ^ZXp>Gx4GwPD))qv<1EreWT!S@H-IpO{TPP1se8Yv8f@Xw>B}Y
z@#;egDL_+0WDA)AuP5@5Dyefuu&0g;P>ro9Qr>@2-VDrb(-whYxmWgkRGE(KC2LwS
z;ya>ASBlDMtcZCCD8h+Awq1%A|Hbx)rpn`REck#(J^SbjiHXe-jBp!?>~DC7Wb?mC
z_AN+^nOt;3tPnaRZBEpB6s|hCcFouWlA{3QJHP!EPBq1``CIsgMC<oiD!Y(*FZo;w
zV*qp3$&_F}b^rx3Q6+fj$mjwGERLlcI%ETo!VJMbFW)lV>YD#80(bsKpvwO)0#)1{
zos6v&9c=%W0G-T@9sfSLxeGZvnHk$SnHw57+5X4!u1dvH0YwOvuZ7M^2YOKra0dqR
zD`K@MTs(k@h>V<EOiB@Xpd=4(gUz@lE$jYOjyzm1&}<*!Rs!qBN&`PnJiRsJa<k3x
zn#=TN^5f&_3c?qRw>eI5UYI%n7#3L_WXVnpu$Vr-g}gEE>Y8ZQQsj_w<T+=4cBDUI
z3zkp6^ti5DdbC^)?WXC;d}!usTUL-UzoIL5Du@K0<KA78gAyOK-yYRC*Dg5fjkwYO
zROF(tM+b{E9J8!0hI##?+y~?U%m;fQFs^v{N_m5_8?LCHDZDZ$0*kX%bW|LbZjWQL
zTB=`B<b3rU-=J8L4|s0;0ViUpp^UW}G1IV2Ab5ThMPGCza-Xd~0YC60zSbU;gKl$N
z9~Y%0O9IHHIzU>bl&t6nj{;ga4q8SN#Z<H$(mh`y2lbG1u)2RcX{0)zUiZ0`we*v?
zRWs*-YCyVK70gkZd#3DJF$S`(#`gu(PtwS=>6cBZepMoyv7MF-tnnZp*(8jq848yZ
zsG_fP$Y-rtCAPPI7QC^nzQjlk;p3tk88!1dJuEFZ!BoB;c!T>L>xSD<#+4X%*;_IB
z0bZ%-SLOi5DV7uo{z}YLKHsOHfFIYlu8h(?gRs9@bbzk&dkvw*CWnV;GTAKOZfbY9
z(nKOTQ?fRRs(pr@KsUDq@*P`YUk4j=m?FIoIr)pHUCSE84|Qcf6GucZBRt;6oq_8Z
zP^R{LRMo?8>5oaye)Jgg9?H}q?%m@2bBI!XOOP1B0s$%htwA&XuR`=chDc2)ebgna
zFWvevD|V882V)@vt|>eeB+@<-L0^6NN%B5BREi8K=GwHVh6X>kCN+R3l{%oJw5g>F
zrj$rp$<x5{%Dd&c{zb=gqx|vjc$u+fQ~<=xa?|zwdGhl8?Rl}lAn?rTtF})J<_=<P
zZ<#BOvz#B`F%`?6pTYJ{XYKa0#X{@Itb@mF36=$j02&pwTyYm8wM_$O&f-@(m*T>9
zhepggNYDlBLM;Q*C<EOEy)e)av?`jZL9pOkqXYZ-rxvq`ZR8Dyp?#G?%a7?}>B&%w
zW+aY{Mj{=;Rc0dkUw~k)SwgT$RVEn+1QV;%<*FZg!1OcfOcLiF@~k$`IG|E8J0?R2
zk?iDGLR*b|9#WhNLtavx0&=Nx2NII{!@1T78VEA*I#65C`b5)8cGclxKQoVFM$P({
zLw<xqIAwsC7xGcp);pEM8LO0_(juAhdE3&t7P&jX@-eLqa<ai0ronDF_^r<;v+U|@
zC@$mmN@tejs)}KagB^2WXSC}ikckk+&RWL=^a{_cQaKr&N)+{KR&7~tyf}%abFX6q
zG71?g)D|Tr(C01Nx%MTj!z}=Yr1f20h6VmGKd5I!KY`Be@*2IG1gFw|%Cn(qlPd0O
z84OzfiAvR7_?7y;9-_0j7*MBGvi}S5uA$+K{Vpz->JKo9!9xN4Q8a2F`xL&_>KZfN
zOK?5jP%CT{^m4_jZ<Ofk;wOk0vVOYQ2{V0>ahnn4DrqgTr%(e_({|z2`C2NrR6=v9
z*|55wrjpExm3M&wQ^P?rQPmkI9Z9jlcB~4IfYuLaBV95OGm#E|YwBvj5Z}L~f`&wc
zrFo!zLX*C{d2}OGE{YCxyPDNV(%RZ7;;6oM*5a>5LmLy~_NIuhXTy-*>*^oo1L;`o
zlY#igc#sXmsfGHA{Vu$lCq$&Ok|9~pSl5Q3csNqZc-!a;O@R$G28a@Sg#&gnrYFsk
z&OjZtfIdsr%RV)bh>{>f883aoWuYCPDP{_)%yQhVdYh;6(EOO=;ztX1>n-LcOvCIr
zKPLkb`WG2;>r)LTp!~AlXjf-Oe3k`Chvw$l7SB2bA=x3s$;;VTFL0QcHliysKd^*n
zg-SNbtPnMAIBX7uiwi&vS)`dunX$}x)f=iwHH;OS6jZ9dYJ^w<lfOFp$uO|PqoKe=
zJgz#|0g$+Tl)t5#cE|+_jV8KY{V%c$Laj$p@i%@32}FkwW7Hb8JMPZxY9fn_slCD}
zH625V)Eo!6f!MlU+AeeHsx?FceCG-wq-|dg>Q=F#j9U{wJ9eGH<w^dj^Nd_mNS^fO
zCRQ7>^#vzm$HIm->xSO>WQ~nwLYQ8FS|?l!vWL<%j1~P<+07ZMKkTqE0F*Oy1FchM
z2(Nx-db%$WC~|loN~e!U`A4)V4@A|gPZh`TA18`y<vaS#sbRre(fEOZ<ZQ`PS>O1{
z(?VA_M6SYp-A#%JEppNHsV~kgW+*Ez=?H?GV!<$F^nOd+SZX(f0IoC#@A=TDv4B2M
z%G-laS}yqR0f+qnYW_e7E;5$Q!eO-%XWZML++hz$Xaq@c%2&ognqB2%k;Cs!WA6vl
z{6s3fwj*0Q_odHNXd(8234^=Asmc0#8ChzaSyIeCkO(wxqC=R`cZY1|TSK)EYx{W9
z!YXa8GER#Hx<^$eY>{d;u8*+0ocvY0f#D-}KO!`zyDD$%z1*2KI>T+Xmp)%%7c$P<
zvTF;ea#Zfzz51>&s<=tS74(t=Hm0dIncn~&zaxiohmQn>6x`R+%vT%~Dhc%RQ=Cj^
z&%gxxQo!zAsu6Z+Ud#P!%3is<<Hm1si9=xqaKmm4T>%*dJXe!*wZ-yidw|zw|C`cR
z`fiF^(yZt?p{ZX|8Ita<vJx0h&Nk}<hSUDZRD<|&3qOD7?uWd_MHD?1H1opJQfK+d
ztW7^b`(!2!%0cA+sr8KiD%0qLS0%s<S9`%W(R&h~TE3h!$P#l4TvGq@cp|%E&_3^y
z)wRvYW~ti8P<ruWC7N_&I5xZQLj$BkxrB4gt)%%>)UC$=fg6wOve?w+8ww|^7OQ0d
zN<D?s`3%O<hBdpfAJ73<>(3dmJ@mV8>74I$kQl8NM%aC+2l?<ziJOP3Nj$NBO$Zm5
za7tbYQO&zQsL8Y=lnnT@|2VtTDL)By(tj`_(D_k?kCmSKk>ZQ2pqkMs{&q(|4hwNM
z^xYnjj)q6uAK@m|H$g2ARS2($e9aqGYlEED9sT?~{isH3Sk}kjmZ05Atkgh^M6VNP
zX7@!i@k$yRsDK8RA1iqi0}#Phs7y(bKYAQbO9y=~10?8cXtIC4@gF#xZS;y3mAI`h
zZ^VmqwJ%W>kisQ!J6R?Zjcgar;Il%$jI*@y)B+fn^53<Z3}PY#ocRlS*4m6#eoc*D
z^G4bdDB%8R-xxSKw5X5N!@e@w<Cs)^$joR^dZ5p4{FPwT#LD@(RTvw82CuOhFPl}+
z-t<#hW3VmFyMwO^TrJ!LH~VAE$u^5iDMQ8BrteWL+0G@xEL`0_ME&_{X8`Ca!4abw
zAeWBDLb|k>jQd0`)=C~w%Lo?qw!q3fVi{~2arObUM{s=q)hgBn64~)W0tyi?(vlFb
z>tCE=B1c<v0(}7W0uhz(M(kMsw*YQ}w47E-&mhm6Ef1{TWF*PKwy=?0P*XW5qxT5`
zMC-?k44FrWAoLah+xtR$qBCfvVaKNt!O1KcH}mpwZ#c?O<Mu=BC@E&wD%$^p;{`J1
zUetF6jPkG{-O6%w->bfyY=V38fUGN(#vmn1aY!@v_c70}pa(Lrle-(-SH8Nd!emQF
zf3kz0cE~KzB%37B24|e=l4)<zlUVRGOPfvL4Ry<L1?}(JT*BC*@(p8NKIw11BVO*c
zzi`zk>L}g1AF@v%J*A;5F7li!>I0`lfO9TR+ak<Y$te4Zeg@NF38$FC=!n~!7Q}qT
z3E%7{E;d&)fB#sHG`!-w#VhkdO+nVCm}QNg+6YL|h|F__jT5<r@Eopd=*+*zY=lBX
zXJQnD37?aWyLx;>`xyqWnj5iwJ$>t_vp(bet2p(jRD;5Q9x2*`|FA4#5cfo8SF@cW
zeO{H7C0_YJ*P@_BEvm2dB}pUDYXq@G1^Ee#NY9Q`l`$BUXb01#lmQk^{g3?aaP~(*
zD;INgi#8TDZ&*@ZKhx$jA^H-H1Lp`%`O{Y{@_o!+7ST}{Ng^P;X>~Bci{|Qdf1{}p
z_kK+z<tDd@=j>L;>D30r6~R?|h!5NKYOi6X&I5)|ME+NG>d9^`hxKpU^)KBOpZiU^
z;|SzGWtbaclC-%9(zR-|q}kB8H&($nsB1LPAkgcm+Qs@cAov{IXxo5PHrH(8DuEMb
z3_R#>7^jjGeS7$!`}m8!8$z|)I~{dhd)SvoH9oR9#LjO{{8O&r7w{d9V1z^syn&E6
z{DG0vlQF_Yb3*|>RzVop^{$mWp|%NDYj@4{d*-@O^<(=L=DMFIQHEp-dtz@1Rumd;
zadt^4B#(uUyM6aeUJkGl0GfaULpR!2Ql&q$nEV^+SiDptdPbuJ=VJ)`czZ@&HPUuj
zc5dSRB&xk)dI~;6N?wkzI}}4K3i%I=EnlKGpPJ9hu?mNzH7|H0j(mN3(ubdaps3GM
z1i+9gk=!$mH=L#LRDf4!mXw0;uxSUIXhl|#h*uK+fQPilJc8RCK9GNPt=X^8`*;3$
zBBo77gkGB5F8a8)*OR10nK&~8CEMPVQyhY>i`PS{L^-*WAz$ljtU%zlG1lm%%U4Zw
zms0oZR8b|`>4U1X*9JLQQ>m9MF5%ppoafz^;`7DbmmIENrc$hucekkE4I83WhT%(9
zMaE;f7`g4B#vl(#tNP8$3q{$&oY*oa0HLX6D?xTW3M6f<^{%CK4OE1Pmfue`M6Dh=
z&Z-zrq$^xhP%|hU&)(+2KSSpeHgX^0?gRZ5wA8@%%9~@|*Ylux1M{WQ4ekG(T+_b`
zb6<oz^lbvev~V++$rC}$*BvgYAXG{?KcIztrX(y~IHHGjmZtf0C<OUlY*_4T&#6N5
z9I`6{eOqqp+TfjYP;y%aa_8?>I)QRGp%fRF)^T?i^j&JDBhfNU9?>Sl6WVMM%S?7<
ze|4ga<QQ%CFfC2!(F<jzks4u#PD$-vhPNI`buJHWN_8GSmKZP&!ezm)`pb_ufq%|e
z65VysTK{G$XMb<1f0?oTC!h20sft+iltsTHV$jShMg}xAzdvOAnbl^SH4Io@{;7|w
zcmm=LTua$mgYz83sR&vPS*oAGv0XRT^v%u-f-e|2uvTE0Gexp+zUUh*2Aeh)6}0n*
z6-@#lYzgcXQ9MmM(2<G4N5BX>DbPooB=F4Y=>~_+y~Q1{Ox@%q>v+_ZIOfnz5y+qy
zhi+^!CE*Lv-}>g^%G=bGLqD(aTN;yHDBH#<M$qg){m{{Q?t%NZ{J?a__4EZDzviFa
zm*MAJF9ZVu^8C9+ne|_}FKOUtCS+x5>tOC=X02}QU~Xdme``Wn>N>6{VwgU~Z>g+0
zxv0`>>iSfu$baHMw8(^FL6QWe;}(U>@;8j)t)yHAOj?SdeH;evFx-kpU@nT>lsrUt
zqhV}2pD^5bC4786guG1`5|fK@pE6xcT#ns)vR|^?A08G62teHaE&<GZV+LvneF;S#
z68Wn}!rRkgqGaX6A_ow8EmDIWBl|GIqJxlxNhE#>p`ZrCBj_Swt*~dVt=5*RK6Y{%
zABqK$X59BnrK3r3u=wxklRnA1uh+q`<b)RM<`VYR#Tj&jFv8I!vxF0~E2AGvt})TF
zM4DI~n<>?T0kE1YhvDWF4OY#<(+V|R@R%tdkq2huF(!Ip+EpZF3zr*|9pmKHPo)Cu
z;H+^s&`Ql}u=Jt~ZWj`bAw|i-3#7(2WuRU3DU{BW8`?!O?YO1M$*MMTsaEM!5Jyp~
z!gp6yR4$O%wQ8%dyz43ZPeoJwy;o;yg=S0^Y}%|)to>=N^`!3VMf1~}OZ`Dl$q&|w
z9$!i3!i1uAgPTuKSWdBrDr*N$g=E#mdqfj*h;Z}OG`{n245+g;IKfdn!&gF2OtHaD
zyGDzj@@d2!P(_Ux)3v;1ABTj__{w*kaRF-1YVU`})Acgk?(T*1YqEve3=5)8bkZK*
z!Tu<iq|P2`%F?J$)p|je2QMGIMZ2uQp_h@y-2G1Sdah5zN$MlgauhJ_S?DV|LPgo3
zy5@seq+HX~oFS@o{3}f1b%{xH5rZ+``=g_jA~NT11)`8ASoww?bFpmkOYPKJLN%zY
z#G=)BG8w4pvGQhd)zYf%ZbJ93=mTw|TF&1&U993<+v<$LGO!)AJOm399>s*e$h@^u
z>#zV0771Bix~r&h2FJ9)%N{>s>?2tk1$bId)1#G;OKgn-U8jUo^<QlyOD0m1h~yc9
zYT#r5TFa%e#Znr=VS)J8%MMo_req|4=S?B33f1PSc%hek1)1YQU-d5MwWR)q{_5Dw
z5=9oVB{#GZF0eecabm;6NDFL9BCyNJ=OBBmn{iM3umir}Zs#^GkuV;mNx)+(nzUhm
za=8_JmcdIqGaDw8$Nac*nUyqFG3QM(c@Q7<O+zJi+6L1W`{B!c@eUQHYVv2<_pzKm
z{Yazs3^VMCH}1;u!_KAXh~!;i#>AK;Hu)hQEi}swD(264kAS-SBCD$R(Ro0rh8~Le
zzRwxbz_JHDbD+hTX15AWmVw!#rC)-zeZahQQmo6F<p_)?;#yLR0`(}T(+Mw<^A<!v
zc35M9X*Jx1F#{d03NAsMf@PKoBty#Ypo0aqna_Kuym{4XET%)T9bJwPZ{^tb5jBfr
z*c%no6c#ooY>G1)ah3uuyIuTMof}RO!`Y3^Fxn_-G$23RDOh(@NU?r6`*S?#E50)w
zpcsgDZ-iO{;EesgDQq9;p*C#QH(sp~2w^zAJWaUL%@yo)iIL6y8;e_}=dwQc%k%;H
zFt5lenH*`}LWd+fPqi;exJeRZgl&nLR%|a!%1x0RQ54cgyWBYrL>sskcAtPxi&8c(
zw_K?sI*3n%S;lKiYpveBN08{rgV&-B1NN5Jiu07~%n#%&f!(R(z1)xsxtRBkg#+Lv
zh21zX?aYDd_f}qdA`Os<SbTR6gd5&=nL3UG#AuZUynK!i-YNc=2BCEbZ?L)$b<a8R
ztX7zJC>*j!eC<5)iUJ&Twj7?*p%vEOGElGhpRZsccM!<<I|PU&)~CLHRCdx^CfXu#
zsW!u!iTd$hJWe)wvI32v??s)XOU|ph)!DfqAs>k}DeC;TY;rULQs3e}lZyP#UVb=6
zB$Dkm2FaHWUXr7<{R&46sfZ)&(HXxB_=e`%LZci`s7L6c-L7iF&wdmTJz`*^=jD~*
zpOZ@<L`81Cqd*Yjy{6K>jcq8LezVkE^M6D9^QgZqnX&x*mr1_<yBUD`Uyb@wHjYjP
zR#yL2!>Cf#R9R3&{i3%v#}V$UZzGC;Or*=Dw5SXBC6NV|sGZp^#%RTimyaj@!ZuyJ
z6C+r}O1TsAzV9PAa*Gd!9#FQMl)ZLHzTr99biAqA(dz-m9LeIeKny3YB=*+|#-Gq#
zaErUR5Z*Wh^e<+wcm70eW;f-g=YTbMiDX)AznDM6B73)T4r%nq+*hKcKF?)#vbv?K
zPMe=sFCuC*ZqsBP<kLDXB+;25f0Z(q<`_UcS2#i?okbKY2v?D0X1#iP{=mJbgcND@
z&#MyXSlI=3U0Ep8#+@<?%U2V_k!NYVk+@qUfG#m=g{?a)8cJ##l4wA+d6wL8LN&#T
zf0sflzjQ~tY85=sKWgn>h-?g!m*O`}6<}Pfj}&#3Y1n9|Y@cUdD5GX_)6Sx9pPfS7
zxkt?g6ZwJ+50C7qrh6dMFmr7qah`FskT_H=GC92vkVh$WfZa2%5L99_DxyM{$#6HQ
zx$VR-Wwt!q9JL2{ybEGJr$^?!V4m_BqDqt!mbs=QjHf340+^a{)waVvP0+98(BA$M
ztWr&sM=juyYgvf`(SC}+y@QtYgU>0ghJ6VbU}|kEraR&&W%#;!#KI?le%g`e>ZV<h
zy-v0ocOwQIK`Y=pL1GCjC0E5)ML4*UQ=f3`r>PiDrneh#&1(Y?uiMo^f5qo@{JE<b
zbyE=O{D7Qvv(BAPE3PepyXNc{qS%VT<a4X6oAW#|L(A)d#}HD$tYR*#$<xHb{D5S?
z#hQC*tmq@dwj2X@i`K;kOsJoV2<+AncW1k=WIExam*|8Z5AI?tB7BM(oxVe`c9BSp
zj>r(p9>8GhDa+PC9yG;lX+D?hQ^fZB&Sdox219zUj_5;+n<0@Wi3@DK`MU8FM!OFJ
z8*_mTA-u!Ab#95FRVWTIqAL#BVQGxE_s?>Ql|@0o9vos&r<_4d!+Q6(_270)6#lu$
zV!j$a?_V0I<(3Z=J7C-K0a^Kc1Go9p&T6yQeAD+)dG-$a&%Fo0AOte~_Z&_m2@ue~
z9cKFf-A41Dz31Ooj9FSR`l?H5UtdP?JS=UU$jF#znE1k@0g%K?KQuwZkfDI3Ai)(q
z#x_Yo6WR_Y@#6I_02S&NpcP<%sw!!M_3#*8qa+*4rS@x=i{-2K#*Qr)*Q$-{<_(<|
z0730e+rubnT38*m;|$-4!1r6u&Ua2kO_s-(7*NGgDTe##%I>_9uW;X__b_k)xlv$;
zW%K2hsmr>5e^Z~`tS-eUgWmSF9}Yg8E}qydSVX0nYZMX_x94QK?tw2>^;raVTqstR
zIrNAX2`X~|h->dTOb9IrA!i5INpLV}99ES|i0ldzC`;R$FBY5&7+TIy8%GO8SZ37_
zw=^Swk?z+j-&0-cTE|LU0q@IKRa&C6ZlXbSa2vN5r-)*f<3{wLV*uJUw980AFkWN7
zKh{?97GmVu-0rs9FB6ludy|n`gN5p~?y51aJzBg6#+-=0pWdZ2n4xTiQ=&3As-!-6
zFlb|ssAJEJL#s8(=odfz8^9b#@RrvNE4gjuEITzAd7R4+rq$yEJKXP?6D@yM7xZ&^
z@%jnE3}bteJo{p(l`hu`Yvzg9I#~>(T;>c;ufeLfc!m3D&RaQS=gAtEO-WbI+f_#|
zaVpq-<%~=27U8*qlVCuI6z9@j)#R!z3{jc>&I(qT-8IBW57_$z5Qm3gVC1TcWJNc%
zDk?H3%QHno@fu9nT%L^K)=<y5j8-3OLoCwml<m#@a2$TO^5(_-we401|7KH(F{xle
zu=0_Sg!kbGYy25rD<nZeZ{kAp9*E_*bc7OM{Of}>#sRiRNg|=%<E|Ca3Q|0x7HSHc
z{ld(ilKgxux4G(17ZVL?iyT{C;CgvryHzGF6mGg|va{LJT=9ILH6TokVZBad;E0>M
zR;8BE)QA<ZwMA{E(`T1LMmc2??84y!^Qh`i-9QajvsfolrXdPS`Q41!Rg4pyt1mVf
zx*lGrA^{XxdZv_6j?V}P@D!0xPC8+KS#?u1SgI<35ORP@C0bz5Xjdj;rLcsg+tCdC
zgfu@@W1QO6<po<L<4lPGE32&BU=t-L?E|M_jtx~p$PYEIbsn@A+$E4%vB25$MS_c*
zNAYWBv$3w;nQbk(yDwgDE>4#Dsg^EakzttRg9pkfIrF3iVYVM#*_<jJZhSj+=C5$}
z+9-V?yuj3z;(V-yx3cFktR2b%>+#3X+~qeZc^WQJvEyVlO@9=0pl!ayNOh|{j0j^a
z+zi_$_0QKhwArW)sJ$wji;A`?$ecbr?(4x5%2pLgh#wggbt)#T^2R3a9m+>GcrUxU
z*u-WTgHAN*e!0;Wa%1k)J_P(Vdp>vwrROTVae@6Wn04q4JL-)g&bWO6PWGuN2Q*s9
zn47Q2bIn4=!P1k0jN_U#+`Ah59zRD??jY?s;<z4_rwa|@e<wNXd%o&3A}eKXx<yjF
zTTkpcsgA7NIv=}eBSBJ^;M!1|c2jX0s@_}Q)#6>U;k@%q87=dM*_yvLN0->qswJWb
z<x!&rY&2O<B(q~zx_=-q{T8<qLr>Imaj{Ah&`)C$u#E0mfZh;iyyWNyEg;w0v%QS5
zGXqad{`>!XZJ%+nT+DiVm;<DrU}w%S2N4HKC&HhxABT$X!|G*WV|7%39mrQX81uPj
zv#2wpFJ2uxd+9@K%YoXcA{LS)<WFCt@2@sf$I>lahOGmZyeqJ-;D&!S3d%CQS4ZFM
zkzq5U^O|vIsU_erz_^^$|D0E3(i*&fF-fN}8!k3ugsUmW1{&dgnk!|>z2At?h^^T@
zWN_|`?#UM!FwqmSAgD6Hw%VM|fEAlhIA~^S@d@o<`-sxtE(|<><#76_5^l)Xr|l}Q
zd@7Fa8Bj1ICqcy2fKl1rD4TYd84)PG5Ee2W4Nt@NNmpJWvc3q@@*c;~%^Vasf2H`y
z+~U-19wtFT?@yIFc4SE_ab?s@wEUfSkOED}+qVjjy>=eac2^S^+|_3%cjH%EUTJ&r
znp9q?RbStJcT*Vi{3KDa^jr4>{5x+?!1)8c2SqiCEzE$TQ+`3KPQQnG8_Qk<^)y_o
zt1Q^f{#yCUt!1e(3;E6y?>p+7sGAYLp`lA3c~Y`re9q&`c6>0?c0E2Ap5seFv92#X
z1Vldj!7A8@8tWr&?%;EBQ_Fwd)8A3!wIx`V!~~h(!$pCy7=&*+*uIzG@*d%*{qG#4
zX0^}}sRN^N=p{w(+yjv%xwb!%lnVTE7l1l6gJwQmq_G83J&Y98$S!r*L8}IiIa2E=
zE!0tbOuEDb*No0-KB{zjo1k#_4FHtr{!)>o+Y@bll}Sa6D^xktI0H&l{jKAK)A(iz
zB-N00F?~Z}Y7tG+vp)-q*v71(C}65$-=uXx^|R$xx9zZip-V>Hqeyfd(wteM)+!!H
z$s+>g4I@+`h2>C|J;PhvtOq)`xm4;CyF}R<)!ma3T{Vf_5|zo;D4YI4ZDBkE(vMeE
zb#ZV;n}CgA0w8x!UC2&5Z(K)9bibj#?~>R(72lFx_Am~jS?;7mo~p+05~XGD+(wV4
zEVYnf0N5+-<tP?1gB|glI&`j;EH@4!XKT+aAk1Z@L9<=6LSY9eH82@H$6Lx;1Bxcv
z%5^A}uY?_hP^bayLLK7J%)3cT_fR_18XOQ&cV*aaMGjT;&gDDL^BhVUh(<4F4hH3c
zF$M|KB70L-z@{I4cBYj0`fF_cxCFUjnxu>7O+Gc1L!sPGUHv<6=cV8}*m$m`kBs@z
zy;goR(?J^JrB7uXXpD00+SD0luk!vK3wwp(N%|X!HmO{xC#OMYQ&a7Yqv-54iEUK4
zVH;)rY6)pUX~ESvQK^w|&}>J{I?YlvOhpMgt-JB}m5Br`Q9X+^8+Xa%S81hO<1t#h
zbS+MljFP1J0GGN<u*_}U>R1}KwE=cfey%;@n&@Kli+Z5d>daJjbvuO3dW{r$1FT0j
zR$c9$t~P50P+NhG^krLH%k}wsQ%mm+@#c;-c9>rYy;8#(jZ|KA8RrmnN2~>w0ciU7
zGiLC?Q^{^Ox-9F()RE^>Xq(MAbGaT0^6jc>M5^*&uc@YGt5Iw4i{6_z5}H$oO`arY
z4BT(POK%DnxbH>P$A;OWPb@gYS96F7`j<s%D8sEa?)~9qI9NM3KMj#n>Tn6JO@hdM
za>_p!1mf?ULJZb1w-+HamqN__2CtI%VK`k^(++Ga0%z*z@k0wYJDqT^)~%|4O299;
zh1_iRtc7you(kOK8?Q$R7v-@Qk4+i=8GD2_zI0%{Ra`_prF{+UPW^m5MCA&4ZUpZb
z2*!)KA8b--Upp~U%f+rsmCmV~!Y>Gzl#yVvZER2h;f&rkdx{r#9mc8DZMJaQXs?SL
zCg3#>xR6ve8&YkP*`Z=lng|Ow+h@t*!Ial*XQg3P;VS8@E1C)VS`?L9N+rxlD7bxC
z3@Ag)Vu?#ykY`ND+GvRYTUP&-KDMiqly$Z~uFXt^)4Jjk9RIs*&$?-UPM*d7&m${m
zm12kaN3mV1J|c6f$>V+{lvHp~XVW3DU0;cBR>7|)4bo{xa1-ts<jLa&I4xP(P^UY(
zK^=O2Qw>-lYU-Q-b)_fVVl`EP5X}+J9Ez<Ex`Qpu&R?yHFbL<2c$Q;V!e@I{V!wKR
z7!xcCG-NprVU;C3WX5sx<d|M#WS7cM_k_jEf*uBp3nkhd&!k<vHt0u1^hAKyJwmds
zD7D_NpsMmlXl7Pc(mkTV?`LXRZzE08JLC1i<|KcEEW;jr4E%J$z2FYEQ?magWT$MG
z5w|PTM+AV^Sz~TIthAm)ZPhU}8DhAq7D0JyIc%3i?Lvo$+)+sNEg@Y_iByf8V2Q85
zOBboV@sg~jAmogcwCVaT#eK6@Ti}WBL@#n_)Y$X%FM3dWWfN(uT+lfa2-U^=q|fkx
zfXo?m>T20x8XIv=m7witdu7!3Lh=KE#OyKpT1GWk{YAo^ny|fvZt<+jmsFs=l*%e&
zmRkBt5ccv4O7!HAyv2~rsq*(FmMTm?@TX3&1`nu|7C^F{ad%GLuoX}R<meu_@4fM<
z-!2h@6;xk4-$>l}6`)uHF_xlx^gVca+mGH4T8u8;q{S*x3=j;kelz^atO~)v!Q_BT
z4H6%IA}bvfuk0_vweELeEl8N5w-Q1GF!@f{VKnbyYB2?}d&QvI-j}~RI_+9t9$tC2
z94<uJXj74`(inSXhxsnvUvEd#uSMCc1>m=3eLi=sQb^S5;fqP?3aaXc&<O}>`}`lq
z&M8dOXvxx9Y1^u_ZQHhO+qP}nwkvJhwoz$Mp6Q<HKIeJn^xWlLUhMzd5i4S?cZUYb
z6zvSUafe`@8T+`8>c<DM&nrWh7UU9263B#n^4BDg74A^>q^7M#eWm}!3U@s07hop`
zW24|J{t$aB`W>uBTssEvYMyi$hkaOqWh+^(RV_1MYn<UF!6R+6a*Lj<8=h{-?ucW$
zthY`+xpL?cA9;vun}VrgvC8xfggo(n`UW5QQnEM9{=2t&ulrf<ou?+PTg}FaPVkUK
z!ULy9w0m6I{74gD^)2=Q1#||EMU|xRm9B##^iD(a5&SE|{_Jmif_=MGbb`J5E~Qx9
z_bJ^2g>E0XPgW?7sBDk=Cqs(;$qrPEflqa0ZE?A3cBfW%0RPA235Wb6@=R_d>Sez;
z`spwa50bq?-zh+id~Q!T`AYn`$GHzs;jxIw(A1_Ql&f|qP}|bon#H;sjKmSDM!nyn
z>bU8l%3DB3F+$}|J^da!!pN|DO!Ndc2J)wMk!+Rr1hes#V}5o(?(yQSphn|9_aU<-
zn|nsDS{^x&tweP;Ft`2ur>Koo2IdXJDsr6<Dg_v>IN)7vB41Yy-^Wbo9*2th2QA@C
zE0-0Gk12YOO?d_Gu<sRH1Tl4a&{tqUwG+=b{V(|ew{P^Bv|#t!gRP>u6b3&(PIL`d
zh4{`k54hu9o%v1K3PGuccez-wdC<&2fp)>`qIIaf)R{5un7-vwm=>LD7ibnJ$|KyE
zzw`X*tM0S|V(I3vf454PY{yA5lbE+36_<1kd=&0Xy4jfvUKZ<i&B?KmWgU&frLdAP
zWQ!={R`S{V1#z7QsU$DOBZ}@t9L25+0o>0$Jq!AG4KS7DrE9rph;dK^6*#CIU9qu7
z?)6O`TN&MCWGmUVd1@E2ow2`vZ1A#nGo8_n!dmX77DCgAP1va*ILU+!a&$zdm6Pa6
z4#|*&3dM+r_RJb%!0}7X!An&T4a4@ejqNJ;=1YVQ{J6|oURuj8MBZ8i7l=zz%S4-;
zL}=M^wU43lZVwNJgN|#xIfo$aZfY#odZ6~z?aNn=oR1@zDb=a(o3w`IGu&j>6lYxL
z&MtqINe4Z>bdsHNkVIu$Dbq0wc#<Qh#Z1Sj<sL6gy91C$%5L#9E+9Z38PSLBc_wZ#
zw|DPH+@N@+NzI`Yk=!!wo}kHdjI&@6w?ord2!kF@AT~x2`XWz9Ahe=y_FcM!rgunh
zQpY}tyZU`~2PzLgpnZaWvrVr}q4NYSIrMP#qVu3VkD&#L;Pqe~h5=>X-xev221e~L
zbm8kJ(Xzij$gF4Ij0(yuR?H1hShSy@{WXsHyKtAedk4O!IdpR{E32Oqp{1TD{usJi
zGG@{3A$x%R*pp8b$RQo4w&eDhN`&b~iZ2m3U>@9p1o5kXoEVmHX7I6Uw4dn((mFw`
zilWrqFd=F5sH$&*<FBNV=|$b8j|g-!@cv81Z2hQ&!)rw%dhEENOk>(eJB52zaLwRe
zz`sruIc=Ck75>v5P5kd>B2u=drvGPg6s&k5^W!%CDxtRO)V6_Y_QP{%7B>E~vyMLG
zhrfn8kijyK&bX+rZsnSJ26!j$1x+V!Pyn|ph%sXWr9^f&lf|C;+I^Fi_4;`-LJI&F
zr;5O@#4jZX=Yaw0`pUy<vDqB`SgkGph~aVnBU5HD3ev5}{n-#9m0-lppcQkPV77Oc
zaP${nyX~TZ#;{=UVHO&#@iCI-$A|xRH23$iAf1l*1@OZN&VKJT@UVKzlS10YqAQxD
z*>fF4J8A9wE#7_9!X|_s8~<rFKR+K|kGm@OA?G1Qn4|Qw^xGx~6?VY8tV6tpFL&?B
zElwzoUtJv6YBv4<Lck>YUzWu&#E^%4NxUA3*jK-F5R3LP2|msHBLmiMIzVpPAEX)2
zLKYjm3VI4r#7|nP^}-}rL+Q4?LqlmBnbL+R8P%8VmV{`wP0=~2)LptW_i682*sUR#
z+EifOk_cWVKg-iWr^Qf4cs^3&@BFRC6n0vu{HqZzNqW1{m)3K@gi$i}O(hT`f#bT-
z8PqCdSj~FncPNmMKl9i9QPH1OMhvd42zLL~qWVup#nIJRg_?7KQ-g3jGTt5ywN;Qx
zwmz4dddJYIOsC8VqC2R%NQ>zm=PJH70kS|EsEB>2Otmtf-18`jUGA6kMZL3vEASDN
zNX%?0+=vgsUz!dxZ@~)eU17m4pN3xGC0T;#a@b9Iu0g_v*a3|ck^s_DVA^%yH-wt=
zm1)7&q6&Rq#)nc9PQ6DKD{NU=&ul10rTiIe!)x^PS~=K(wX9|?k&{Mv&S$iL9@H7=
zG0w~UxKXLF003zJ-H%fGA4Db9{~#p&Bl7ki^SWwv2sfoAlrLMvza)uh;7Aa_@FL4b
z4G>`j5Mn9e5JrrN#R$wiB(!6@lU@49(tawM&oma6lB$-^!Pmmo;&j57CDmKi)y<h(
zXqL}YElO`Y&m@UsMkK{MCtzLA*X<`cp4aT(>esg~P;lJPy9D(!;n;^1ql)$5uYf~f
z&GywSWx=ABov_%8pCx=g-gww_u26?5st=rdeExu?5dvj^C?ZZxDv@Si^nX~2qA&K=
z2jr;{=L(x~9GLXrIGXs>dehU^D}_NMCMegdtNVWyx)8xHT6Qu!R>?%@RvAD<fTWPT
zbQXf<n()O!xQ#Pbk5h~n7YIct6olxrfE6UPNC}gtKvBtr-K-SW`|*EHXUdOp{F#XY
z?JsnO90yJ*O~g9z->s9er;NMkweUBFNrBm1F5e0_>^%CwM6ui}K_MpRqLS0*@lAcj
zB6TTCBv>w2qh)qU3*kN+6tPmMQx|5Z0A4n67U-nss90Ec_rDF}r)IR4PE{$8;BSt=
zT%6|jyD^(w6a*A5>_|TkMqx~e$n@8{`q?|)Q&Y4UWcI!yP-8AwBQ#P`%M&ib;}pli
z9KAPU_9txQ3zOM#(x}*lN8q$2(Tq1yT4RN0!t~|&RdQMXfm!81d0ZuyD}aG3r4+g`
z8Aevs3E_ssRAMR+&*Q30M!J5&o%^(3$ZJ=PLZ9<@x^0nb>dm17;8EQJE>hLgR(Wc%
zn_LXw|5=<mgh;A%n|KRFf=!tm*s+<J31t9T4~m;{d98+{UM8O9Y3n(H4jT2x1<3ek
zRCP96)YpgXmLb5T8RCO#=@H=-mI|8WPy(|UYm-$kz(=0t1MzP~=;TJ|q`O5>b$6%X
zS~ClDAZ?wdQrtKcV9>_v1_IXqy)?<@cGGq#!H`DNOE1hb4*P_@tGbMy6r@iCN=NiA
zL1jLwuMw&N-e9H(v7>HGwqegSgD{GSzZ@sZ?g5Y`fuZ^X2hL=qeFO(;u|QZl1|HmW
zYv+kq#fq_Kzr_<t;$1-t3`$OEY~3n_q{T)Rou@A)3;+fK`61#)M28uxu-pQIoi3k&
z@@D|N0vw;}fCrrk_Bpr~YT-f~A@MB7zNgvCzi#3OND*De1`PU2K-mM~#&}W>LaezT
zqIkG6R+ve#k6!xy*}@Kz@jcRaG9g|~<nqgOn62L}JrNDZjU4F@aV<%LlNo-^2n?i7
z%|1$7{FswZK|-=pEJmMwPA8WqjwJ0M>j5fAYegGOE0k8+qtF?E<xze>gI99h*W}Cw
z7TP&T0tz4QxiW<gb)txWm7#_bTxNntXapy5bDUCo7H4xD&DjOE8;<3;GBa57DJYnZ
zYz#6XyFIk6(k%&!?Xc#tisS?+poLN_Fmul~V%YHM0M1E@z)4~ejjf`6?8DH0(3-bD
z5P#*bHnbbLTN#v_{!WmT$r@`&i~2Nc`t|XmZ-^%oLL+Cr3zKt~sMp~37c*-Pxa>!r
zF4?|!WiNo=$ZCyrom-ep7y}(MVWOWxL+9?AlhX<>p||=VzvX`lUX(EdR^e5m%Rp_q
zim6JL6{>S%OKoX(0FS>c1zY|;&!%i-sSE>ybYX3&^>zb`NPj7?N^ydh=s=0fpyyz%
zraFILQ17_9<<sDR30@KDNwyojVnat(lC)gJgvUt1uzobNU;2o@xr#!#7^%#jK1iuD
z7r}e067z-?(;GTSgBQ+#sj?SrF6s4ypglFZq~$VVzLvf5FWezR$nLUzNjEQ0AJo<2
zcB9bvm4&6HiBoIY+zQ8CO2E#{Cc9O-tpSb&=P>ettJJt~I+sl=&CPH<r$$NF*gAE`
z_p=lr4JlXKZS)N-Lgmklh}r`zrQ{F%X!spf9^b}Sx9!|LuKV_)@Z30(8oPaQFU>wz
zC9dEb#QFQcY?bk11Y=tEl{t+2IG`QFmYS>ECl;kv=N6&_xJLQt>}ZQiFSf+!D*4Ar
zGJ~LFB7e_2AQaxg*h{$!eJ6=smO(d2ZNmwzcy3OG@)kNymCWS44|>fP^<x&)TY2iy
zd8=u_8UI{JryjD7&f;g$C^xsXX)jROQB+P<9-s1k)feVpMDGRaUZv%fcb`-jy=~ss
z2~a=oT+WYe*ma=*p7E0FtZVj%@!udd*G!ub{?}?k&l5G4t2p4Dx<t007{2niswln#
zJMOhvLlrOsY00{9LqPI>7QkJHkE9JmLryhcxFASKb4GYkJ|u^Fj=VdF0%6kgKllkt
zC|_ov2R4cJ2QjjYjT6jE#J1J<<H4Z-B>xaNC>Xm;0SX<`LuW*}*{yQ3c9{Zl=<9NP
z^2g5rAdO!-b4XfeBrXa4f{M0&VDrq+ps&2C8FYl@S59?edhp~7ee>GR$zQI4r8ONi
zP^OA+8zrTAxOMx5ZBS03RS@J_V`3{QsOxznx6Yt*$IuEd3%R|Ki&zZkjNvrxlPD$m
z%K+rwM!`E&Z46ogX<Y)q$<-O!`Ps?Y)6-+4tJ~;H3Ps$sZq7IohvmIlPfMkf>Cu!3
z8use`FJJ?g_xi?~?MxZYXEu=F=XTC8P3{W*CbG3Wk)^31nD~W>*cJ@W4xg%Qqo7rq
z`pUu8wL!6Cm~@niI*YmQ+NbldAlQRh?L!)upVZ)|1{2;0gh38FD&8h#V{7tR&&J}I
zX1?;dBqK}5XVyv;l(%?@IVMYj3lL4r)Wx9$<99}{B92UthUfHW3DvGth^Q0-=kcJ1
z!*I9xYAc$5N$~rXV>_VzPVv`6CeX(A_j3*ZkeB~lor#8O-k+0OOYzTkri@PVRRpOP
zmB<rRnO}WV)476D7x6~ub!@M-2Qd&zYv%Y%g+p`hDE8{Z4h*5&$sOT^IWG0SZcgjg
z`O&$?XW-TG7xurfM}NI&k*kC+!S8#;INUOgNU?v=AX%E6_4nPaC)wkVTqoUuVAo1w
z)SkErj=K?#WGW12?ghp5<R>V|NKlJT?y4Q82er)@l<zX`5TroC<yK7LQ3#{#fD~vf
z#zjU7|ANemL(L4B*I^%$>K&P%CeLbRw8f+ZC9R)twg5ayJ-Va!hbpPlhs?>297lC8
zvD*WtsmSS{t{}hMPS;JjNf)`_WzqoEt~Pd0T;+_0g*?p=dEQ0#Aemzg_czxPUspzI
z^H5oelpi$Z{#zG$emQJ#$q#|K%a0_x5`|;7XGMuQ7lQB9zsnh6b75B9@>ZatHR_6c
z0(k}`kfHic{V|@;ghTu>UOZ_jFClp>UT#piDniL(5ZNYXWeW0VRfBerxamg4su5<;
z(}Ct2AhR@I-ro0}DdZLRtgI@dm+V`cRZjgV-H+aXm5|Mgz`aZX63i<|oHk-E)cABn
z0$NR?(>fla7)Ong28FZSi9Yk0LtYl5lZw5wT!K5=fYT$avgkMKJWx~V#i@7~6_{dM
zxDDPIW2l{O2Elv#i^cjYg~lGHRj(W*9gD`(FILKY$R`tL2qo&rtU*c;li!V`O$aV{
z!m|n!FAB2>MR_FVN*Ktv5+2dW4rr3YmfEheyD+48%USM#q6)w%#2}~=5yZE1LLcth
zF%VtefH&#AcMx7)JNC$P>~OFuG6sK}F7V$D7m!{ixz&inpAVpFXiu^QruAw@Sc7Y2
z_A^V(2W_+KTGRp2aQSMAg<x6%12zeS27=o$@PonK4GuYkkc8_oNyZ_fx!DpPP7rH)
zq%QZ$f)JMRFv;DSDXcQg2>yV#b3@{?5q@hPEP6oF3^}|@8GuD6iKbX;!LI!L=P#Za
zL$Zuv#=x3fseRMZ()#SQcXv->xW`C|6<d<qjTnlR-zB%D{uMGag>quwqL1M&KByBj
z2V`}(uL4JB-hUs6304@%QL~S6VF^6ZI=e-Nm9Tc^7gWLd*HM-^S&0d1NuObw-Y3e>
zqSXR3>u^~aDQx>tHzn9x?XRk}+__h_LvS~3Fa`#+m*MB9qG(g(GY-^;wO|i#x^?CR
zVsOitW{)5m7YV<iB~ZA&0a?gaYj)AUbCPcfrFo{aih&&1c1xLcoR<G$zDt-`y;52O
zV(4ER?6nKAl>{kb&Z!eXmI}pxP_^kI{}#<BeMXLv4!<Y5yd3DDTG;6mav){xh&<>_
zgjaG)(y7RO*u`io)9E{kXo@kDHrbP;mO`v2Hei32u~HxyuS)acL!R(MUiOKsKCRtv
z#H4&dEtrDz|MLy<&(dV!`Pr-J2RVuX1OUME@1%*GzLOchqoc94!9QF$QnrTrRzl`K
zYz}h+XD4&p|5Pg33fh+ch;6#w*H5`@6xA;;S5)H>i$}ii2d*l_1qHxY<N-feyD&<Z
zSh);bmV8lzMD7Oi=KVNpO%WrkpZUGof1Cd3k?r*Mj;}|oUdl^1J2?mWCwczlSvE8@
zf-qqQ$nDS*hH;1`!sN1#G&zfAFlMU!<No`4=-gY5r9wU_VWyNmA+1rOmx>`L3g=t?
z!-H0J5>kDt$4DQ{@V3$htxCI;N+$d^K^ad8q~&)NCV6wa5(D${P!Y2w(XF!8d0GpJ
zRa=xLRQ;=8`J2+A334};LOIhU`HQ*0v4Upn?w|sciL|{AJSrG_(%-(W9EZb%>EAGG
zpDY?z1rQLps`nbC<D;Ix7t&)6xy-i{Jj_>tzqJ#@wxU4}(j!ZQ{`g`g*SXlLah*W9
zyuh)UWoRCknQtd~Lk#BT_qjwj&Kw8U)w=owaJ;A5ae}3)y>{neYNS`|VHJdcSEBF#
zBJ6a;T)u;^i#L~LVF-X7!E$SggILXMlsEy~v}K*DM2)f@U~g|Q6I-Pss@)`>fgFWx
zsq&7pe!|VA-h;@=fBF{(mR1^{1>ukTYUdyF^#A+(|I<gJqOQ6jg8T)FMHHpBPgGK5
zE}58wj%Al%5^NPj%w`M)s*q5kGz>_&nm{<l*KzZnQFE4XeMQM#I+V|Dz4Na6hUVen
zA*vA7=OQ}~W-e0b+4H_-d_9@_{qe@>_xaKn3h4&yMyym2k-wMFg(s@ez=DPmuB%`|
z6;e@HQKB(|!PU1sW)W6~x|=8m6rL~4dQ9LTk|RzL-_(_77B4I~ZG=q7K%qHiv!FD8
zmt;V<xb90THH1F906CDtzY$k*9<R<^yt=Q=vzV{L7Z@ac%h;3(!g~_M-N8~hZ49%f
z;2fRrBUA68yuh&NwybUr-qPWMOvylxN(@ENBDNX<AP5tln;>nhb{ymaydv2V;X-5p
zTt2ln?kaB9&(dH_X70^@rrCfz)nwfa9LYTHXO(IPcTEf$QiEhTpl??L+`Eetyqof8
zzl=q)?KdYni!C_9b8Z3xm7r5<5ZG-0uA`u^7Dm7k4mAsQ(rkoWy*^DZJa~#y6+hNG
zh?7{D9$a9LS`a@SvZ5?C{JUHovWU9KI}z8YV4pWftx21v*Q;MpU{+b@<PdxGK$c*n
zpG?R=tLjB3=pzQZ@@XZUs9n-cts(SYf{`Q#-58^tK)<+772q6Z+*FaD;sr}NlJ9Si
zInq4cesgHKy2w4L^={z4S>>Or(}pwO^fu0qA3_k_Bo2}lIxvmMhucG-o>O=+R6YxZ
zjs!o%K1AA*q#&bs@~%YA@C;}?!7yIml1`%lT3Cvq4)%A)U0o1)7HM;mm4-ZZK2`Lj
zLo?!Kq1G1y1lk>$U~_tOW=%XFoyIui^Cdk511&V}x#n4JeB7>bpQkYIkpGQRHxH$L
z%tS=WHC~upIXSem>=TTv?BLsQ37AO88(X+L1bI<;Bt>eY!}w<J%2~a3^@;GQk-L-C
zp_J}STi66}cCpD?yd2DLDK)?bL{zsEa;Yzr1%-LoPI<vng{B&CHG|a_62_DzDrV_u
z3z4x~1LRva!GmFdtnrHSAc2yaUc!Cyf{ABgQ%2pNT*ePKCB?1Y65@QKb?Hn?Okx*m
zuuh#hvvIwvgw_JvaXD1DYw~%J(wIR^9nK2;#L3Ewio+`dQ=pzJn{E+OT5`EcoISZ1
zv&u0redRAlvpR2?#kd^{j%t*BItx|k0jG-si_+H>jYoBn#2RGEP49&ZH-Z_}R_JK_
z>o*_y!pOI6?Vf*{x-XT;^(<Sm4wo-g1O%XK31IFzsULSCiFjjG{JwSgescYW!`7Q(
z(lWE=TH<W^E1d;WGreR^`tJlrn>_0}2twfk`*)_lLl0H-g|}BC?dm7CU|^-gNJ~rx
z($>97WTKf71$?2|V$Ybpf~Aj@ZZOcb3#uRq51%4^ts-#RMrJhgm|K3QpCsPGW=2dZ
zAr5-HYX!D*o#Q&2;jL%X?0{}yH}j*(JC4ck;u%=a_D6CrXyBIM&O#7QWgc?@7MCsY
zfH6&xgQm<Z9PS~NG{?F{__J>G$U6Miu$iF(*6d8Mq3Z+en_Fi`6VFF=i6L8+;Hr6J
zmT=k0A2T{9Ghh9@)|G5R-<3A|qe_a#ipsFs6Yd!}Lcdl8k)I22-)F^4O&GP&1ljl~
z!REpRoer@}YTSWM&mueNci|^H?GbJcfC_Y@?Y+e4Yw?Qoy@VLy_8u2d#0W~C6j(pe
zyO6SqpGhB-;)%3lwMGseMkWH0EgErnd9a_pLaxbWJug8$meJoY@o-5kNv&A$MJZ=U
z^fXPLqV6m3#x%4V*OYD<mz!OaL}G{(x(Zn78ch1cePsE^2e~@JWbe|e#aji@$i+vw
z*8J;y4M0v}tb1U|FW0&Qpm_VSbXqDMqhHM<w*8{FF3nKrzBf&1<UYE4ofE$1=iab1
zSH=CO(;$8FovU-~BWd|QO1Y8ABjzdgp)2#Qn&vY50Bs?ueU3Z?TY1r*DTWdyAKwy#
zyv{HOXJ_D3J~Qr@c4s#I_SQAK!-vW<+Zd7ukiJM&Z<)rpu6%QJDBb8oQ@=*vaq}(%
zXdsu8J~^V~wFm2<kU*+D?yEfRnsLCcx$Vn0B))s<KVMOI))4fSq6xZ1AAA0}*-#*>
zUPS&WHikdN<{#Yj|EFQ`UojD4`Zh*CZO4C<on#erRU}n(9~z=`cu;wGrU+`(CL${P
z6~rcrAqg0N#KD3V7qOZ#F$N@3r1<N1n`h|_3s;_whb+9KrYA+un3IQx=cdQSZdU;@
zgMwn+<8Aln_pXUQE8nkorU06BR{|gu#H&WDdwOaf0_?>v`w^&*FfqBi`iXsWg%%a<
zk@*c%j1+xib(4q^nHHO^y5d8iNkvczbqZ5;^ZVu%*PJ!O?X-CoNP*&tOU!5%bwUEw
zQN?P*a=KKlu{`7<n9R(Rg=cLB;D7@qEqwKxaR$R5qJXWA`_I@Zax-;YzxU$uN!#@+
zxQ+y}!5iv{M*E0X{_@u(?G00e5M$<Et|XW<8ewXQ(_LyR(YYJ?$fgKq0do2vh$Kca
zw?+1$t|WsGEvTr>GoA}DE=#nDibRgecw>-*da~7&wgow}|DyCJq!-Lp8a~(zR@tO1
zgu(4s4HptPGn(HmN2ayYs@g+yx1n`nU3KM{tQHhMHBw7f#gwru$=C()`aKZAl^dYc
ze7fC)8EZEXOryk6AD&-4L+4cJ&M@3;;{R)mi4=`ti7IZByr^|_HNsjcNFu?mIE)jD
za2j)FPwRY!R_YR-<hoOsQFHS<|15PbFdJG%afYG1Ze2oItOe*f5_ElPml|ounhrI%
zPE~{!7Y|K~F}fVS)JHSLQ9qeB{$pu16pZ*XbuKoPEL>P?URm0Pti*<n3H9u0W?_sE
z00=RF0hE4FPL-k`ZzxGAE|;a6hnI>e#5jmfK)6EvaKCT{h)kbJl{AGr1Ekt}pG?^e
z*botRf-RsB8q10BTroj{ZP**)2zkXTF+{9<4@$aNDreO7%tttKkR3z`3lj<k1`ZYn
zYn_o{o)z234lQeHSKdd%2@i*_5D0hBkRc}A4oBVwcURG%PTph~Aq76Z&z?&)wfN2H
zEyzH@>d?heAJEe<0%4zYK?};Ur*!a>PbGYFFi(OF-%wyzbKeBdbkjv^i9mn@UocSS
z4;J%-Q$l`zb&r*Pb`U;3@qkc=8QaPE9KwmlVwAf01sa*uI2*N`9U^3*1lLsM9dJ(4
zZBkU}os|5YT#Z;PD8xVv!yo$-n{-n4JM5ukjnTciniiT`(cZ6sD6~67e5_?8am%!w
zeCLUxq~7x-!Xg#PgKV&caC@7mu<86am{WaXo(lAemt4~I$utSp(URWpYNo$RvU*$N
z#%iiA+h`(E;BUg;=I!#EaxO89bUK3*v5Nc3GPmURC5TqzC|))DsFNtJICH6oBW6#q
z+B(<B&`b9YiYge3DOuymRDK2Ze%Ya;wCKX+X%fftd$edeGX@n_Xz5!TRa=fD=^U~M
z9?bZP5VCP0D8WHc?fR-t9w8NRm`liv)^bH)sENnIqPv$6BPTnOKd>N{ey+^mk_{!@
z)VhAWXG=_0j|0f9iJ;c404PiIFqK)(AD05Xh`Fk`r$^b`v+>*g+_+h@r)e+ELJ45)
z?20~u<}HQyQ5AsBz(teF9!!_GLXnm{5Z0e{Ki*@!=&3x4-RcjBn##DDzHJ|KSZ5(E
z9=tFZ)p~-}x%9sCY27)2i>(E-^OiYT?<djgmQHIMPtc347Rv=Q*y(&jD_CtKeZj3^
zXckY#)f|4;6KEIhi&4E9syFn2>_)a;yXAGR$y+E`myMd;xDA#_Q49t*E}&ql#H~|x
z2J2R1_#2lt91NnF!uqW%_=HlbF?A{B{n>}9$g5QF!bh_a7LTU~Jyz}7>W5{_LAov{
zy<f8Mj}O*?NVx0nb9^h$m`({QXlJitjfsb>2_dmGy)d)&7^bJyUjEw%3xj{cuG0Eo
zwL*XQB*Oi=r&HIIecC1%lbE;Y-*5|cL955S+2@uR18JDL<0;;Uc2Q9JEyo1R!!sz_
z#BqnkGfbLP#oQJk3y}nwMd(3Tt^PVA#zXnYF7D0W1)#+`i?<h^`5@8s0};`La7O&3
zhp1*He|{36n4=20msPq<-nH)Vr-1P9p?^Sgf1RhutsNa%fqHCSrog4h>@cm}fBkKD
z+Mpcuim53|v7;8Tv(KraEyOK`HvJq^;rlNzOjIbW&HJDFqW>doN&j7)`RDv#v|PQ+
z03WnB4Y4X@Fe-@%3;He*FjY1MFmkyv0>64Cp~FIDKQTwmFP~_CxZOf{8gPy}I<=JC
zo%_bmue&$UU0|GG%%99eI!m#5Y1MD3AsJqG#gt3u{%sj5&tQ&xZpP%fcKdYPtr<3$
zAeqgZ=vdjA;Xi##r%!J+yhK)TDP3%C7Y#J|&N^))dRk&qJSU*b;1W%t1;j#2{l~#{
zo8QYEny2AY>N{z4S6|uBzYp>7nP_tqX#!DfgQfeY6CO7ZRJ10&$5Rc+BEPb{ns!Bi
z`y;v{>LQheel`}&OniUiNtQv@;EQP5iR&MitbPCYvoZgL76Tqu#lruAI`#g9F#j!=
z^FLRVg0?m$=BCaL`u{ZnNKV>N`O$<S-}rug$^e;;5bSaiQ44v9GSU!DfSLQltFSzB
zn<Uo&fJvC)#$$D-jE@CZ6qM?JPJtfsI~qh0W2lGG{?v(jn*8p5HJ$l*-`V*FP#c`l
zciNQ!&xZWTvC!S7=-M@pPa!dT-m36Ap?Bz_m+VzBZiY{#2%PG>SuDvY`AoyfIzL9~
zo|bs1ADo<cNN?Q_OHXjI$ec4@qo=F|(hUs8s7RPlcy?;gq;6K5opD?9>XMr{tRGL%
zA#cLu%kuMrYQX<hZ7Iw}=nua>Jq8(&qS|UYUxdCla(;SJLYIdQp)1luCxniVg~duy
zUTPo9%ev2~W}Vbm-*=!DKv$%TktO$2rF~7-W-{ODp{sL%yQY_tcupR@HlA0f#^1l8
zbi><!?|KPxHdmqcLGCA9m(j#`++<&}(&XhVJ8#DI8lJsTrZ_I2ba5dickr#z1C14L
zARHh$4(yoq4BX%le0cKlppSF|mqqsSFNIdLjx3eh*i)vMq{|VrF&}cuPY^qT>MV~o
zz)zl1a?sGv)E}kP$4v3CQgTjpSJo?s>_$e>s2i+M^D5EfrwjFAo(8E%(^ROV0vz0o
z-cg0jIk24n!wxZainfH)+?MGu@kg$XgaMY-^H}z^vG~X<yMuIo-a6T+WY8{EBZ<YF
zgIK3JQ7h0t@xF_LwVF`lQWmQur#u(uv>C7z2;p2Kv`b^3S#b5ssMOJ7724v>S36dD
zeypxJ<=E~<BYo6*3!=tpc)T%a*%irgA?_1qXBc`bLnzV>sD4f5wX060RIF-AR0#{Z
z=&y$r8A-e6q18lIF{@O9Mi%dYSYT6erw!@zrl=u<Z9I?E*@RAMygn<|c0_8g?p;(p
zfPx}z^qO^Qzk8()=VB}L9MnNWVGdH1n-KK|f2?iVcCs@U=m4vcb6)DDZRRD!+uX!~
z5AUsL2g0>j>o(3=M*Bg4E$#bLhNUPO+Mn}>+IVN-`>5gM7tT7jre|&*_t;Tpk%PJL
z%$qScr*q7OJ6?p&;VjEZ&*A;wHv2GdJ+fE;d(Qj#pmf2WL5#s^ZrXYC8x7)>5vq_7
zMCL}T{jNMA5`}6P5#PaMJDB2~TVt;!yEP)WEDAoi9PUt89S2Cj?+E0V(=_sv4Vn6b
z_kS6~X!G;PKK>vZF@gWpg8Zuh%YX^2UYPdCg7?EH#^gkdOWpy(%RnXyyrhmJT~UJw
zAR;%Zgb6z(mS+o9MT|Sc6O({!i0pzk;s9?Dq)%tTW3*XdM3zhPn*`z45$Bg!P4xfy
zD*{>30*JsSk?bQ-DgG62v>Vw-w`SA}{*Za7%N(d-mr@~xq5&OvPa*F2Q3Mqzzf%Oe
z4N$`+<=;f5_$9nBd=PhPRU>9_2N8M`tT<-fcvc&!qkoAo4J{e3&;6(YoF8Wd&A+>;
z|MSKXb~83~{=byCWHm57tRs{!AI<5papN(zKssb_p_WT@0kL0T0Z5#KLbz%zfk?f7
zR!vXBs36XaNcq5usS7<>skM_*P$e*^8y1ksiuokbsGFQ_{-8BAMfu!Z6G=88;>Fxt
z|F-RU{=9i6obkTa0k~L#g;9ot8GCSxjAsyeN~1;^E=o5`m%u7dO1C*nn1gklHCBUw
z;R(LgZ}sHld`c%&=S+Vx%;_I1*36P`WYx%&AboA1W@P;BvuFW+ng*wh?^aH4-b7So
zG?9kFs_6ma85@wo!Z`L)B#zQAZz{Mc7S%d<*_4cKYaKRSY`#<{w?}4*Z>f2gvK`P1
zfT~v?LkvzaxnV|3^^P5UZa1I@u*4>TdXADYkent$d1q;jzE~%v?@rFYC~<iuzNW%}
z&<lxOtzR5tXjdhmeb!y=WrS>jB;IM5n_U0;r>5Xmdu{;2%zCwa&n>vnRC^&+dUZKy
zt=@Lfsb$dsMP}Bn;3sb+u76jBKX(|0P-^P!&CUJ!;M?R?z7)$0DXkMG*ccBLj+xI)
zYP=jIl88MY5Jyf@wKN--x@We~_^#kM2#Xg$0yD+2Tu^MZ1w%AIpCToT-qQbctHpc_
z>Z97ECB%ak;R<4hEt6bVqgYm(!~^Yx9?6_FUDqQQVk=HETy<x)ZU@wf8)=!&Y<kLu
zWGerSV5;uV(Ss~f-EUMF)7Ym3J?WvQZ+?`N_<3?}HeeDQ-1ttMn)aC7AevC8EgEXH
z%S9@IG4_1#WR>Wpi!O^<IK-?FeeY}~nnY1FZ!#{Hc~vB?+1Xfd%eQU-Fz`Cgc$MPc
zJ*{#l+8TrVKtVO0=0YFbpI~=(9m3E1Hfr2twqinP2$}j5075saj!Jcicg94oK|i+8
zDl-J<L^)2JWHjmN|3SU_s3DUZx8tInwW%?b(lDwb@rF!1ps7M7=Nqz$9G~Cxug%*D
zk0KH=IY))>`EZ_5AoSv@VbUzsqusIZ;yX<ySVYL1RqLJ9ph2V-I0=X%mbaI5NYGY-
zOCSz51^BclM<BdRc>!4CsMiznO}S{4e>^0`c<)c~mC#*{90@<TgXxqXpzQO-^6-9A
z;MAg`aC@Xb9WYm2?BfkSp<l@Cz)#4$+-ZP-Z(TTR5jv!%rmHkPa#-jOmPUQ1`vYIN
z*i!$1v@F~bV^|NUC%4skZDdFeO8TN|*49y@ooDsu*dv`zvGm3dt~j>+T@%<X$qZ4=
zC<*3d<{q~=wgaC#P!?5+;PE-S6hA(BQYtIWJsl|UgDH(zPhb4vsLA7wRGGcVa@k^<
z`tx^3M8PjL6V_hJfVLahnUsH>EQ~>bovc8n_$bvqkOU7CrYe8uI5~{3O7EijeX`js
z-$LNz4pJA7_V5~JA_Wl*uSrQYSh9Wm($%@jowv^fSPW<~kK&M*hAleywHd?7v{`;Y
zBhL2+-O+7QK_)7XOJAbdTV-S`!I)t~GE8z+fV<jIMC<~}(~#V85VKLFZ3MMr=8TOf
z!O}{i>7y;wp#!wj75drv;R*UdSh(}u$%{V<Wr71S(c#5gegx<RaRY;Lfj%D5%wVIh
z@Eu=8wLLhqQN?Rf3hWjS_5BVdSd5dK$sn^Z-#{FnV@iS)32Bj=$-IdA&P}YWyW+s|
zh2uz)4XLn^dMcj#V$2!^b#h1ajv8iX`7TXq<}Q?bv0&`ZK9Oy=5z$bbx4SS;V{o6;
z$xAk2M;3;GlZt#F+$ZlK^aX)AGBe!XAJrpY5!I*Qp!5Y}Ab#w6+Kswz-p<r?=w&BH
z_w=QBP~5SARP5IBSfxFt|D~0~Cv+$B0IBe}JEwjiDYtO&w{SS`Sj@Ns;Y(yp4@dlw
zIj_O0&qwwg1~og*!DSet<t4o9>Sd0gLeFp;h6FkiVz%g=EY3G#>RU;alRy;vQmk*|
z@x-ba0XKE%IyL4OYw6IXzMiS(q^UDk=t(#XgkuF`{P?=k8k3r)rmhkv`vg@kiWd34
z-~t+1aV3SabTbG=nQYs>3~E<}{5@0g**LAWi*~SfRZhGcgP{e5T!0M7CU}`f@r8xI
z0bx%sI!?5);-wG+Mx&S=NRfIi>V-wP(n&$X0Bhd)qI^ch%96s6&u7qpiK8ijA=X_R
zk&|9f$GXf-;VgnrxV83Cp-Q!!sHH`5O^o~qZu!xny1t?(Au(EAn)D??v<1Uo;#<u<
zt6DFiiRcr7k_5;zi{u5+#zM)GD;ml~eC2M%zm-TR>m7-M@ovk|()C(`o>QMTp}F?>
zakm3bHBKUjH-MHXDow7#Z|@wea1X9ePH;%YA)fCZ9-MD)p^(p!2E`aU9nmJlm;CXQ
zkx~$WQ`Yq{1h5k>E>Ex{Z=P=)<Ej#49vg41$|RJU>N*0b8_O({IeKg?vqQ)hk=JHe
z5iqUKm!~mLP0fnRwkCO<t=1DRCN#BFPI+29>(xxTV@&p+o8wdSP$jZofYP}yEkvSc
z5yD-^>04{zTP7X44q9Af&-wgt7k|XtncO&L@y-wFFR44RsPu57FRvIBaI^Pqy_*DV
z@i13CsaR5@X@xH=NT3}T`_vsy!a02n80eQqya=-p7#YW`Jc0z!QglGg`1zeg6uXwI
zsB~hlNMo)kFL(V3Q1<%8yoI6X7ncn-&&Uh3rL@S(6@wKAXt6Wr=a2ObI7}8$D-FoI
z>AJA>WsBEMi5ba6JhJ%9EAi&ocd(ZsD|MsXwu@X;2h#|(bSWu@2{+c7soC`<N-us%
zwC+KRPSF!$&8)ag6}`g_W=Y-FR2io?sYDG><oM_V+}8_KtB~@SC$d-cD`MA@W9s(W
zx0!iijKByVNV3^bVcwjuDKK?M9F!E?{ffzq99|(HQ+4zKI~u?0a^E@e{AIDEvDBYk
zYPT4IdE4)A94g1Xh+f4GUL6s=ACPZOl_9c)(=U}he!^wCLDC!}yG1Nt${uC8^aj|;
z#3`-LSzZ5zOO@UC7f8(=d<14ISnk$nhZ`JDnRVD?mMvQG+L0(FqQXT8WbeQc%6m1&
z(Cw2K;RGd|d#YJ9o8~=V=J037p#6G|cLa5pm}G~UUQ2op<9c8mE$v#^Oz*(TBCIvk
zg57HvUxHy}{XwN#I+re(dXLe?r^7y2QcoDFeZ5J1y*U9F0LG3sO2`m+hfT8iII;N{
zCCGR-edT&mlO}jC;rdyzyEOf@(mr5$)Bnicm8{6<rU`rFU<#Ks-TiHXy^;NV5~}Sh
zGMGEH(013&d6v862FTkB#x1K8@RR<KO|=>%uo{sMYq&Vyufb)?OI59ds)O+kyE8@G
z@tlpNr0<P9!P}mChFSI3w8y_T<$MOFAvwvu40PR-Z43LeTZfb^;_!{%XdCE(alpS)
z$+(yv=PSz*uP~i@XpoH5SX}0j6IH?ddb5%iD=`438V7ZQtAm*>UO~}qd0HQve6njJ
zda2+l$gdX7AvvGhxM6OToCuQ|Zw|9!g1)O+7>~{KNvASjp9#Cqc<Jjn%6{ep4~BAW
z2JOQW>e-or+y5xdzWL3g<qZzU;EfCG!yYQi_9zCslh((Y84!DNy9K1Ss5CWp^Dg4}
zVvpwj+11JZQi<);*r$4PzZIl+dw1-i3+p?&H?zfhkjB;66CZy$eg8g!zsYk*9T8{Z
zs*fqVjgU?qZnJpDE@C;X4vLC;px~iLTiarv5<28ZvU)^X|BGD17eg>L<X0xLdX3ay
zOGs5DA)8(lJx~r@Em<2wsQ~@A>Wt2oa+T(I+{j(&bF1laUsJB{<yrlcGHK}8AUhC?
zoIVSfR^Gs9OoAB$lw6C~g~<TN_RE77mV})YIN<3x_HML@`slvWlDpsZbyRh#Xv(hw
zs&)uHejiIS2hRZQl6tZTX|FfXIcE_}N66@%@H^d^^#z$b{Lh|W>fOgE-B}qslaS>C
z)TjzG8XecbS%a+?yT!0QmTex?E478;D|sL*oS4C<IT~42EoCkv<fU$56uJp3HHsR$
zo;gN33YHOV73J$E;RfCP$fQ~7SLTRE(igk5nZC4-D|24<emnkf&1IY7H)IY8JCQL8
zC*{_--jSlZgbzo9tjGu}$YGpIuQ|F0O-di|Ru08rXB}ZLHm}(rGEmtR-*g9e2!J=y
z!Ab<m`RIWboe>-g0Tq(YoH|eyxJ#1j088C|U-w5id`%Sz7X_w#l+U9+)$|2no<}5J
zRb_9@0esSr?n}HvVGbD5@$p$8k4?qOe-GNOk3-K^Mw>Xg+drCKi5@$GTeijpI;;IG
ziD<&go`ptLC&^<0jw^l0aY?_pUUK+xp#0Bk66iQ29vpR)VBE{JOJ&OL^gKsN<&t<|
zCMLTYM<?a@L*q&V6@aF{`o8}~9937t!vg&HGL*mp0C@kMIQqw<xcmnHcqqltNzm5X
z`e$1rWo~2qGoEqz!EFDZy-BvRzU&V&g*(>SDG5Ie9O>6Dl#T{@cscz<F*(G9a3U(n
z4-?gMvbFW%3%;+Q9*~|WAtYZv-f=fw&5_mN)epX#i!JYyEYEH4hv(eiJpfgPngYKC
z2!ehXQKsnZOVdovW$GZ0hF^=b+96*}=IPfgf?_czLPF>%)}?tC#?rj>iwQ0!YUk~R
z$rB-k=fa9x&631Z9Mfqj_GRoS1MzqSMEdaZ2!isP19Sr>qG8!yL(WWF)_&{F)r<r7
zFroT<t<|(9`RC}+mJTJX^yO|b7wx}?$Z+X`Cb%Z*NKI=vcStd*b(s|Irgw4o?SX_N
zTwm!T?4{_!I%w1Pwr~hE?f27<9dGk~3)6>>KnJGSciSp!P0fqHr+G=fGO02Q#9gHK
zpwz+yhpC4w*<9JO@#(MdkZcWbdCO5B!H`Z|nV?UtcBo96$BgX+7VYMwp@b-%;BrJu
zMd*K!{1txv{kHKPDs9?WZrz_^o1Tq2P=+=|E=Oy4#WE{>9}*9(apqhmE`&AeBzQgQ
zELFLCmb~q|6y0FCt|B}*uI*ayZ#6=$BpGtF{Jfye#Q>FZ?BPnk)*Qmd?rNG^tvFUU
z_b&antYsZnUR6<MWPiRKgXZ@POHas$PRDijxVN<aT5RsZTD8jV)w0rx;2cB#e7v@^
zli|!E67Pz6Nh*6Ko#;2$Tkma9H-dh|gL&Qw_Ma;`Bd$s<fA3OZ@cW0$=Y&KziJ3B8
zKT|gu`#lkpcmi#a(Wck|Z8>Q9tQUy81r$&ovT#fy;(Db4F&M*C=KxQgHDrRcVR#d+
z0(D<YzCl%cGT`5RbSZIpuxzhv!aWxCI>|*9#u`w_%2o3faI{?dNd9$#5nj1PROHNq
z7HJ(;7B1ThyM>a@Fo^lJb2ls2lD`}ocREH|5pKN;$>gFyM6k)kZG;lA;@kSJIqUhf
zX%dhcN(Jtomz4(rNng&1br3Xx33EvCWz%o8s;<SUZU<|9r5~p(SV8=KJ;)AvZ0B-&
zB=E0>SpRiKEUFd+KJ+u|gn|J85dZ)Exc&=V|Ns8Xs#P>qv6PX&VAJXJ(ILZO!WJd0
z`+|f5HrEj~isRN7?dBHotcPI7;6W48*%<fsA6?s2cD$ET7tiOHOuu8{I=ZeHF>J(9
zftl1Tr`bKH*WNdFx+h;BZ+`p!qKl~|Zt5izh}#pU9FQKE97#$@*pf38Hr8A+<SbF3
zC^w<foHbyyOtGd=_gp6XQF^KKPR`4-t;!23(jm*{(kqu6&^dB!g#9D4&E-~<^#KJZ
zhUOcK4_&|zR|G~FIBmUj8%fQ?3wZI><tm1qUtJwNrndD)mLb!2^vE(xn6Zu*+6*6?
zPPSY5>`N+50U3$6h%^!4<EJ8U1GnMmv3ME^QWN=ocJxF7vFG$bic{y61q8Ey+=PX4
zqa@uPq3xd1<5-a`hbL1bD{M5O3-cZE;%+mdd}KC?L7UXo6&*{k&o3Bi_Av)Q7(5SA
z2DDCn@dO9)hBoFDTbczfa}2B}DTyI~ZpFY2#e{-Js68;{W$GM6q3JexIeR&%!J=RY
zNeqOBHPMaHd1DbnSoS#zk;f^5sq1oQVm8R98V;_Mx{(M-jI~B!2tHmcL32fx@>fBN
zjh^cl#8qW5OZbvxCfYzKHuyeKLF4z^@~+oqlz9(Hx8vypIiUlt!(vs}_t#4@nh$s;
z>FYERg*KD#Xs+W4q-V-IBQK!)M1)Aa+h+V+is)z!_=gEn&^ci7<<lSp%cV$cgU+d!
zB{6&V-FV{Shk*=MDDJ-mhS_<?j0Sx02?kne9cQCm#nj^O;A7F(ot;U`HCqZy$umDj
z$VhLew_}Z~_K^q(HLZ1_CG#0e)Vf5ht1%!atKtcPv%Q`L+S^Jp;F6jF#R16)E0Gx@
z%I}&fkuPDQ5vlAMqK-Z2F>DEEmYcoSh?WdXUsP7O4)&lQXA(BVM5jI8s6;m<h<nYc
zYbjfRUOcR4OD+U;Xxnj4!p-5ssl<tF%ROb5NL(aKEYxMl!Omsn5tVq6m&@xe9R2ty
zaD)OvJ6OOvVnaP@n|@!1J94bXw<KSpX4^fAg>O}94AC0gG(`>|T)yuV1l~i-ejCCt
zoejDhX0nrZDP|x9u4zp%S2UeDzV`o#pBGu1tZ-$<9TIbN=ALwhQ0=9S{8#}Uu8n-~
z5~xIvUhLSz@c@0|me$CdZCpZl(vQw@a0Y4^{T0w_>pOkwI^x4KkBf3qGmm)nG|Ps5
z_XTY~^b^mL&_*yjl~RRIi&eS(>y?y}O4-)nWyTEPpQAb#Xz8SnnfIL+nAcNL9nqV9
zRL|eyF)RKI5-kJO6}>Q89XmgY@b1&!JI>g3ryZ@jN2v3vm7O`AL!BTWNouJzV+$+Y
zYY}u%i>K6=IYU2O$2TAyVjGt?wgF9xCj;?EK(8fWu!!~48`3u^W$eUlCh*91PLxu1
zR<rN@kH9P?SNX2s^Aazw5IaX7ziWE8THeG60EjU<A$lRyC^WY!o&QLhlUyuPiN25=
zU%UxW)3QEWRW)v1qr`{rxmznF66&k*@0ST;;{>Y(F7Q3s7h$Q-p&L$ucN}it*-9KR
z_<<V9aZ_zaq3i4pukzhO4HK+G$rb3ekIm>wHu?!dav0$P+PI3{J8?{+l|n&2YMLV2
z+hRta$A5WpCXl1RNbYBsX8IGX{2v>U|8_I-JD56K|GexW>}F_e_g_1r?08v8Kz{V$
zT=6aGMk>ibvRO@Yrc@ezaD0%ydHkXGHrR{7>q~~tO7ChJflwa4-xL|@#YIJejC5VT
zInU4CjQ9V0+lClQY=vh^s4MadwQmk7li{54Y;Ht}gkZOIh9(vfK?3kXLoD72!lHD#
zwI-Jg|IhT=Y#s|tso1PWp;|aJ2}M?Y{ETyYG<86woO_b+WVRh<9eJu#i5jxKu(s~3
z4mz+@3=aNl^xt{E2_xewFIsHJfCzEkqQ0<7e|{vT>{;WlICA|DW4c@^A*osWudRAP
zJut4A^wh@}XW4*&iFq|rOUqg*x%1F+hu3U6Am;CLXMF&({;q0uEWG2w2lZtg)prt`
z=5@!oRH~lpncz1yO4+)?>NkO4NEgP4U~VPmfw~CEWo`!#AeTySp3qOE<yqk==w-Fh
zZoMZ&lPYg)Bf{l|^Ec9eHrZHNCIgHA99HK~=g9g$6}JC&SpU*3CM#@74A3F-q;H%b
z?|h7~p3*QyKz79VOM&F)%{IJOaV|%(P^+tYv(Wwoh$JQz(gr}bJQ5GRK7C{yczU*Z
z0d@glsmT!7B#p$>#{<xc=qKc7RmbL$iD3w2I>oUW>FwHkZ3rBaFeISHfiVSB7%}M)
z=10EZ1Ec&<kbU9nte?Sr<dBzRXU#i$*kS$Owlw|Bhmq(T@<et$=Ga&nut&%m$aDFo
z4)XQZ)Cl|y6@#9nrY4Bc@)ztgx@#SpqT)}Gurk@SSEbxhd|F%HO-p5^V(jP^YS&&J
z+%c?oG&5Rvm9?m;x&9<%WaOISo}X}ji<*e=QA(7qDLSq^Y2N2^47cAW)I;Cqh>l;4
zG98m5sU!pVqojGEFh8P{2|!ReQ&hfDEH2dmTVkrS;$dN~G2v-qnxn^A2VeHqY@;P}
zudZD5vHtVvB*loIDF1M7AEEvS&h0;X`u}!1vj6S-NmdbeL=r{*T2J6^VA7F`S`CDd
zY|=AA6|9Tu8>ND6fQhfK4;L3vAdJPBA}d6YOyKP&ZVi%z6{lbkE|VyB*p1_julR^k
zqBwjkqmFK=u&e8MfArjW-(Ei8{rWso1vt5NhUdN|zpXqK{ylJ8@}wq-nV~L4bIjtt
zt$&(1FTIs+aw}{&0SO4*sa0H2h&7g}VN5uYjfed5h7eGp$2Wu*@<SPMp)XHv{s5It
zX&Tv-;;C<TNZ%Oi$|qe=DKAP7j<WeX)KI8N5@^t#2{|BFvgbdm__-Qf7x1hUrN=s;
z7kJoEjE4RpS=m~PP%CvnU~QHxAtAS3Xi!_Hz}%@uZNH%Ip>m9WIr0kxOc}fX9eOWh
zFKfV>+SD$@kESKYm{F*J9<G?3TsD|4f)J8N&K`NhMJ_{$tOBOGp*NSq=4&}<2m<9d
zfkc(GDpy0`)tH9_e^)uW`pEK>0XQjr$!<~v(J%&RMuQM+6CkmnYZDGlOUdq}%)VA&
zl#acS%XE2KuX~7IamK`og@C`21~*cEEc#PZM6HT*Veb_l&Ej~j0zL7p0Eo`mMu(=X
zJ$v;&Lya75I4C^saKROgfi(fdP0C$GM3WyZn%mm3yEI>|S&O(u{{S<}ihUp#`X&_z
zmQBma;82#`C;dR5Sx09e07FvtJLhZ{9R~|$FCdU6TDNUwTc9kNct?8e@o2MpQDrkg
zN?G+aYtTjiUPA=RX5o{4RYu}6;)ET>TcgL^VpfIpluJ|lQR(_)>6k%L^FZmoK-Wm-
zR5qy0P)hm8yvqOL>>Z;k4U}!s?%1~7v7K~m+gh=0c9Ip_9UC3nwr$%^I>yU6`;2kV
z-uJ%y-afzA7;BC7jc-=XnpHK+Kf*tcOS>f5ab2&J&5hIOfXzs=&cz|Qmrpu6Z);`R
z0%3^dioK5x?o7t~SK7u5m{dyUZ#QUPqBHYn@jETeG>VU=ieZuJ;mm<dNK^GW-iRN;
zJMLxWuu(|x_mSRGSd*~}JU=A=3LvF_&rALrxn(a&qn=Fr_0RX(+v|)95jZ9I%y5OJ
z8k#%`EfqvwTjiiNk#8u<7<<OCg8%m8PJOi6XCeKq?fIF~GZ;IgeNbzjX{I!)rOGo^
zb(S|7*C-(e9n2||up+Eq!v`F|goG<|KJCGIpNY`t-zw(!Oj>^j>dZM7))cw?a`w8R
z%3M0R=kdOt^W^$Kq5Z%aJ(a$<BgXoK?$Zt>(*qFpy^W}Ij$h+Jnmc9eaP(vB@{@8t
zz=RQ$x4XYC#enS$fxh@;cSZ|D%7ug;0z{C8I8h{KocN-cyv3UG_nk99UNS<TfllVb
z-!E;EJV-QhI;5;*do3PgAKGT_k_}E!36!e!iSgcK`5T5K3hKY>4ki^OFkYea`q`rs
zG@qdMI;4ogcd5Tr`di1JBg4I*6CFvCID_2SN5&)DZG&wXW{|c+BdQ4)G9_{YGA@A*
zaf}o^hQFJCFtzt&*ua~%3NylCjLtqWTfmA-@zw;@*?d&RE3O8G&d;AVC|rZrU}jx#
zC-9SF`9;CbQ(?07o8Q9E12vi)EP@tOIYKEKnO@-o!ggkC)^#L-c40iZtb4Y-cS>$I
zTn~+>rn*Ts>*y*z^b3-fAlne+M-*%ecrI^rmKAVv23cB`aWD?JDJ5NIafRvRr*~~C
z)99Afs`BPK!5BFT)b_^8GyH*{22}yDq;be`GnPl=vW+ITnaqzl(uYOHhXi}S!P+QZ
z4SwfEPuu&z4t#?6Zaw}bvN{;|80DfxCTuOdz-}iY%AO}SBj1nx1(*F%3A-zdxU0aj
z`zzw9-l?C(2H7rtBA*_)*rea>G?SnBgv#L)17oe57KFyDgzE36&tlDunHKKW$?}ta
ztJc>6h<^^#x1@iTYrc}__pe0yf1OnQmoTjWaCG`#Cbdb?g5kXaXd-7;tfx?>Y-gI|
zt7_K}yT5WM-2?bD<z<eYLu_3x*<lg4bNkg&D$DcqDqv0>-}ym*?~sZ{FgkQ9tXFSF
zls=QGy?fZ=+(@M>P3Y>@O{f<p(Y+FVc%_jL8>44yU^fP>zNzIQ0(&O$JCd_!p?2;}
zI6E1j@`DxzgJv<TxXyL6^5n6)9{m}0v}k;7Il-V;FrjRC7sP(l2GP$hLwm*ric@k^
zpKW~m=Z9d3LPKuy#Ucv7a@GH5iTvMk)qgz%LDMhkNzB60$ywRO@V`F(#{}<$+Lzyk
zBGN|@S`&Q)ohmZ&m1+)n<8~&A63wF&lPan&L2^TRqD`G{H|Ez8+V?0N6_h=G)a((g
zqk8bNicvM$w>qcE@zgapQ?tophO14`=14DUZ*#@%rRi``pi0lkNgidSs<J+2dQpWP
zSDpqd{>HGjXK8gO{drQoNqR&tRjM4>^DtW`)fiRFO4LE=Z+nCBS~|B3gZsh`Y?-$g
z@8@Z$D7C!L9l=SWoE;(+*YirPLWvBd$5Ztn3J3EaGM+#pW#@{3%yksGqy(2Bt5PVE
zf*fICtPp77%}5j#0G8<=v=)LR>-a3dxja8cy3m$=MZ2#$8mbLvxE%NptMd+L?mG`v
zF1cANFv17DqP^P5)AYH<qPZ>DQWHk*s~HFq6OaJ3h#BUqUOMkh)~!(ptZ2WP!<pQs
z&7F8EdRVinVjx8S$;n{FFXXP7?z`wh%X8F%_j6OZfP!YKwNK{_hTgMk`8l|R`k0g~
zjrs#dgW3~0Nn;R7I;#3U)OIgYRi``Wo>_$TBV}!@>Ta#eQS_{ffgpfiRbyw1f)X4S
z_iU`lNuTy86;%!sF3yh<Px`V<rt7>?$5zjW4F?6<RtQC7ry0E-s_eBi_2aOz8iVH2
zt#@RE?5z9_ib|#LgwePCOZ+O-0?8nMWnF9@Qxo)lnG!d2D%|!$Ny!F0V-rWZH}wkB
zXfNBtIgQ4Lxh`g6$J?XUYp$_ps^}$3QKZbp4cdiH4mu@G|E;UZF$iW{edF)%+vl;m
z^WM@E+-}BoQ<rONOrab`qWGwfZ;?225504qe{vAdjrB&mDGlO!YXucN+JL*#{%tw4
zY(+V<+|9nKcfC23)=f;6uUS8fw`xw%H-2V}ojn9a|NQ_xM(+@rpQuWuf=~FHZ_&sx
z4W*sE`8Hkj)Ajca*g!($O~EOpNb=&m`Y5L<H+z6&)|%jzlJzgm_rSJZ|D%InCX@h+
zSmxs#QM^Jg-n_a4`#f}UuN^W6^d(NXmexrcLT-&u2(cBpfR^vmW+G_LA>E9Ts-TnA
zDyx5p1h$Z3IsHv7b*Q{5(bkPc{<PyT7!j#AF)9vzxj{PMQWZ6=RK#rka^r-LIw{y1
zl8+)PnvSw4s`Ev6nl+~E2BiyS%|0{nOgVs+!F)ee|7R?3yUB)jeU)#FUs|%@zfl$Z
zcP#&dgF5{K!-dKJd7&|QtB!7?maaaBXcrzGUCTrpi9sbQTuO#IK8G!j5O1}Cw!Y1{
zP3KMCH`bkark`*-hB<4c(j=Ei(;^`=wazKa<7j*&_5JVbtNgbmrb0nM5mDAKgnlUS
zwLhnZs);FZ9rTOv(p&cZr=>f`2Wfxg*Z#IvQ;W_q9|GqXGj<@abo)FyPtzI~i25&o
zC!cJR%0!}lLf^L2eAfZg7Z69wp{J?D6UhXr%vvAn?%)7Ngct4Hrs@LZqD9qFHYAWy
z4l=2LI?ER&$He2n`RiG&nsfLv?8$Cl)&d8a-~-N`I|&EPa@Y=v@>0Gl?jlt>AUY;H
z`**5bpS#VGhdp4pKbf3iEF*>-eXg_$bqt5Dc%q0+)R50>zd^l7sN5R5Z)Ut+oz-8_
zJ`Z9HE9(=wRTD)T=%GZTEi9K5naPzlfE$|3GYGLRCLsnqLi8Sc6y&iskqA&Z$#7Ng
z7Q@C0)6k;J$TlQ+VKZ5)-Ff_BNoIMm+~!@Cv1yAUI-U!R)LHc@+nSUzo$GlRb+8W<
zYPG%NFfr;!(RlnvBbN~~EpT6Xj5*^Z&73tdIQ$LZu`vkfzdTKa5|JJtQ_rm4g$9LO
zKtgYVdW=b<2WGM3I_j|Rd8gZ3j;)S#AT(aP^d>9wrtQS_+K>pZDX^?mN!Z>f^jP@1
zlJ;i79_MgOAJa`%S9EdVn>ip{d!k6c5%zizdIoB9Nr!n`*X#%6xP1?vHKc6*6+vKx
zmEt|f^02)S_u_wlW_<`7uLQU%{wdH0iojOf_=}2=(krE<*!~kn%==#0Zz`?8v@4gP
zPB=-O-W=OO3tD19%eX>PZj3YfrCt0sEjgTd#b$buAgBri#)wW14x7QcHf2Cneuizz
z368r7`zpf`YltXY9|2V{stf8VCHgKXVGjv$m!hdDf0gi`(Q!(Pyg~FO28Vr#!BYP|
zI)qG2?Ho=1Us9dTml}-ZOR?g5Vk)f+r=dbCN*N1=qNfG>UCLeA8pd3Ub-pRx1b3FA
zEn`CIMf`2Mt3>>#3RkE19o}aMzi^C`+Z>8iIPHSdTdmjCdJBtNmd9o0^LrJc9|U9c
zD~=FUnSyghk7jScMWT|SHkP(&DK$Z=n&lGm+FDTpGxfoIyKV)H6^nY~INQ#=OtIT!
zyB*J=(#oHf=S)MNOncW->!c0r0H#=2QzobO&f@x&Y8sYi-)Ld;83zO$9@nPPhD}yt
z{P`*fT@Z(?YAmF{1)C;o?G@dfd2$c+=Av*|;P@Yz1KnclB-Z-fJQ-=+T*g>0B7!g#
zQH{dHt_%wj=wlmT&m59)TQ~xK)gB6f^EY$=1zcbGf~Q>p_PzDCHR6lndGmqPY2)&w
z$Th^K%1v@KeY-5DpLr4zeJcHqB`HqX0A$e)AIm(Y(hNQk5uqovcuch0v=`DU5YC3y
z-5i&?5@i$icVgS3@YrU<+aBw+WUaTr5Ya9$)S>!<@Q?5PsQIz560=q4wGE3Ycs*vK
z8@ys>cpbG8Ff74#oVzfy)S@LK27V5-0h|;_<C4*KrhuTT(XjS_*82Kt`QAr82sMML
zS-68!S>~=j1TTZ9_1LrbBUHb?)F4fc)&F7hX1v160!vJc!aRI>vp*bYK=CB(Qbtw7
zDr2O^J%%#zHa7M5hGBh#<F)PMv7e0c?twyo1lAE?Qmn<A$&;r6kkp=J7ctT0G~ud(
zMc1r=k{0w~t7ygcr6;fLb?|A1(*8k>8(2IBAk}zdhAk$`=QYe^0P6Bb+j5X)Grmi$
z6YH?*kx9hX>KCI04iaM_wzSVD+%EWS)@DR&<qlaqW5;DH_L|$%=*-?eL>n<W8Ry`O
zI|rLQaLSJ*n{eNuE0(3oOg*Hqdf-ps5^iq&rbN$n&<e;(vOh5iQW!`9j?8UY(`Sd6
z;!k9YqT}tJmu<qCo*-k->WsSBc2VIZ>C(jX((ZiV0=cp}rtTO&|GMvbmE4FpBF5Rd
z6ZG=>X&>N3?ZN2^11pXEP4L?XUo`qrwxgQm4X~RCttXmZAhnhu4KDK=VkKq?@@Q_Z
za`*<UMhK^|d#jpx|2R{30s1lZpK)wnk7>x<R|(DD`xAWNFjr?s<+131A-D2OogpLo
z4@|nTJi**aW@#MR?t&wG57pY!WQ1&i^l3tfvZRtM!_&0MR1s`i*Fsp2h>yHrsAEsR
zV(7)2+|h)<aEEu;*DiK*)T&{?t@NsM`Fl3>%EHHLD3>Qg{>G|ns_%5g5aSzA#z91R
zMDKNuIt@|t?PkPsjCxUy&fu^At*yUYdBV!R_KOyVb?DO&z$GLJh9~b|3ELsysL7U6
zp24`RH+;%C(!bWHtX&*bF!l-jEXsR_|K~XL+9c+$`<11IzZ4>se?JZh1Ds60y#7sW
zoh+O!Tuqd}w)1VxzL>W?;A=$xf1Os={m;|NbvBxm+JC@H^Fj$J=?t2XqL|2KWl$3+
zz$K+#_-KW(t<BO`=w8&{5PfdIQ3)fbJ}8XZ>)MEg6zBSF8XqU$IUhHj+&VwsZqd7)
ztjz$#CZrccfmFdi_1$#&wl~A<U*BXXA3F{M{iiFJ5^Vdf9$UCACCMLJ5P*6%*8;4n
zL@GqW9u%v&$)(Z&&`OVEtKdKQe~dNEB$7rmX^UiQu!G;I`1fpM$|_$Uu2tLt7<Km6
z`*`c!>*RisBaBy~)w|txu1QrvR1?)2mb&m2N$C(5MS%hSX)VJnb@ZGXB5^%(<#1L@
zL^>fBd+dEe`&hxXM<0A9tviIs^BDkByJdc~mtTYr!%F7Q1XnK2$%h$Ob30*hSP$Bt
zDd#w{2Z%x^Wpv8!)<D=t_6B>hm>6u01mY!xmPgwZ#Q0148)SxJc3Udt!-&}eRO^LN
ze26pQB!Jhg&Z>#FD>`C`sU44><=v>O>tJdLs!HPpV#AM32^J@Za-9J(CQjKxpzXao
zQfRkWP%g9P8XV21MmoHfx{DICLSc*t4qVeQL9t}<nRGFav!f()eCpq+YW_GwK-fnV
z?jqb}{AK_5<`9$kah)(SO=agaV}Q{e-pb3ZxN)+$*i_7LT6ioBMQ_?b;=xzVyshDc
zeCnBznuBw}_vL2>&Pz0rM}YTba@XsD=XMW@FxFM{QYQJHvM(JsUSa3mcTUl9^qcVA
zBveO--fqw%{#QGR1vy;x88+qMcgzmcYc#8U`CPPt6bl?uj%w_`b~9JliftnOa|ziW
z|6(q&STs_*0{KNa(Z79@{`X&JY1^+;Xa69b|Dd7D&H!hVf6&hh4NZ5v0pt&DEsMpo
zMr0ak4U%PP5+e(ja@sKj)2IONU+B`cVR&53WbXAm5=K>~>@0Qh7kK*=iU^KaC~-ir
zYFQA7@!SSrZyYEp95i%GCj*1WgtDId*icG=rKu~O#ZtEB2^+&4+s_Tv1;2OIjh~pG
zcfHczxNp>;OeocnVoL-HyKU!i!v0vWF_jJs&O1zm%4%40S7_FVNX1;R4h^c1u9V@f
z`YzP6l>w>%a#*jk(Y82xQ@`@L(*zD&H>NY`iH(iyEU5R$qwTKC5jm4>BikQGHp^)u
z-RQ`UCa70hJaYQeA=HtU1;fyxkcB2oY&q&->r-G9pis)t$`508$?eDDueFdW=n5hJ
z08lH$dKN$y#OEE@k{#|<%GYY=_c~fHfC@pD54KSP9{Ek@T47ez$;m$}i<r~s6c)TJ
zDCEQMN<71?Zuq`iOv09SPmJw?(dhlCAwXunqM`?P$)+klct;@=2<#s1FPu_WQI#N3
za|!GhV}(&!)`Mzf2+_>wR}3?)hbkwS$@p2iVH0IM$lB*XYA+#}-re|UNzCE)SOYwy
z=Y!fkG4&I%3J(_H#UsV#SjHulRIVcpJ`utDTY{k&6?#fzt~@Om=L(vs6cxAJxkIWI
z@H7)f2h%9!jl@C!lm+X4uu;TT6o0pd<Av!LwKdbG0cihYuL4!k943i{SwfXpXc4>7
zteFQ(ND@djf#o2kTkjcgT=dHs7ukmP0&l8{f;o3JuHGd2Op*?p7?Ct=jA*tIg{MZk
z$2Lsc0e8Tdcwr<wO@`i)rYT++Z=4_u(Wpvbm=)@;vy@S|GaEZy44KcddbPYE|6M@^
z>jx|_Ok?9uB3Il|^2FF%X#ck}WoIvrzQXN%kT$9NI{79Wm~gZ3`8I+O`)`n30feZ(
zDO-fl6I<e~IF_1;5TLCuI8uZHkS_a&(7lCr>G3c^8S;Y_M-)+^CmM0tT^g0?H#<c*
z9oHF>>H8!oC8W%oU!~3|DJ?)~LT9*&GAQG13zOGq6gs*={cu<uRfLW*5SCw{NoEua
z&>|(V7{R$y@{-iV*9q@AD(#Ktb}J&3&k|5Djs$)9WM7!6#EaJ_ilvbfUvyh8c?-{n
zfu<JZD#;FE(0Hg&r_rW=qAj53>FrC0u6}UJZ7aj@(cNG_(CKgjQQTA-UK@-MVmick
zot}6F%@jhq(*}!rVFp5d6?dg|G}M*moyLriI!PQDI;E1L1eOa6>F9E6&mdLD>^0jJ
z09l?1PptuV65gm=)VYiv<5?*<+MH~*G|$~9Z3XEy@B1-M(}o&*Fr9Sv6NYAP#`h{p
zbwbUE3xeJ;vD}QMqECN)!yvDHRwb7c1s6IRmW!094`?Fm!l~45w)0X`Hg+6Y0-xf#
zSMemBdE)Q=e^58HR{kWrL5-H0X6pDu%o{0=#!KxGp0A;6{N5kI+EoY_eTE%2q|rwm
zekNeLY-R?<KePvv70Vg%1Kd{Y<xoVBHOhBx_+afLZ<)^ME+36xS{!a+M8miopa^2e
zP`@au48k)(7S$Q<@?bU?%y#yRJ0ma4zA9BgIk2?wu5Al@8}#Q*l?q3Me(vt&q2CD_
zrpldR^R#w2+=LX~h4Ne{M_J2qS#n>htk!YP2|@dbd8TWG4#G)=bXlE{^ZTb^Q$}Er
zz)Fp)ul24tBtQFIegdI37`K$VR3tVdi<(fIsu{#QMx=$&CK9M8oN%3Mk;>ZPd-;Q-
zn|sSKSnc-S0yrw#TlA$+p{J~u=u98s>IoL@cNLOxH=+1m?;t1bR$vR=M$US&Z8DO3
z_&zhQuId1$wVNsS=X?&s(ecIi#00o{kuPs6kpYkL$jMyGW8U7mlCVaZeEL=HsIxqm
zFRLxWin8B>!Dc#9Z#t0RNQiR-@5J+=;tC7|1D*~rxcwHa5iIVD@99cCFE@BukUC-S
z^iJdt?dwU)kH2VY9?|zVShMbZctzFRz5Q4tiXa^>@U%jDYq}$rSyc#p2wXr}mc0qq
z^lT>$y)N(Qg0dwmEwTopneoU(y)>Mj+f{iHM0o|>ZtCg-itPj4addYz??aE)Rp&hk
z_SI)%XeSf=SjZq18h!Cc>Xy&EynnxdHQ){(x@g|ZA%`3LU^KzX02c5N;F#tEk1)7v
z(|V9tO3>?^X|kQ*rRBf4>mWW2$-Lx})|M7z125&VHcxsCqB!<$l1F$zCrJ+nm0f3Z
z%Hq^=SKpHyV2@Y*Cu2x>fXC0SscnR*($zEB{KOniJcpn@e`PMH*_Q6*0Z^8RNCEvZ
z+UU9!927p9YZ&g=bnUvQUZc<V;^M<G%xS@R=D@0n9X`Vox8ALZT{5e&UC13mPi90i
zst7`}8|AC_dvKuSZ3kE8z|`c;8Tq+ePI!(x`ob;<PQR7NR)oke4*L{$RMcI%3^c#)
z#3#~B>disyn;-4;ACXOe-Xor9K8Qbp{ldE17+G@VQT+9ZJQ*9dZoXfU2u<x^@|i5=
z)IRH;tJ>e|mMhrrZk2R7&~YjFW4`BTq45UwVc6JORKU)wBCTa<qAkDbMtHS5cvwoc
zi-ghZoS5)0kO58#)A||SRT7?((k*G<ak?B}`^qYVVBIGQ(H~`Yn^dGO3m#nN=SECX
zFhSqSY*6eJUMX<PVP=z@QM$z6KmSF7wvl%F{vWc{;1`Sd9~9=Y7EVrI6!;$;;%ge=
zzY&OvByIUG4SMKPS*l8#lBmQTROA9&vztUKu|y}b1_T-cbqm2nd9mIsedAy^kfHN9
z<VFxBs2`I57vU(US=&6wUqBG+N+wt8U3%*0$$uzVL-OCi$0?A6#L)oonW0D+v~772
zt(11yp0ejyN?Q%09k$D!EtaQuY84dwrXz`irPcU-1U@F*(Nr`vE=%?M%5AlWFiS)t
z1gW#mM^F)|N&<$U3--LL)~-MOzmCk2sl-VNF%i{*i~UB>nITh0GD}s$`C5pb(9{b9
znwee6j%?-UV)_7opOioCf5@C<E+c!Y4u^LhuF~FEKiGi0V}<VK1xq)}xH~SM1A*jR
zm3nN6EGZ)pHplKXOgc06=u1#k(zkgR1b^!min7`9vqG}on{xqBeR@uBG3%Asv*hKC
z%J;MvD7|-!6l04OAjwTuxWVsQ)+!!_O~y&0F1pJ_x9<bhZ6@5n!W^!(O~%Qr%CJY=
zL8c@gpswPIJe!n+mg7pixWC2KatsRHsO)C?NF}Q4)K2Ti)L#<d1I4^iJR>?@w^@g&
z&6<hPh>8+oMmV;5JW@TT63&CSDrfYL2$L)pVseDtAwPwleEM3F^-Ufn3PpfxFmx6o
zQ`Wq9x#d$e`VKn5LOXNsrqhGao7~|s(u~drPrZ+;aP!C%z4NskZstCbAibD}O%8Ij
zb~C(taxco~WzJLxhL1T}3ctXMbV6}_z=IZN9L0|SxLSe`$X`<)BhM`$1&&)e_}fCh
z=idVL<+u6Vn{&ksP*ZLlMo$fC`dtzF_?~L?4Rril2G4%v5^7sUa^&8aMtMX&mtapl
zD(dW|cisM3fqMaB`8?QbkyiUl2g>hMB5EoS&IB8T<h-K}Xwcy|!mwXLSJ7_p93fG3
zWGXigT_FQk=(qVGJc`g6QPn^je?h+amV7%|{ulkKqt8iq^b02IUoiO}5bgiMha14r
z<bNaD4XXNI<s#Cj&7TfO9ShNta8*H=*?<nEettB;*<Va*WPdCI?AFdS<<{CvuV7vT
zy{}Q9b^|H$#8CbdDcUf}--yNUP29{(-F&-JGc*4Il%|_%%<uP<P?nq_NPXd?mfUuZ
zMsxGH-edKDZF<sWm5;?XW?|*>doC<zYA0Oib(G1n*?x}Iq%^f0n@bTq$^^$YS+tDM
z3O6248R>~)b$nT=`%GgU`k-)+8}`)F*~I~DXMaTP%kZftx11~?iALs5J+&Rom#p%Y
z>dH}-euH4u=_V3hc6^*2WMtL!9%yRTJ93p}@aV0zdY*?xchFI>m+UivV=;aMFp0P~
zwB8P)wvV6D-GL?6hJ#g7Hy7=2i^&Od#S=j!;Rc_yj<nF~-j#2GDgTDCWkmDd9J`gC
zLMuzQ?@%h6Wh%oGRazY5?Bm%IdDA=4q?YWF4Sv%U+9*R)9{^Kg?q?13kP7__{#wS^
zQl?T2056te!$}HnP|G(AKWbO{F(EL+<lZqJM1By>O!*4aN7{vqzg2t-R|Dav%_NDk
z`H_FVlSi==(~f-#65VmQ{EE92<E8GKieH498+7wRW#_u9DlI3Cby!Ls^b|LT9X6Ho
zv(ZKw?R4Emc2w@IpmKeQoXTCmXWS0J2uJV;5+>x<03lwo5p)s=ZJ^L7PlS>132Whr
zR6v~t(#I+(`usYLCoO;Rt8j&b^5g_xgs*98Gp|N}b>-`HtVm)Msc<Xj$}ya?vHydV
zA=vN{+|GqZ)(_1~n8M=D-M1l7KjPZJ!qzt+!W%HQk9GyyC(;R@f308pa<s6ENT@Q{
z+;q#~;OA}|)<$f6J<?qbV(6uzVLqvxucbH*lgS<A7}5AW{rdWM+sZ(%kVP1fJ$W=K
zy>D)71y?(K6DRCZV26RsHPHKk)EKKZA%C99t3$t^B0<vvo)G_8YN2#-z?}PnjKLRV
zMF0KT^dFG<S8XLz#pXZ2;``uvkb_2vR+<wEA~m+wfbP9R&A^_<YSCQ~EYd}1q8wfC
zHnHLV0p|y${{|w4(r4zE=+NjEP_N3xzdmt(emTxEH9q-B_;r<3Ly!pq92wpcPw}47
zdRb2PNLKGBl4l?xtn}yhwW%_vXM^pjXxq&8qVGz5Kkj97Z|a7HXOT@@#|ZxA3WBhF
zPrZy?CUN}a`QS87$0HLN!ZXv-*?Q>-k5@?E>A-YMbFe?>ms?J?_guHHNU(;id*>xH
zTrtam+Aq?n@-y@uY@A?hy?1qX^eLu_RaH4Ave?A8NapgQF=C%XI7wlcCf4<6BRo_%
zBXxxc*A6-3CruF?3i8HOdbc%>N=-iiOF+9HX|ht6SCkz;A^am&qi_I&qk1B(x<=(m
z>QG)nswCOLl_1{SZ@_eE#m^qb6#6DoMsB*)`17ui+XvF%(}|J4G$z2G*;E!1ERnAH
z@q%=#uV6kBddqy4=g>!VTV)9*1=i{wJ}Ep!I*?)uJdA(LwE?(!?;}_u=^M2NShWC_
z*7l4aBJ=!QVU2-iehgb`$vOI8zkm{W%QO~?xOD;NgI;Iqa3#^$^U5D&McReLe&qs#
zR<<lIr`pbL!li_7kZeK}>^@QpR4#W~Laz+QBsPt@3L#KF`Yr8}jgHe;5(<zs`u#E_
zEu6e5$x!l(wNZ7}LTip%m?o2q6g!hY@F5iq{O&$wO#ur-BIXscI+Q$Krn7PT_J<<|
z`Lpp3T8$IgW(`ZEch55Tr8R@=@5Om1nbE)Vv(292uRl^|AdrdK0t)gB<-!{CDxb0f
zOO&*2{gbqkS-~a8i9&ccGW(DS5{f7qp*Ey`T~b}d>cfpQ=;Zjtbt;c%y^#-m=hqOT
z;KAYakW+$w0&F}>K10&SiPcD9SrDOuczj@U#W})5jGU-_htU`U6Q%wdy((%?J}y+$
z=$4jw1N&#xa0nJo)qTxG{D(`3*#8tY|67hJRF;)r6F|#I`Ar6I0aafR<U5lrJPQgT
zf@nhx7Nydl1Savval4U;rfyhI`waeo|Jus4bY9r+8-MAk_74;xdxsm7!=DrBN0|$H
z@9*!B-3W_kl({-VOWk<Xz>a=kr-Z0I^}9xf^u;G5iEQCbpv3b#S#%H|HYHsQaHK$!
zU#3Fpz8*^pK%RRmX<_09eIVziB0jOgPgFnI-*QcwEBtBiO#v!>{W1cLNXyw3D9M|A
z*oGy(u8BkDA1c;MsXmpK^-~pl=We^RYnhZ4bz*)Q)C2G+E3tgx9PzU0T>c|1ilS!T
zyE=bz`=wskDiOi!@!l?Y))#%{FM`}7r~X)i1)1*c6_2Q!_1{)fp%cS|YF+Q-CB%d<
z=zYus`Vt@Mx*a7V)=mpLS$-5viaKgNB=+zN657qy0qR94!cTtX-Z%KBCg4OKw7b=t
zr=`7q5Ox=lJ%!G5WIyNQC1xpqYU0<e(q_pNb4EKEaQ9G(?Hd{anjulzgD0pMCmq-K
zWaUP)LqaTR7N^#=_Mhl76HX6c@^>{!I$hyrk!6%De$gp<_*Gc?ES(OwY8U^)Kjgc{
zSlhpXDb|;{+y9`u{EuMz54rlky2~p6xX2>MV6BZ&k`$q%q7v(xYps2wr9e8^4<;CB
zc)eA<kvQPmw4$p(IPl||fea*!g6|iiC~w^c$?``vaeC%h>T~B^rjzO6<4BDDH;il6
zFsM8jL+agQ;zazW(uiQjM%fPf2N~_p{cy29XP11_lQFpt`t#9nlk}>fv((FZt-dBa
zuMIc4HmPHW04n0TTG9ug9;&OV9euL$Ib|+M7}}L~z4e%%%<qv#JL{%>b|r<G;vD^5
zNT`!8?Zrk{nZ6$)buIANW8~=A*b*wu3t$k?ao&7EfJn;bJVP|2qiMPwswvFMtB$5O
zn_dM-#TG;u3MkS~dfv4LOY}Ke0G>~6OQj(S2d7XfYn#xp8;KQ55UYu#gY*De5j6Cc
z#R%?rqwpy7I1(kpU7B*Pq=etXeYUn<K1FAFc&lV69S`~?gz<oy+nILJtD5zKj3&_#
zQUm;smLma<(MRI}a<Uq|J=7?$(?uVPP(MseqU~8<^m5T6E(Tov(Mgb9bR`k0@KO`1
zqnA-;DxI1h?f1FtgV2r}B^qIsi`f#}IA*fUkUef+I}m9;rO~E!jBUrGsMsKmaVrz0
zh_g(z2URF{4VcpnDRnSJ+>04jg%ZPjYqQNa$==yTG=6KX+=;i2Xg+kjV2T*Gc!(ef
z`Q4fR*TA=M5-}z+s%YO+!K{k}S**ic&>o4_Tmv$EQTOp7F6TXPCj-UTXy?OQ<ls)j
z-5-M-F%GJ7RW+H-JiQZkST=O)d`;C;Pv$vP*TN$LA*=iFE@)5cNU6TX*H(hJFu@?s
zmj{E*uE6sT3uoD)4;Gml3T2#(0z)W0qb{bA@`*`&VJ=R@A<1t`Y1(qAc{ym6G|i}F
zBGDN3m^02GkM>=%*y62Qajk{rXbR%jMCOFMiVE3KekQa4xR}B%=iPtd8BXo~q$OX_
zSp910{Ew;m|GATsq_XiJ3w@s(jrj^NDtr(Dp!`Ve!Oq?|EJ9=vY2>IfrV{rT%(jiY
zi}W@jA2iqd=?q>s;3%?@oi7~Ndo3Ge-2!zX58j(w&zVlPuXm3rcHb7O0RsM|!Ys(b
zh<z+m3~TL^(&&Jtr#SnIN4~11AiI>(=*&Aywo3vuJoWZnU!u2_4bNkDTc&&bCYc%T
zM~~xYxS#3KXFzQ@OXdc%9QDOxqiTd_<fgK9y0x~~kUTV;<B&f_-Tg$t^aI+zfhy>>
zT;(DX9{5dIuC4pO_xy+3{Ov)1I7j!Z)<V!m4nK%vFD3-h_oUR-^20iy?)^5HmPW2N
z_$`l7>6&nHUvTRP>VU5dm#<il%&q#mOWTm)Cg3hydn%XT$ndu0-6fT^6QI7k@bi*q
z)|RKCdKV0iq19&pMb`8WDML8zm?!@IR3A<KpPb!i;)9wdKlob&G+{l@$M~hSH~OeT
z7wFo|ER`(5=U9Noi7zpnk7)7vZ8h;ywTE&Gjnn42wQWRBWZu%X^ll4j%Mi~f-H0%p
z>849icG)cvl0QOPkCIzG^lOp4#UcNr`VhBp(Ha%8@KPlvT*5u!v_$b#b~%sn3K{mu
zaxeD%Q~{;Lw03ZAq(Pc<UD7Y?b@Gw@1v|oz?@4dnt}kf856G<#&}pp=?lY^?C_{{c
z^{D-crn@4gL!lNERn?o-EO5nCUgeTRmMZQz+~@>-IVj>n*h3l2{sqioCMGatQY0kx
zi`1(WWDQ=;gmLSGptEQ%UFC)th@|71<8eiRtX&Mx@#1q#nMF_BMfQdS>!!Qkx2o}=
zuqRi?`UOX5P3fP%M+71Q$ctH4Av}bXED#fQ`KR4!b~60nsAv^*M7c-x`|~B}XIuq%
zlqIJOf><N=sYlp6#!uh>WvlhQ<Rt<63lPj-fDriiDa8MYJlM?%Ao(P4y4WkHf#KvR
zP%02vnCl?n5upo(3kZd;N(pk=uaTAYtF}ik+WLR?2f<3<J$-+p>@Uw$du|14)tZ?;
zPNZ|xZSwp1y+d4sut8E4*l2JWR|~o0A9vD-<?+N;GE5dY@>?<CNM5*xWUWDY>zC-w
zDc@=wE1YKb*OMSi_Kx}&w;#h3>sHp|8^hnA3w?-WK)X?@Z2dgV7`9Cupf-B2RE4x^
zwlw+~!V9C^tyb`J;m2}ksD`w}G9`yu(^--{SQ+wt^Fu4Li~Fft!3QO`upSkAU?o;#
z(1Q%GUVWbbkTK-M=T+ULkk3s6Dc9`G4CO6|=&<KbOFBlY-RRT^c{#WxwN-V_A8;G`
zGWOi;#de&MK7mY3K0Ve6X#{cw)L6Gtad%C<<Xg>-S&D+rbJQ$`Y-xL~o<EnPk6B#j
zvv@_OX%zc>l;kc(l)VbU>{&>bV+*?ua;$bnDc29RW+Ig16)Vf6=L|fMR_P2b7>6}0
zdlB#-gj|j*C~M=F^2=K*k~=tl6YM3SXXi&K-`EvEXnWz&4D-^hQRBJI3gKKDj^6|>
z*WhHSim1qAffNt60Mve9lfw^+&0bx-AM0%j>QP3%W=S@(l=(nrJ678mRQ(#+sI@d{
zdb#5fo#T;hK7xJ=M58wZf|?DHwD%!OZ3JrTGV5#{cfQwuiMvz%!CQ}CubJ7`z?<y9
z|C*`VTK!+Tj{~Zb%KtII$_<O%`|Ue1Ni&HhGc9ykZKzTrtSXvP&|&vQoJ`P+F$G)d
zH}%gLNGkAB-Y3vE<jr*iy>@rSF<+KHNV2goc)a6hP0oHB@3LLKSH2w{um&J*z1Ka2
zLIR>lvOvh>Oxe%?3A@v<_T|}${zf_&@C~^FCo#jB(W9VLO?DX{)n(BQ0(V0`mI|9Y
z#U3WwxixJkU_NTvA>5q(A@r2dnEXJp#6B=pww$XGU}~1~c``UKqQb=^*2P|4Dq*_!
zhY^i61Sy%T5$Td0O6^C>h(<nglq256xJy|$dp+t~?<5Mh)t@*id}?lo;OTh2equ6Q
z6Imgbvd~>xVvT!}Y##WeT8+s+Uuz=7)~V$>!zU;%d>H)rm*6^IrsCma%|cifwDLk_
z!^W2voQ)D;I$=v2E>iSaBw!d7aD+|LWl2iD!cBw`Q5p1~fk_xGiPi8e^mY&#viTAk
zmaKL8m;JQ4bY(n<q7FTi$+xX1_SpTqXYDqr<p3U<m*_g8vw)GG^O_YY6Bfr5lz9Ok
zr~LX;2|8o}c0Z^>6uBZt02z#noM<c^rb*}ZzFV<=yjuAzBrU`x(nWvPBDfT3PX~}}
z3Doo1IDuLDqa;A=-tiIaefFE7()?&h+rAO85y5!7w%#gWb~^GSQkKi;=7E&0JZ-v0
zU^YC`i$~It>MxTfF-RzjKre-c+@B)#J3pN-Zv7F}JtAwNk3j?OkpVCL6W1)Q$FLAj
zGI!tX;g`O<QQ*h(B+&a@%0TQLZQzC`=_1x7YISx;gcD+89G69uc@~@K2;updjESr;
zmt5o@9q12kl|}}l8^H&f>{%pt=0|q54Jyj##w*4e*|_;Us2Tn?!#^R(>u}|FAw1G_
z#wQsagnj9$TAC`2B_XgB$wNq~Sxgl?#0+QWWcB{G`c6~&SosbtRt}Tukw`TQ!oG1=
zYyL(y<;Wh+H24>=E}Gs=Hs<SQ2GhiuV3Az+{drOj5Pe_+jic!MFM*sPCAZ!k`P;X9
zs(){l=^qjNA3VQ8%gZ2fA?Y*I*tBzGA5@5Fm`G}$SW-elL_mTF3B()-W{HNQaGEln
zVr;;SYDOVIYw5FKR<W1|Uc;wVP_g(zLOiIxp;i&|ccDVN>2%fg;&Qdvr74{E!R?Bd
zIRQ?{{xkLJ_44P@y3^#(Be%(pk%$liKbUUo76wSoVfJmt9iTKL3z{uW6L&?jYg>EY
zsx{<T6R=`Zjz?z`<vL|4n47yi$F7jyysEJmnTK}xaU~PbHW2<I+_M1iV=RS$RkN*U
z*FN}AXd%$TeQ;`)qB~%Z1C23=M27-4W?-(P!P!7po~o=P`<E-T7KI^WQDLEnM=_k(
zMk>kRiW@q%<$VZvbS(TKKTO4{Ad6l^IeY(F^3}=mX9|FZmQ`~R<!Q@HG}gvv3UXBV
z<p3ea$V8wgm{kO)(bIT4cquV|iDVqonkQTy7FKdgMEE1^cW44wCHO}UzZTs!M#Xr&
zp6U$_qH1QrFs#MfH`R4EOJC+9tly;)MTJy#r5^bkLTt4W;Y(P*<)k4q?32+gib;7n
zRhd#0oFRt16e1-F5&=d2j;QFIbj12&CD0)iw%l7LqG~UsI_6q4FG+zZRn&409VBH+
z5Sg}y?1xYpnbbI7V-ZSNXU+8sc-12>ErNxlBPl3ast}W$T4V?SW=6kIGn@-^`qJv|
zZXwhK4Kl1a4E}nLI`rdOi?^pd6;LZ-|8G&INHgOeC5q{_#s+SXb0r(;5ryHFsoTJD
zx$VtNDh=-Tx3t!NTlk=hgAaSM)#U}e>_-Ex(|JoX*hWmBPPdTIa-2(BIOUJ|Iddy|
zwY*J%z%W$}*;uSoB!BIJB6N6UhQUIQE_yz_qzI>J^KBi}BY>=s6i!&Tc@qiz!=i?7
zxiX$U`wY+pL|g$eMs`>($`tgd_(wYg79#sL4Fo+aAXig?OQz2#X0Qak(8U8^&8==C
z#-0^IygzQfJG4SWwS5vko2aaOJn*kM+f1-)aG{T43VJA<p``IHHz+Q+YTtZiQ4(JS
zX+EScn94Wgz4Lsq=}&oqX5?MHq@;?i>gxdP(fJ4&U{XR90*#a)G8+clOwdF?hJ?D)
zmxu>0>M|g_QRHe_7G|q6o`C>9x4xd$Gl7lAuR~+FtNid=%DRsnf}YI*yOToWO%xnP
zY*1G5yDn<c-v!aWMHW?Ij!Go=T|IryIuWjCYE<>TGv{{x<GQ9wOOw3m0T;_tt%J`q
z74Ah7*BAD6gIzK2Kp|m4>g5FhWU65q3-|-(+-rJ2WCeSJn(7Az>ej4Jp9+l-GyZ_|
zJ8}>iA4g|}q1AhEEv#uWR&$g&Uyht?fVU<mo*~tGG*v0ZIb)5oiI%N2C04^*&oE5e
zS~q>(qk(j?^D`))s>oG08pow!f>P1u71P%oL2)UC4GeS87&G?{)NE;D=my1Q9{~;y
zJULE=bG6jXE28Y11YmoZoo945`MM*`v%5b=_02*0cwzDve#3(4M}NPt`)?SCa|7*q
z-94ks(R6WH-l9fE4m4}10WSu&O`|;ZCIT%vL$_pbABY!}s33@~gIvZ0H4co|=_-T$
zF#lC7r`89_+RL9wYN=E3YwR?2{$^ki(KKd>smX(Wh*^VmQh|Ob<Jh+3^WFPB2~REY
z*Xyw_SsEfsb(q(%pbTm5&<w>5$n_%N{!{9xP~LJO0^=V?BK8AbCEFBhDd$^yih$>U
z(o{RReCU{#zHSEavFNdc8Yt<%N9pd1flD{ZVSWQu*ea1t#$J5f6*6;<i!*-Gu<#qw
zr4Q4AO-Z6(w#=ZPw!1z_R-|)05@KW<hl5udA5yTYJkNv_eBFdl61c*?AkP7$oOc?x
z<x<!;`V=49<iDlT3SA4x&zF*$Z^XZ&!Mv^X>tCx=&;EIN^S}<jK*rsfCni57MfFoh
zaI&dwJHbZ$fc&)D{`$tAV(2+G`HsSbn!eT1PR;K&nTDU^{oe;JO_f60Ts-ll?r8Ik
zPnp?LA_75_MH)D5aT>*3s%=M#)`~=nz!&Q0&{EP|9nzWyS<#!QxP;!E8&3D}?QKh^
zqGum|+;xu9QE=F#fe2ws5+y1Igr&l`fLyLKry=1}(W+2W`waeOR`ZXlW1B{|;4sE3
zn^ZVlR11hiV~p<~TaSen8I~ay#7Ql=-_|U@$8yjZsZ=Vi+^`JV2+kn+oiSUi<eH8y
z@$I6vg3guJ-8kGpiIyCuSUy6A;a(i3;+woj=cQ2g#wgs~1lh+Z>%omO_+7}saXnJ9
z5ETil<PEat5SwKtc2Q!f*eI%Erm%4Z|LSFO>bag(g#jZPopCgJu+n@(i7g}3EK2@N
zd64$77H5a`i%b%a^iRjMaprwzWz(`=7E6QY)o)gek7H)yZ-BLw^6FAoHwTj9nJtWc
ztKaytMlWGLg29W{?gr|rx&snb@XyvR_}x3fmC>d=-nQp5ab3*whTw}DfUcKlMDDx`
z-%?ek^*|Kqooy#>2lfklZ|jN4X$&n6f)RNNPl(+0S>t(8xSeOGj~X0CGRrWmm(WXT
z))DDW_t&y$D#2`9<-+JT0x1==26*gpWPV~IF=rePVF%e-I&y$@5eo~A+>yZ&z6&7>
z*INESfBHGNegTWga&d@;n;FSCGyW?}e_Qw#GTLHo*fWxuuG@I~5VA!A1pOdRTiPA~
z^AGe(yo=9bwLJD}@oDf$d+34~=(vIuPtOKiP}obDc|?@hY}J*@V|UynBeAkYa?S{@
z_f$U=K+>deTAi&=a*xv>Ruyw$UsTWY=Yn=xjf;s)6NQu>_niQ_idmzIwuL`Scf)f=
zyzK?D5a5)^D@H&qN%F6Zd0JeXX*Knbe~VLe^gi|?JK67&mB4jrapV-$`hCQT;C{%T
z*pjxB+Y|~LD9bmMN%Iq}S$F$x1yWU7@GcR91V8h;!O2I5MN_rq*gRx(k8T!1WSDTp
zr9eJO4$~H94aG^6k5p8k<Om<4^qIVR$}7-89S^Cv*!ogfj$eEPw!O(2IX)cH)b7Uj
z(D{$6AkG~zWBFXWE-m0(g0#;Me9`&$f<u4*0Yi#94G`ohUqed@1;=Jkgm1|*U|vTh
zt&nM}VN$MI(5Pb8Io*fnt5>=kFJ>4lnY0q_Bsa$@vTRW6uY?slH|Qt)Yu6Yun&pfJ
zBi!h;6x?FDs&79#PT*HSCEUsKws#s%TFy*=2PAfb`>gEPBn+D-WdfXA?MkB=<8kb_
z1+4D11mdHG0EcAyg4dneLtfJ8)RyHQl@6hWJNe(d_EjyCHf7%Xsd)S4A-4COz{G@%
z5xQ!P>AS@H@;4W<KcB|c{cOQ*2g|H}`X;Eo??m94U0Z$av_gm_-II2mAV*#d0QEB7
zsxjDOx=tIvaYk6XFlXDDM(R)(hRc(eGSZ)Vhbz^iN`K7?4P>s)N91)3A6PleMe2<&
z!(zv#%Uc?N`(Xmm)OJPYt)BM`nRjoWA&P0Yxl@c9Y02zlPH1J5l$nhPrMwu=atkz4
z)a-1+OEL;d@ctx=s<<+3Sv1VYy0RY<X+ux=2KtT`Vu|w~vi~*GQywuIz7Q_V!Hn=y
z)ZU6YkR>miji|#hy$66#`5;u~BkH4^$EGZ-Y4xyZ=%3KuaeLYKAUr$xMtIh_5mga>
zPz<#G0mQ7IxEw-yO}BueN}RaFlg$RwCDB)vLF$wDu%qZyLYsPKdcb<wALyt@*8W0U
zqSWfMa(_N(R=CrXFJc*SPB7&bo#W1MPzwLctt;6o8MA$uNlEm#qF^&@-Pig^Y~zDf
zQ$poL$<#~N=SdF3)gUAOAiS!ip^ss&mIhwdqMwR^;cN&W&Dre3&C9-tq_YijOMQwi
z$+oHul7HFXyNU-uuiEq1^63NOXgwnU@1O+oYJm64lf`6-Eh)=6E~{BWUTOawUj1M=
ztB-#zP;`DkLY0HB3vw>HD23$qn9i#JFqIo#OK?u7db2-$GatzO!On87%}Br};~#}n
zziVB;qf_4(K$u>Qyz$ln_kBGS!CD-t4Y}9oxL@7@Sx*?NOAzdeINUD>Hl#*V%pfA;
zSA`==YatS*G*crJ3`3ll4)vKss&)UtY#7ZxiVoG%9(4<%`WWcjX2jV(^g7Yhj+h5J
z$5=?S=tuCyEt74^6jo@6y|@~N>&cVfFNtaRl=)Gm!vR;Bc$3-;ySCI$%kdmjQ|si`
z{$q_YCe6vjy6re9jGN|`43D``)1PODtz0)vhV4XV36nVpOnMx2uM%qZ<3TtcI%>BQ
zf0(J`{JqPPJxw><pYvIVsSl6PJoMGZQho;>k#&nIvoZ5e9Sno)<M+aWI>B2r+E0G}
z@&M|zf4E0Q$O*NBR2<R=T|-dFe=pgLp}i{RB)8(%@x~v%=j6^BdSt6*N6>I;?i7N}
z@2^Su#`%qeX}m3cbSojiLk#84kvW1fICNPS`OyT0SpUoA0(s^2m~J<^eKE!dhJx_N
zG_T}0&(<*an>oF=@?6?55g&IxSgY3?7|@pmDRE6gJyJNPH6un~%0hZ@?h=hI6O$b^
z)29#<4$E)cE-5IFbRpk9JVrw$$966UDyw;Iym4OY4Fc!&s1ZH4BJ1-$9<)Zt1c)N-
zU^&9hsk6z?3%<9kGKHW|6~k;&cghtWz`oz`_YjVuvy;B;T67=L2c6=8`7WyTBv*QH
zNv*bo1#KOk{O&)@&pkd*?v+kcJ8tM>AGx$~WMhH{L40_N=bkrVg+^p!H)IqXCQf2_
z0fPig=8CEo>p4vE(nc^DKbZ|9_Xo}$i<nrsc7=?}L#k*l;@(0MupF7>4zJ`jVh95;
z5%aNP3@``=EJ=Vt9U`y+$YtX;%OPzgZ_3+;+mh{p#W&y4-%%Bf`LhOy-*kB0qnB^m
z_nBTz_b?-`F$*ymByshU>D)za2g`0j^ioo;A#QeL@x3@|+_!=YXA5f6Xg(Ack&WOg
zJ<2i|Fd6OmyH!@YSMVxb;=M)ZDhBt)4`5T*>cUXWPG#%@$&*<VQf|_QEj^;1*YoCf
zJ#NA#h99M>>K&u3#|`fm2mj*FKVf?du{xZ}WKWETTFhq6_fO$PS5(ItF=3~pFp~*j
z!ys1<4EL1)#{`mz@gW|t-FpPkd%pK)n_R<XGG4d(`l+MhcMBN~`esM~IYYy6_!rFx
zi{d8*%ew{lp})MvPrpY_KPlU6Z~JBl>b)F;z7cQ6dym_>YI3&e!=!m006oS3Mjq{q
ze%hNzW=G0jpfl2K(x`CDuZCsJV*hm9T~%5n<kIXgQNQAP!`L&M6@X9sbN#(*m#<@h
z%}-Wzi=wtGP^movMlGquoiO4?o3`i5{PXH>7R_g}VFpk`G((D^MWVMAmRp--T{`P;
zwMgD<;e`fm`g3|fPns|6qnd{|FCHY*YAguXH(?%sx%4+Gu|Y)_8mk4EljxmP+MP`*
z`SUbI{TCIN2OV+$y#g->Jqv#$wL;}4xJmah#$0`v^ughM_XjTA$B}ux)JZuY5-GW4
zKy440I+w=ZtE-_i+0xImq}vyzD68?8;94-5L~_O6Ty>X3itdA-x?6P(c4jkr+f!H(
zUDeqiG>3bn^Sf8(`_YwqPeJ9&-@OCQZm4X{FfRMeBtN4E9Ca@;GVpU*L>lVb;@=PH
zTQvTr?^jKyCKh&ZVOI*<<KC*~^3XVwVfca^38Eb{nv~0qIE}HZeQ1PH6@xX9j=JR&
zV9g(^6{BGm>y%<p+?m`qz>T*Aw(XCPr<m!ia5g4Y#nP}ajxm*wuXj;<P^VUy{hE2!
z{HfFfv$G5;{*d4Nyh9w2DD45oj0yXra&b;S<;yi7y4TTHH^RF`4tmVV2(-)2zT|Uc
zBp#RP``Xi6u<*MDkF@RXW4gC*!c<^Me7Y`|BW#!50N68ocGHaqPqwv@$&c)|C!ZhL
zZa1&Cd{-{UBact(QP7|N;&zbI?F6FmH3##E^#4Q2`A_-A_`j|D|3k^iRJU+LUBdRQ
z#E7AbiK6Q^`0*VXW3AS@rC&BcMh4#BkR%<g*cI-CStF2Fgn%kPuBToy-S(u@j%<UY
z>FC=39*y$A`FSzxBiQ#W+uW10d8&gYp4{teh;^p@anft+z$5!Hv&@h0X-@xJ<hC0V
z5NQ!<23a&gVCZX7Py!Q<C!5dfrk3jph84fTdJG>G>hbTCxjDwMiWK@1b%8wYL6BrV
zT41m}tX8g-`P@vj4T!Mlk8F0S!MA`^J=SCy9-jdwDe^hVDa`WwyI^H@ryt=F5y6>b
zT8&iI6&j8edAfX^ycgWbnMZQ26Q~`LmdEScKC8|~$Jgyw(>18NAQ$9AwCRmri!96L
zp^)b0P2CR-9S%cG$#rU}MXnx21T#031o>2VrDs@sa-FpjfvgLPW>Q&LHUoNOtmkt#
zoDZ=5OGp{^vO~=p29^`aXd8K?(+f-bW`N$U;-o;%f?RcR!k02Nod2h^^8ly%Z67#E
zC3|IOuj~^YBO=Fklo@3mvd6I<BO-f+$R;_6;)m=|cJxzrgpiUwGE4Y>{Z*&FZ>iq*
zxh|JuJoo2$p8MJ3zO@dQ;%1#~Mrm<Be@2cYu0c%^GGOhc(C21=on-T=Hcb7}5n>48
zB0053<snZ_Q)+q9Am)fE)VXwukarzr;x1>{1bDi_a@jo<4!@!`w4}B(&Qb`~IeSBh
zu+_yIYl2Wgk+?x4pCmAM>x_SqBPUj#c`C`k>_fp@qPlAAwD$!zOxRkL7;=|nu(#ut
zyF^;&hm-D_;ji{d6rOloACu5*NkF4IC3@rifMG(|^Skv$H&^YnYL*rpw=UCi;JOuz
zN*NX(7wZXS4tF@6PIWAs%*j!$RoL*3sh)}iry%thDvN5AUM888q_(>|Tzt|Yea<bs
zFUsz!G2e(z4SIrgldINq>3AyMYBgm$H_<iyV88GPvpUO1LF{eir>`F^v2%)bux)3s
znFIEBDK;-JS5SH|;1?afJb<*=c5puu=w<j}*^B{~H`bf2`bj2Jt_)m{0#y^mx0(Sx
zuAP%sBaS@P+JTZYuAqVen-Wz}1l0)ac}>%tv#ihn*R!^Hd$KWAp4$#`joJ*)$kNtZ
z2Al6h>Z>(u?3tmzA4^d+jLKx{97!Pb4;CX&u;M||**7zXI7hO6nrdMx*Xa=|-`#1^
zBQ?Ha&7cd7hN=%y4yUp?zl8~Lo;%mQrDe8!ce-W_K94FFMN*g(w8q-_K5S+c<WmVG
zEEJ_sK9zmSF@5;*&Y{LdAHgZbCWE5(MGvPND(SspeWbOl$2fe-X^VCFwU<RH@A$4F
zWD{_$Q`{myCbTh+F2OF=mmBNduFRWz!P!CH?nI)kzg9K%+ND>0<Wxop{UDcr4KWc{
zw4K5(a^$*)5|QJFh@ofNM0PwBD|*gtyuDIrgZdHfXaetIrMMgQ@RRhM*i&yqB&rsq
zD3F`z`*bm>{<BbM=$*(FdA(Gj<CG^PtKUjqsWj@?x%}j+moBaC^0S87XD-EW{!Pi{
zRcb3F^pu4_<|Y(ao3>o29X&PzpV;UJE^!xnFc%b@>kvW4m#xiOj-L*DadC&2N#0Us
z;<-(m1WB7$=j6hjcPC6JB)D3T2#IC`ibu#yi!uK7W2!j|Z>~RaJ*&XXy#ytIk2DIp
z5?Qd^s90_?ILjU#>ZWk5HXts}grg_!Gmgm!d?e<PC~eDJ`^;k<9pBwEtRZ90pBYRH
zr3Ef+CHDEOF133^Q}voowOX+u5LlN`IJH4CHOliZ?(b5lFH}t6qj2E8;t>LGR7xEP
zvTCrslV~94ym5_i<5oqy(@@?wN}lIdtiY8=?|Ng!XeYnly`@9wCGx2S$3x|0x8T2h
zz7A85Vb2>s44rKpI_4Y7_Pnd2^mYj2%^jM|Du>u4`^Psda^JIP%*DK6bo`Vf&f{!%
zDTYCwF5Nhi=)QhU2$@eQv&ZzxsX+Hl+gP6kW|e!n9IU2>Vh~cioI{>4WvR}t*4Hpz
z%5z?HjLGoka}Q3AbX9AkY|Yjf^M(>@tBAI9JO5pDCQu0R3Nns>)LC#vB2p96C*?K?
zvX$un$sBDx$1=+NNj*@Oa@u*b@O*XBr_sg@8sCUq-|LK!MUmC)epklrv}5O_^<{NP
zX16|c$9Wtbks3y7geI^tF5oRZJu;<AG~5!X7b-Hose24+z1b3X{`Nh1zT%@AoU%>v
zwkW8j+8Ccxo9stEDOT_Go&j%$KCgVO7pm+^%PKEPBZqbMw%s@732XS{cX+wCSjH1s
z<N2eX3UI%~%NcIGj+WJ1-MLJ%y-DgbEUi$rLe5CSFuv7!tR>5)bc=g**<^NNsroY`
z?}fHHlg<QL0w)w?&3&%!s29Is7#D;{ac0DC<z+8iMC9rd$M|XX4}upw{OS!0afhhy
z25U;3R8OPS$P|$sRuCBSNBRV1Y;9&!rl$(VF575rTy8APLiIuy->u^B?2r{^^gQ&j
zbF~T((>|Yg&C5WKL8DCnl1}Z3!YHFW2S1|;Xr0`Uz-;=FxEwYc4QpeAtnm7^f~uzX
zl;xA!?>MLR?tL80Iudm;mi{!ewL91KhG7Hsa-XepKi<2mc6%zf0GwtbfJ1Zf-<@Xu
z#|XWDzv|04t)&9Id!UxAAkN{t5qC%%8-WV3i;3duS19%m2||Y{!3pR1=g|zQYAMqc
zff)_2nj-O4wfxy;UNM?|Uieo!^J$A*uDe>@V(N<I!snfp?W5N{&W1iY`Z(Zv1XDHj
z-7DTH_m4n%W?oI+)+wQ>KH;KS;Y_dtE8${p>RdcrW;=2*fj4~d?OG0l-(g?ik}vz}
z)5-wDppVts>K-=|@{=!53?=8)Jw#<?>RGpS_FWpbwtn}{v!JEJ$q-sr7F6&OPBuI#
zuVNFM<b6fa@+xc7C?{)>Pte79XgEu!P&qRq8u4J>r%$l-IQ00Lin90(_KtC)aR_de
zxN=pY2<1b29_^AG2WJIGmmX4rv3$!`l15{e(H!1^+x9voZ6;882YAE12q7+lgy+>)
zj|s0CyzI9=Mo!R}&LXB`&DYpZ7c?0r(&KNV+~TULd0y^e;G{KVR4nL0KvU9mr8&$^
zxrM-9<BULp1ie>P8zE`J?aZ(iB~Rz<{vvnk2HaZU#K$aVFfYnbAXVUOLU#A<S+lSO
z$`#MSd^_uYn>s5JvS%+<hPj+ns1{FB7u^@{5W2OSA;(lkBGQzyEY0Ha8n~H5Sh>26
zi$sNuPY}dLGUS$0g&;oBqhzv2dY`l3@6Na403M!Sh${B|7(y|_cONa;6BrtUe@ZzV
z7SThtHT8k?Rwc)(Z}@BP#H@JJHz&GR&M=E@P9KJ89yQKmRh&I~%vbL1L-K3E>7>CH
z)Y!=jXVb1iPrAoAZZ3}3wU*5~nrV!ZjL5zqJ<@NwjHCZC>68Cc<{&E_#<Qr;)a#5U
z-N8nc#TSx%6ok}vq^}6b$S`sUhAFXGdJN6bT-e6mKD4yfjCU=BSBz3h%adGPrv9<7
zhGGH^$AzxLlC%{f_yLj)(U<<!JP#W$VM-E%bq7P!;7QpWxeRrcbhFE$nnX7l=vHZ#
zsWZIFP3)oOH0w;bQY>S;E*jOdjtg<E19=)ZmgJ~#+wPiPod(%4MWJtYgaNl#MF68#
ziob0|PDpDrQ<pz6`J5g5Ozn^m;PmeJA(q!m_WBWYI2?j>?uKN|l`P8sjz&Qf7a^z9
z;{3-8T+H4y99_zc;JYIvs!sk$G<SQ;H#Zk<G@5RNMQ_4+lLlR)NF^9fAPYY=`c7y=
z{B4l8bd1+ODEeDYwbGRq1?f7&J%sF$Xxuex2!Tg$VR(o&gqAvnLUvLYc0L1wR(>}`
z??mt*Mm9Z@glCZb!X?!xXD-21sFDPEpZOK{sbQseQ$%6~b;n+*z0hRoR}0Pe>B|#t
z$XrVcXv8M|q*Z8MY&r9J0A=d^1bHpjrUXu)qEj~$%%=gZp`^~%O*lzxUquG^p6;n;
z^(3HL+hx4gRP?4N*b2p9!^|2~rcw3!9nQj$vmZusbXYz_x^AVc`3qBFm(jS9ueU5h
z^AnNnbswfQ2Jq=W=T+p-V|nQco@<U0PTc0<;7^LTft>bOAH$pLQZ+BKH8E$iM>IDz
z3|wc?QP`yI=X5YTlp8h}%<Zy)pZp01CF`uRauFaMQI&q5+qHc-F3Cps<+{X=y{3(Q
zt#A~eZw^4;3cu4g*yr$fD;$t%)a+Q93qyhwt-JOrDe>p6{Deq?S0QD$Ug>i<VsT{Z
zNZf&Nn9Yp98S`@4qUbBQMy*q$-3E>h1SdPZg237Rl{S~=Ha4~-ckMoIWMn+X@@`V6
z#HHZj>MQbt$Qqp*9T(cjc^lxZ7UO(>PwzF-qEr(wo`vaulxdall|KP`7p4gd`2<O(
z1N8n;6?Wd&gsWVF75@Ydo$ft|Er-=z?zxs6zd+i?P?cAPVQw{Z$*(@N^lO#~C|q(&
z@$`AIK-3^SBuU&OMr__YtzFdNu>3&Jy=#sAes*0diLB(U$Nx46<srT4sk6o6P7=%O
zhw>VQvP)8idSs8^zaV91xw*O-JMH=)FoJshRob|_)O)ojtfP))WHCr(;*2;VMQ75^
zfN@a^f#o<|*9X;3IcGodLUz-3i~FAu+zI4c5h+nW^h_!^)b*B_xw-l4O$TB(ixaqW
ziMoa%i=BeS<-F45kMO;Tw|FWa`G<G3-xOKhWGvmJx|VXIPEX-V)szfTbyZZ|3z?)U
zc^%hH(1XG2nj5Naz~yvoz^R-hpmMmJmJFYgn!JD=!p+QH0Pr}?k8nVkTAK0y|1bF6
zoe&NVW={Km=KK1S1JaHkWoKKUQ|~l%hNO0dr#zWHmgZJznoEwWm3drKdVX1U6#L5#
zQWoapXYd5EER}9eKX%8Crr;J*BU)>2c!SuOA3CbowPhF6csf1|&qqugUrj;UgGHm|
z;j^yoH?MZhR;AYOW_XW2Lg2j%%ejL)B@*bUMD`g<#Z${1+fa57r7X<h|8nBv8r>82
zcqY-cfPnK%Y^3@s<qw39I3*A%a&Yr;y*!1LsA=td!6Lk^l}EQY)stIuf#mjU!CHAN
z%_7ndcshx}XztT;N<<N+cZw*^DxGG5)9IEDE8Q*-2_bA%d-<SA8Na9gb9H8>zRner
zt)bBToYCph6Jv*W+&t?&9FG4(Iu<!o(3LVe*X2KV9iK4%?pBR-1s<PB2~1fo>2w46
z4B#AcFy_^J@f*6<{>CN}Sj969*DYV*e7<61U>GoN{tz!Do90+jApFueVY_IW(MQF;
zl?4yA_(MvMwN&pWKVyg{3uU_+y6RMdot2vu%mC?st=N0pf-~JZXE?3JFf)j<{1xsU
z`2ephz)#HzsW<ft&J}W0BCk)zh`<=a+Z~$D&vD5)aiqR=aJA>EP!inHm2hI(V(~@W
zY7gGU-lO52cHD&SY)>QHgy$=>^X%u0TQZfCizro!*weMyvZC=;MWOawdAx~`3C*W`
z%^#^$uRP;gyqEE0<(i8xcQY$oc+6mY#z{-XFxsO1(cN8<M}(uexsybCZ<}?BPuLwP
z^{{b#pPOqjey#%Qd{&nv!!bLOaw*P)s{IHOW+JvNEi{WIa(FPm7xx-IfrDgNm#{js
zM)FIJsCh$*b(5CM>Y)>p;^q9|5bk`Z*p|c!?(rErw#y;yT(%@c7trQBv6cj)$3>pI
z>tz+;IB?D=aQV=s(n)o63*yn8dX1m7#Z4G{%fF@K2o5n3jxR~mU?nzMi#;}8e#(>{
zy{Z4!AI)jZ8TY;nq1aq}tq;~=zzoTv)er06oeX3;9{uP{LWR*2%9cmE%S^`~!BW>X
zn3PZFTf3g*dG68~^1*q@#^Ge(_8puPEFLD8OS|0b2a{5e=N4S%;~f3tC>F6UxK#v9
z)N-#Mv8=ePCh1KsUKD1A8jF<m)s1*e(Ok^!*@9Xtd%5^n@@B7YEsvFcvetT!kL);|
zvZ=Rt08Glh&xQ14c~@xfh?|gsRgH|<5tr$_5)L{4e+G*M4fJTEGsd9rqlF6u-?!i&
zz1&M^b0xcHLHgk+^DNBwfpX5x!jGLySKeYx>_%$MPf|_yCN9oy%*@um6D{w*2|4GY
zb}gafrSC+f=b*W{)!a!fqwZ9)K>fk=i4qf!4M?0v{CMNTo2A9}mQzV=%3UT&i{3{W
z>ulG#M!K7%jPf6Mjff9BMslgQq3zIogY);Cv3v;&b#;^=sh#(Bn%W)H*bHNaLwdpq
z85%fUTUJJNjYO_426T2TBj<?NSs;23Ek0pi`55pxf$Vc%b@&Y?;cmh?dMI_>0D{6t
zw&S_HZ|C?pI_2q(9Fas&@uJs6nVX;P*5K#6p|#)_(8PM-{L(;2wl`ma{ZAd5gA)?y
z>0GSLoK<*FwW+G8@-M3vcffg7I(qm7lzF)n`Q9iCv<vWIg-udr&$6Fj<FG)__)$*P
zQ^aMTptP8LKS(=EGfm@w4RpEKhbV9WC&9qo%Gydx9UxiX0^YYzBv|u%Z$U6!@P0Im
zyWvV(m(%xve^3U7XyCWs0@{xg`24NshRdia$;)YK@x$d00t21?m#_!kGu#Sv_P_-2
z*GUD;ntm69^-GNX;o-oDz@@kEBC7rvaetsWh)eS|Hr8HBy?z$`>p*mn7=|CjlpG{x
z&r0n<qKJPGH4ljTR{Fos4%ZKnX@ONLDDp1{-Gh>}XLWZ!>=lynUr7D`6n`7a_ZgT<
zm!i;&?Fb0Q2QmqmCHfZ7ex=_tU~(7b)L?RIvPyEAU=gLIZ-VTAA~WR00yKyTXg^(G
zqWLZJs!FnQYMOH3*fN&Tn(IKMLf{Ki?pRo8zZJ6YVyj)y0^)-sR}2-)%mI(Aw2AgT
zbbp1T{qB(OSNJd0cVBH^tI>HR(q+#*lmi@LWe*rZz&M2h1L_=50uZ1e*n#E*`6?aw
zj`ka&JpceRGe@}Ey1)Q~O}0qHRg4K_u>4e1arvJ7Q9!=t5AuzG`n=a-f0}{+ln<V+
z1M4)Dhm5O>CE#zu$`oVn44eS&T?N*wz~t~E&<X{ANWdYcze&LUZVFg>oQDBrB_MSg
z_yVrQehWbD0xHX|v-hpselAu;O7s;P*!uAT`dr~}Lie=tknaGoiU?;*8Cwgala-65
zosOB4mATbdXJFujzgA4?UkCKE093A1KM?W&Pw>A?IACqg1z~IZYkdP70EeCfjii(n
z3k%ax?4|rY(87N&_vhsyVK1zp@uils|B%`(V4e3%sj5f|i(eIhiSg-fHK1Pb0-mS^
zeh?WA7#{hhNci5e;?n*iVy|)iJiR>|8{TN3!=VBC2dN)~^ISSW_(g<^rHr$)nVrdA
z39BMa5w<WZpdDM8xMIAifHkR~C~eIOXmNBeGe5HQ{*?9eTxf6=^ilwlO##W6?s-p_
ziAD!V2Dem2z&#z1pPw^M;L{DS0I5a*rL{K;_!`iDSmp;X4zApXTQ1S<y;yz%G#{Wg
ze+y_oQHukFeo-s1`Zu?-a0N^#S|NX-U$7hVuLQJTzRm9eKRPuB>l5q+5F@)4b%5->
zA^-P20l_e^S2PTa&HE2wf3jf)#)2ITVXzndeuMpPo8}kphQKhegB%QO+yBpDpgkcl
z1nlPp14#+^bIA7__h16pMFECzKJ3p4`;Rf$gnr%{!5#oG42AH&X8hV8061%4W91ku
z`OW_hyI+uBOqYXkVC&BqoKWmv;|{O|4d#Nay<)gkxBr^^N48(VDF7Sj#H1i3>9138
zkhxAU7;M)I18&d!Yw!V9zQA0tp(G4<8U5GX{YoYCQ?p56FxcD-2FwO5fqyx@__=$L
zeK6Sg3>XQv)qz1?zW-k$_j`-)tf+yRU_%fXrenc>$^70d1Q-W?T#vy;6#Y-Q-<2)+
z5i<sy_VBO4zb#epTUHG1aQR=;4u07RE@AK^KMdNu>Tl6MA7j9m&oBhRXTKr*$3gec
z3E;zX457RGZwUvD$l&8e42Qb^cbq>zYy@ive8`2N9vk=#6+AQlZZ7qk=?(ap1q0n0
z{B9Fte-{Gi-Tvax1)M+d1}Fyg@9X~sh1m|hsDcZuYOnxriBPN;z)q3<=-yBN2iM6V
A?*IS*

literal 0
HcmV?d00001

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 000000000..346d645fd
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/mvnw b/mvnw
new file mode 100755
index 000000000..8d937f4c1
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,308 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.2.0
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "$(uname)" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
+      else
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=$(java-config --jre-home)
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
+    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=$(which readlink)
+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
+      if $darwin ; then
+        javaHome="$(dirname "\"$javaExecutable\"")"
+        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
+      else
+        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
+      fi
+      javaHome="$(dirname "\"$javaExecutable\"")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=$(cd "$wdir/.." || exit 1; pwd)
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    # Remove \r in case we run on Windows within Git Bash
+    # and check out the repository with auto CRLF management
+    # enabled. Otherwise, we may read lines that are delimited with
+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+    # splitting rules.
+    tr -s '\r\n' ' ' < "$1"
+  fi
+}
+
+log() {
+  if [ "$MVNW_VERBOSE" = true ]; then
+    printf '%s\n' "$1"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+    log "Found $wrapperJarPath"
+else
+    log "Couldn't find $wrapperJarPath, downloading it ..."
+
+    if [ -n "$MVNW_REPOURL" ]; then
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    else
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    fi
+    while IFS="=" read -r key value; do
+      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
+      safeValue=$(echo "$value" | tr -d '\r')
+      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
+      esac
+    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+    log "Downloading from: $wrapperUrl"
+
+    if $cygwin; then
+      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+    fi
+
+    if command -v wget > /dev/null; then
+        log "Found wget ... using wget"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        log "Found curl ... using curl"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+        else
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+        fi
+    else
+        log "Falling back to using Java to download"
+        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaSource=$(cygpath --path --windows "$javaSource")
+          javaClass=$(cygpath --path --windows "$javaClass")
+        fi
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                log " - Compiling MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/javac" "$javaSource")
+            fi
+            if [ -e "$javaClass" ]; then
+                log " - Running MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
+  esac
+done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+  wrapperSha256Result=false
+  if command -v sha256sum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  elif command -v shasum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
+    exit 1
+  fi
+  if [ $wrapperSha256Result = false ]; then
+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+# shellcheck disable=SC2086 # safe args
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 000000000..f80fbad3e
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,205 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.2.0
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
+SET WRAPPER_SHA_256_SUM=""
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
+)
+IF NOT %WRAPPER_SHA_256_SUM%=="" (
+    powershell -Command "&{"^
+       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
+       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
+       "  Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
+       "  Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
+       "  Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
+       "  exit 1;"^
+       "}"^
+       "}"
+    if ERRORLEVEL 1 goto error
+)
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%

From 518259d1a0cc266f4dd1700d65717ef35ce97f4a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 9 Jan 2024 00:21:23 +0100
Subject: [PATCH 214/299] RAT-342: Enable maven wrapper on ASF Jenkins

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0c6b982d0..dc08c1ce3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,14 +78,14 @@ pipeline {
         stage('Build Parent-pom') {
             steps {
                 echo 'Building parent pom only'
-                sh 'mvn clean install -N -e -B'
+                sh './mvnw clean install -N -e -B'
             }
         }
 
         stage('Print available updates') {
             steps {
                 echo 'Show available plugin and dependency updates'
-                sh 'mvn clean versions:display-dependency-updates versions:display-plugin-updates enforcer:display-info -U -B'
+                sh './mvnw clean versions:display-dependency-updates versions:display-plugin-updates -U -B'
             }
         }
 
@@ -93,7 +93,7 @@ pipeline {
             steps {
                 echo 'Building the whole project'
                 // clean package -B -U -e -fae -V for making sure it just builds
-                sh 'mvn -B -U -V clean deploy'
+                sh './mvnw -B -U -V clean deploy'
             }
             post {
                 always {
@@ -106,7 +106,7 @@ pipeline {
         stage('Ensure site build works') {
             steps {
                 echo 'Verify site build is okay ....'
-                sh 'mvn site:site'
+                sh './mvnw site:site'
             }
         }
     }

From 21f0004bce8c1c88dc2d1b9566a5c4e70ba16f1a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 9 Jan 2024 00:21:58 +0100
Subject: [PATCH 215/299] RAT-342: Enable maven wrapper on GHA

---
 .github/workflows/maven.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b221a34ba..e3a24dccc 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -58,13 +58,13 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn -e -B -V -ntp clean install
+        run: ./mvnw -e -B -V -ntp clean install
         
       - name: Build site
-        run: mvn -e -B -V -ntp site:site
+        run: ./mvnw -e -B -V -ntp site:site
 
       - name: Generate javadoc
-        run: mvn -e -B -V -ntp javadoc:javadoc 
+        run: ./mvnw -e -B -V -ntp javadoc:javadoc 
 
 # as of 20220505:  Invalid workflow file
 # The workflow is not valid. .github/workflows/maven.yml (Line: 55, Col: 1): Unexpected value 'notifications'

From c794a93a2b9a48f9ca3279f3dc543dc305d4dba2 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 9 Jan 2024 00:34:11 +0100
Subject: [PATCH 216/299] RAT-342: Use maven wrapper with Maven v3.9.6

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e104ef1cf..b6a3582ad 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -58,6 +58,9 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     -->
     <release version="0.17-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-342" type="add" dev="pottlinger">
+        Use Maven wrapper (with version 3.9.6) for reproducable local builds and on ASF Jenkins and Github Actions.
+      </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.17.
       </action>

From 4ee5aebf04d31cb3d967d534c364ae4295451041 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 00:43:30 +0000
Subject: [PATCH 217/299] Bump org.slf4j:slf4j-simple from 2.0.10 to 2.0.11

Bumps org.slf4j:slf4j-simple from 2.0.10 to 2.0.11.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index cbac5333d..4213fa3c7 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -297,7 +297,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.10</version>
+      <version>2.0.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 2f228609828d954a4532a574ca03ce570cebbb91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 00:25:40 +0000
Subject: [PATCH 218/299] Bump org.apache.maven.plugins:maven-surefire-plugin
 from 3.2.3 to 3.2.5

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3d9045114..a9be48832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,7 +394,7 @@ agnostic home for software distribution comprehension and audit tools.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.2.3</version>
+          <version>3.2.5</version>
           <configuration>
             <forkCount>1</forkCount>
             <argLine>-Dfile.encoding=ISO-8859-1</argLine>

From 71030eccf6c96a42170b767ef31b8b519f473f35 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 10 Jan 2024 10:39:30 +0100
Subject: [PATCH 219/299] initial code

---
 .../org/apache/rat/mp/AbstractRatMojo.java    |  32 +++++-
 .../site/apt/examples/custom-license.apt.vm   |   4 +
 apache-rat-plugin/src/site/apt/usage.apt.vm   |   2 +-
 .../org/apache/rat/mp/RatCheckMojoTest.java   |  19 ++++
 .../src/test/resources/unit/it6/pom.xml       | 104 ++++++++++++++++++
 .../src/test/resources/unit/it6/src.txt       |   2 +
 6 files changed, 161 insertions(+), 2 deletions(-)
 create mode 100644 apache-rat-plugin/src/test/resources/unit/it6/pom.xml
 create mode 100644 apache-rat-plugin/src/test/resources/unit/it6/src.txt

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 5f02b1175..3ea4796f4 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -39,6 +39,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.SortedSet;
 import java.util.function.Consumer;
 
@@ -51,6 +52,7 @@
 import org.apache.rat.ConfigurationException;
 import org.apache.rat.Defaults;
 import org.apache.rat.ReportConfiguration;
+import org.apache.rat.analysis.license.DeprecatedConfig;
 import org.apache.rat.config.SourceCodeManagementSystems;
 import org.apache.rat.configuration.Format;
 import org.apache.rat.configuration.LicenseReader;
@@ -106,6 +108,9 @@ public abstract class AbstractRatMojo extends AbstractMojo {
     @Parameter(property = "rat.approvedFile")
     private String approvedLicenseFile;
 
+    @Parameter
+    private DeprecatedConfig[] deprecatedConfigs;
+    
     @Parameter
     private License[] licenses;
     
@@ -252,9 +257,32 @@ protected Defaults.Builder getDefaultsBuilder() {
         return result;
     }
 
+    @Deprecated // remove this for version 1.0
+    private void reportDeprecatedProcessing()
+    {
+        if (deprecatedConfigs != null) {
+            Log log = getLog();
+            log.warn("Configuration uses deprecated configuration.  Please upgrade to v0.16 configuration options");
+        }
+    }
+    @Deprecated // remove this for version 1.0
+    private void processDeprecatedFamilies(Consumer<ILicenseFamily> consumer) {
+        if (deprecatedConfigs != null) {
+            Arrays.stream(deprecatedConfigs).map(DeprecatedConfig::getLicenseFamily).filter(Objects::nonNull).forEach(consumer);
+        }
+    }
+    
+    @Deprecated // remove this for version 1.0
+    private void processDeprecatedLicenses(SortedSet<ILicenseFamily> families, Consumer<ILicense> consumer) {
+        if (deprecatedConfigs != null) {
+            Arrays.stream(deprecatedConfigs).map(DeprecatedConfig::getLicense).filter(Objects::nonNull)
+            .map(x -> x.build(families)).forEach(consumer);
+        }
+    }
+    
     protected ReportConfiguration getConfiguration() throws MojoExecutionException {
-        
         ReportConfiguration config = new ReportConfiguration();
+        reportDeprecatedProcessing();
         if (addDefaultLicenses) {
             config.setFrom(getDefaultsBuilder().build());
         }
@@ -288,6 +316,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     };
 
             Consumer<ILicenseFamily> process = logger.andThen(config::addFamily);
+            processDeprecatedFamilies(process);
             Arrays.stream(families).map(Family::build).forEach(process);
         }
 
@@ -310,6 +339,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
 
             Consumer<ILicense> process = logger.andThen(config::addLicense).andThen(addApproved);
             SortedSet<ILicenseFamily> families = config.getLicenseFamilies(LicenseFilter.all);
+            processDeprecatedLicenses(families, process);
             Arrays.stream(licenses).map(x -> x.build(families)).forEach(process);
         }
 
diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index 21814ad25..8f13163d8 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -23,6 +23,10 @@ Custom License Matchers
   some typical licenses. However, they will not always be sufficient.
   In such cases, you may use a custom license matcher.
 
+  The simplest way to create a license check is to create an XML file describing
+  the new license and add it to the processing with the <<additionalLicenseFiles>
+  option.  Create the file as described  
+  
   A custom license matcher is an implementation of
   <<<org.apache.rat.analysis.IHeaderMatcher>>>. Suggest that your
   source files must contain a header like the following:
diff --git a/apache-rat-plugin/src/site/apt/usage.apt.vm b/apache-rat-plugin/src/site/apt/usage.apt.vm
index 710f9bbb7..497a6ccf4 100644
--- a/apache-rat-plugin/src/site/apt/usage.apt.vm
+++ b/apache-rat-plugin/src/site/apt/usage.apt.vm
@@ -21,7 +21,7 @@ Usage
 
   To use the plugin, you've got two options: First of all, it can
   create a simple text file, called <<<target/rat.txt>>>, with the
-  plugins output. This is done by invoking the <<<apache-rat:check>>> goal.
+  plugin's output. This is done by invoking the <<<apache-rat:check>>> goal.
 
   You may also add a report to the generated site. This is your
   second option.
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index bac6a379c..2bcaf3a39 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -190,6 +190,25 @@ public void testIt5() throws Exception {
 
         ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
     }
+    
+    /**
+     * Runs a check, which should expose no problems.
+     *
+     * @throws Exception The test failed.
+     */
+    public void testIt6() throws Exception {
+
+        final RatCheckMojo mojo = newRatCheckMojo("it6");
+        final File ratTxtFile = getRatTxtFile(mojo);
+        final String[] expected = { " AL +\\Q" + getDir(mojo) + "pom.xml\\E", "Notes: 0", "Binaries: 0", "Archives: 0",
+                "Standards: 1$", "Apache Licensed: 1$", "Generated Documents: 0", "^0 Unknown Licenses" };
+
+        ReportConfiguration config = mojo.getConfiguration();
+        ReportConfigurationTest.validateDefault(config);
+
+        mojo.execute();
+        ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
+    }
 
     /**
      * Tests verifying gitignore parsing
diff --git a/apache-rat-plugin/src/test/resources/unit/it6/pom.xml b/apache-rat-plugin/src/test/resources/unit/it6/pom.xml
new file mode 100644
index 000000000..73496c267
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/it6/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.rat.test</groupId>
+  <artifactId>it2</artifactId>
+  <version>1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>@pom.version@</version>
+        <configuration>
+						<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
+						<licenses>
+							<license><family>MIT</family> <!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense" -->
+								<!-- <licenseFamilyCategory>MIT</licenseFamilyCategory>
+								<licenseFamilyName>MIT</licenseFamilyName> -->
+								<notes></notes>
+								<!-- <patterns>
+									<pattern>Licensed MIT</pattern>
+									<pattern>Licensed under MIT</pattern>
+									<pattern>Licensed under the MIT license</pattern>
+									<pattern>MIT/GPL2 Licensed</pattern>
+									<pattern>licensed under the MIT and GPL</pattern>
+									<pattern>MIT license</pattern> 
+								</patterns> -->
+								<any>
+									<text>Licensed MIT</text>
+									<text>Licensed under MIT</text>
+									<text>Licensed under the MIT license</text>
+									<text>MIT/GPL2 Licensed</text>
+									<text>licensed under the MIT and GPL</text>
+									<text>MIT license</text>
+								</any>
+							</license>
+							<license><family>BSD</family><!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">--> 
+								<!-- <licenseFamilyCategory>BSD</licenseFamilyCategory>
+								<licenseFamilyName>BSD</licenseFamilyName> -->
+								<notes></notes>
+<!--								<patterns>-->
+<!--									<pattern>BSD-style license</pattern>-->
+<!--								</patterns>-->
+<text>BSD-style license</text>
+							</license>
+							<license><family>CC BY</family> <!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> -->
+								<!-- <licenseFamilyCategory>Creative Commons Attribution</licenseFamilyCategory> -->
+								<!-- <licenseFamilyName>CC BY</licenseFamilyName> -->
+								<notes></notes>
+								<!-- <patterns>
+									<pattern>creativecommons.org/licenses/by/4.0</pattern>
+								</patterns> -->
+								<text>creativecommons.org/licenses/by/4.0</text>
+							</license>
+						</licenses>
+						<families>
+								<family><id>MIT</id><name>MIT</name></family>
+								<family><id>BSD</id><name>BSD</name></family>
+								<family><id>CC BY</id><name>CC BY</name></family>
+						</families>
+						<!-- <licenseFamilies> 
+							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+								<familyName>MIT</familyName>
+							</licenseFamily>
+							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+								<familyName>BSD</familyName>
+							</licenseFamily>
+							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+								<familyName>CC BY</familyName>
+							</licenseFamily>
+						</licenseFamilies> --> 
+						<excludes>
+							<exclude>**/*.mp3</exclude>
+							<exclude>**/localhost.jks</exclude>
+							<exclude>**/node_modules/**</exclude>
+							<exclude>**/package-lock.json</exclude>
+							<exclude>**/target/**</exclude>
+							<exclude>**/.project</exclude>
+							<exclude>**/.classpath</exclude>
+							<exclude>**/.settings/**</exclude>
+							<exclude>.gitattributes</exclude>
+						</excludes>
+
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/apache-rat-plugin/src/test/resources/unit/it6/src.txt b/apache-rat-plugin/src/test/resources/unit/it6/src.txt
new file mode 100644
index 000000000..72d9dffba
--- /dev/null
+++ b/apache-rat-plugin/src/test/resources/unit/it6/src.txt
@@ -0,0 +1,2 @@
+This is a text file, which intentionally has no Apache License Header.
+The Rat plugin should detect it.

From e5c759a3f2df3cab8b46bd05c5dfc0f0ce2b0cef Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 10 Jan 2024 12:56:53 +0100
Subject: [PATCH 220/299] tested reinstated code

---
 .../apache/rat/api/domain/LicenseFamily.java  |  1 +
 .../rat/api/domain/LicenseFamilyBuilder.java  |  1 +
 .../rat/api/domain/RatLicenseFamily.java      |  1 +
 .../rat/analysis/license/BaseLicense.java     | 65 +++++++++++++++
 .../analysis/license/DeprecatedConfig.java    | 13 +++
 .../license/FullTextMatchingLicense.java      | 64 +++++++++++++++
 .../license/SimplePatternBasedLicense.java    | 74 +++++++++++++++++
 .../rat/license/ILicenseFamilyBuilder.java    | 19 ++++-
 .../rat/license/SimpleLicenseFamily.java      | 22 +++--
 .../org/apache/rat/mp/AbstractRatMojo.java    | 80 ++++++++++++++-----
 .../org/apache/rat/mp/RatCheckMojoTest.java   | 26 ++++--
 .../resources/unit/{it6 => RAT-343}/pom.xml   | 53 +++++-------
 .../src/test/resources/unit/it6/src.txt       |  2 -
 13 files changed, 349 insertions(+), 72 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
 rename apache-rat-plugin/src/test/resources/unit/{it6 => RAT-343}/pom.xml (64%)
 delete mode 100644 apache-rat-plugin/src/test/resources/unit/it6/src.txt

diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java
index 187b7aa83..c216d6a5b 100644
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java
+++ b/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java
@@ -27,6 +27,7 @@
  * &lt;ORGANIZATION&gt; and &lt;YEAR&gt; parameters.
  * 
  */
+@Deprecated
 public final class LicenseFamily {
 
     /**
diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java
index 9d58a968b..38099e317 100644
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java
+++ b/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java
@@ -21,6 +21,7 @@
 /**
  * Builds {@link LicenseFamily} instances.
  */
+@Deprecated
 public final class LicenseFamilyBuilder {
 
     /**
diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
index b1afb1abf..a596f8ee8 100644
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
+++ b/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
@@ -23,6 +23,7 @@
 /**
  * Enumerates standard license families known to Rat.
  */
+@Deprecated
 public enum RatLicenseFamily {
 
 	/**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
new file mode 100644
index 000000000..90809d3ab
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */ 
+package org.apache.rat.analysis.license;
+
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.license.ILicenseFamily;
+
+@Deprecated // remove in v1.0
+public abstract class BaseLicense implements DeprecatedConfig {
+    private String licenseFamilyCategory;
+    private String licenseFamilyName;
+    private String notes;
+
+    public BaseLicense() {
+    }
+
+    public String getLicenseFamilyCategory() {
+        return licenseFamilyCategory;
+    }
+
+    public void setLicenseFamilyCategory(String pDocumentCategory) {
+        licenseFamilyCategory = pDocumentCategory;
+    }
+
+    public String getLicenseFamilyName() {
+        return licenseFamilyName;
+    }
+
+    public void setLicenseFamilyName(String pLicenseFamilyCategory) {
+        licenseFamilyName = pLicenseFamilyCategory;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String pNotes) {
+        notes = pNotes;
+    }
+    
+    @Override
+    final public ILicenseFamily getLicenseFamily() {
+        return ILicenseFamily.builder()
+        .setLicenseFamilyCategory(licenseFamilyCategory)
+        .setLicenseFamilyName(licenseFamilyName)
+        .build();
+    }
+}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
new file mode 100644
index 000000000..7a6e53b11
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
@@ -0,0 +1,13 @@
+package org.apache.rat.analysis.license;
+
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+/**
+ * A temoprary interface for deprecated configuration options.
+ */
+@Deprecated // remove in v1.0
+public interface DeprecatedConfig {
+    ILicense.Builder getLicense();
+    ILicenseFamily getLicenseFamily();
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
new file mode 100644
index 000000000..a05d85fc4
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */ 
+package org.apache.rat.analysis.license;
+
+import java.util.Arrays;
+import java.util.Locale;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.analysis.matchers.FullTextMatcher;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.configuration.builders.AbstractBuilder;
+import org.apache.rat.configuration.builders.AnyBuilder;
+import org.apache.rat.configuration.builders.TextBuilder;
+import org.apache.rat.license.ILicense;
+
+/**
+ * Accumulates all letters and numbers contained inside the header and
+ * compares it to the full text of a given license (after reducing it
+ * to letters and numbers as well).
+ *
+ * <p>The text comparison is case insensitive but assumes only
+ * characters in the US-ASCII charset are being matched.</p>
+ *
+ * @deprecated Use new configuration options
+ */
+@Deprecated // Since 0.16
+public class FullTextMatchingLicense extends BaseLicense {
+
+    private String text;
+
+    public FullTextMatchingLicense() {
+    }
+
+    public final void setFullText(String text) {
+        this.text = text;
+    }
+
+    @Override
+    public ILicense.Builder getLicense() {
+        return ILicense.builder()
+        .setLicenseFamilyCategory(getLicenseFamilyCategory())
+        .setName(getLicenseFamilyName())
+        .setMatcher( new TextBuilder().setText(text) )
+        .setNotes(getNotes());
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
new file mode 100644
index 000000000..094d25760
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */ 
+package org.apache.rat.analysis.license;
+
+import java.util.Arrays;
+
+import org.apache.rat.analysis.IHeaderMatcher;
+import org.apache.rat.analysis.RatHeaderAnalysisException;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.configuration.builders.AbstractBuilder;
+import org.apache.rat.configuration.builders.AnyBuilder;
+import org.apache.rat.configuration.builders.TextBuilder;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+
+
+/**
+ * @since Rat 0.8
+ * @deprecated Use new configuration options
+ */
+@Deprecated // Since 0.16
+public class SimplePatternBasedLicense  extends BaseLicense {
+    private String[] patterns;
+
+
+    public SimplePatternBasedLicense() {
+        
+    }
+
+    
+    public String[] getPatterns() {
+        return patterns;
+    }
+
+    public void setPatterns(String[] pPatterns) {
+        patterns = pPatterns;
+    }
+
+    private AbstractBuilder getMatcher() {
+        if (patterns.length == 1) {
+            return new TextBuilder().setText(patterns[0]);
+        } else {
+            AnyBuilder any = new AnyBuilder();
+            Arrays.stream(patterns).map(s -> new TextBuilder().setText(s)).forEach(b-> any.add(b));
+            return any;
+        }
+    }
+
+    @Override
+    public ILicense.Builder getLicense() {
+        return ILicense.builder()
+        .setLicenseFamilyCategory(getLicenseFamilyCategory())
+        .setName(getLicenseFamilyName())
+        .setMatcher( getMatcher() )
+        .setNotes(getNotes());
+    }
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
index 88b6238d2..84c27cc15 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamilyBuilder.java
@@ -56,6 +56,23 @@ public ILicenseFamily build() {
         if (StringUtils.isBlank(licenseFamilyName)) {
             throw new ConfigurationException("LicenseFamily Name must be specified");
         }
-        return new SimpleLicenseFamily(licenseFamilyCategory, licenseFamilyName);
+        return new ILicenseFamily() { 
+            private final String cat = ILicenseFamily.makeCategory(licenseFamilyCategory);
+            private final String name = licenseFamilyName;
+            @Override
+            public String toString() {
+                return String.format("%s %s", getFamilyCategory(), getFamilyName());
+            }
+
+            @Override
+            public final String getFamilyName() {
+                return name;
+            }
+
+            @Override
+            public String getFamilyCategory() {
+                return cat;
+            }
+        };
     }
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
index a7d8799e2..3e6cd4cf4 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/SimpleLicenseFamily.java
@@ -21,26 +21,32 @@
 /**
  * An implementation of the ILicenseFamily.
  */
-class SimpleLicenseFamily implements ILicenseFamily {
-    private final String familyName;
-    private final String familyCategory;
+@Deprecated // remove in v1.0
+public class SimpleLicenseFamily  {
+    private String familyName;
+    private String familyCategory;
 
-    SimpleLicenseFamily(String familyId, String familyName) {
-        this.familyCategory = ILicenseFamily.makeCategory(familyId);
+    public SimpleLicenseFamily() {}
+
+    public void setFamilyName(String familyName) {
         this.familyName = familyName;
     }
-
+    
+    public void setFamilyCategory(String familyCategory) {
+        this.familyCategory = familyCategory;
+    }
+    
     @Override
     public String toString() {
         return String.format("%s %s", getFamilyCategory(), getFamilyName());
     }
 
-    @Override
+
     public final String getFamilyName() {
         return familyName;
     }
 
-    @Override
+
     public String getFamilyCategory() {
         return familyCategory;
     }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 3ea4796f4..8c54a2024 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -42,6 +42,8 @@
 import java.util.Objects;
 import java.util.SortedSet;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.AbstractMojo;
@@ -60,6 +62,7 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
+import org.apache.rat.license.SimpleLicenseFamily;
 import org.apache.rat.mp.util.ScmIgnoreParser;
 import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
 import org.apache.rat.mp.util.ignore.IgnoreMatcher;
@@ -107,12 +110,23 @@ public abstract class AbstractRatMojo extends AbstractMojo {
 
     @Parameter(property = "rat.approvedFile")
     private String approvedLicenseFile;
-
+    
+    /**
+     * Specifies the license families to accept.
+     *
+     * @since 0.8
+     * @deprecated
+     */
+    @Deprecated // remove in v1.0
     @Parameter
-    private DeprecatedConfig[] deprecatedConfigs;
+    private SimpleLicenseFamily[] licenseFamilies;
     
+    /**
+     * This is an object to accept both License of DeprecatedConfig objects.
+     */
+    @Deprecated // convert this to an org.apache.rat.mp.License object in v1.0
     @Parameter
-    private License[] licenses;
+    private Object[] licenses;
     
     @Parameter
     private Family[] families;
@@ -256,27 +270,46 @@ protected Defaults.Builder getDefaultsBuilder() {
         }
         return result;
     }
+    
+    @Deprecated // remove this for version 1.0
+    private Stream<License> getLicenses() {
+        if (licenses == null) {
+            return Stream.empty();
+        }
+        return Arrays.stream(licenses).filter( s -> {return s instanceof License;}).map(License.class::cast);
+    }
 
     @Deprecated // remove this for version 1.0
-    private void reportDeprecatedProcessing()
-    {
-        if (deprecatedConfigs != null) {
-            Log log = getLog();
-            log.warn("Configuration uses deprecated configuration.  Please upgrade to v0.16 configuration options");
+    private Stream<DeprecatedConfig> getDeprecatedConfigs() {
+        if (licenses == null) {
+            return Stream.empty();
         }
+        return Arrays.stream(licenses).filter( s -> {return s instanceof DeprecatedConfig;}).map(DeprecatedConfig.class::cast);
     }
+    
     @Deprecated // remove this for version 1.0
-    private void processDeprecatedFamilies(Consumer<ILicenseFamily> consumer) {
-        if (deprecatedConfigs != null) {
-            Arrays.stream(deprecatedConfigs).map(DeprecatedConfig::getLicenseFamily).filter(Objects::nonNull).forEach(consumer);
+    private void reportDeprecatedProcessing()
+    {
+        if (getDeprecatedConfigs().findAny().isPresent()) {
+            Log log = getLog();
+            log.warn("Configuration uses deprecated configuration.  Please upgrade to v0.17 configuration options");
         }
     }
     
     @Deprecated // remove this for version 1.0
-    private void processDeprecatedLicenses(SortedSet<ILicenseFamily> families, Consumer<ILicense> consumer) {
-        if (deprecatedConfigs != null) {
-            Arrays.stream(deprecatedConfigs).map(DeprecatedConfig::getLicense).filter(Objects::nonNull)
-            .map(x -> x.build(families)).forEach(consumer);
+    private void processLicenseFamilies(ReportConfiguration config) {
+        List<ILicenseFamily> families = getDeprecatedConfigs().map(DeprecatedConfig::getLicenseFamily).filter(Objects::nonNull).collect(Collectors.toList());
+        if (licenseFamilies != null) {
+            for (SimpleLicenseFamily slf : licenseFamilies) {
+                if (StringUtils.isBlank(slf.getFamilyCategory())) {
+                    families.stream().filter( f -> f.getFamilyName().equalsIgnoreCase(slf.getFamilyName())).findFirst()
+                    .ifPresent(config::addApprovedLicenseCategory);
+                } else {
+                    config.addApprovedLicenseCategory(ILicenseFamily.builder().setLicenseFamilyCategory(slf.getFamilyCategory())
+                    .setLicenseFamilyName(StringUtils.defaultIfBlank(slf.getFamilyName(), slf.getFamilyCategory()))
+                    .build());
+                }
+            }
         }
     }
     
@@ -306,7 +339,7 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                 }
             }
         }
-        if (families != null) {
+        if (families != null || getDeprecatedConfigs().findAny().isPresent()) {
             Log log = getLog();
             if (log.isDebugEnabled()) {
                 log.debug(String.format("%s license families loaded from pom", families.length));
@@ -316,14 +349,18 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
                     };
 
             Consumer<ILicenseFamily> process = logger.andThen(config::addFamily);
-            processDeprecatedFamilies(process);
-            Arrays.stream(families).map(Family::build).forEach(process);
+            getDeprecatedConfigs().map(DeprecatedConfig::getLicenseFamily).filter(Objects::nonNull).forEach(process);
+            if (families != null)  { // TODO remove if check in v1.0
+                Arrays.stream(families).map(Family::build).forEach(process);
+            }
         }
 
+        processLicenseFamilies(config);
+        
         if (approvedLicenses != null && approvedLicenses.length > 0) {
             Arrays.stream(approvedLicenses).forEach(config::addApprovedLicenseCategory);
         }
-        
+
         if (licenses != null) {
             Log log = getLog();
             if (log.isDebugEnabled()) {
@@ -339,8 +376,9 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
 
             Consumer<ILicense> process = logger.andThen(config::addLicense).andThen(addApproved);
             SortedSet<ILicenseFamily> families = config.getLicenseFamilies(LicenseFilter.all);
-            processDeprecatedLicenses(families, process);
-            Arrays.stream(licenses).map(x -> x.build(families)).forEach(process);
+            getDeprecatedConfigs().map(DeprecatedConfig::getLicense).filter(Objects::nonNull)
+            .map(x -> x.build(families)).forEach(process);
+            getLicenses().map(x -> x.build(families)).forEach(process);
         }
 
         config.setReportable(getReportable());
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index 2bcaf3a39..d107c0480 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -22,6 +22,7 @@
 import static org.apache.rat.mp.RatTestHelpers.newArtifactFactory;
 import static org.apache.rat.mp.RatTestHelpers.newArtifactRepository;
 import static org.apache.rat.mp.RatTestHelpers.newSiteRenderer;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -36,6 +37,7 @@
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.testhelpers.TextUtils;
+import org.apache.rat.walker.NameBasedHiddenFileFilter;
 
 /**
  * Test case for the {@link RatCheckMojo} and {@link RatReportMojo}.
@@ -196,15 +198,27 @@ public void testIt5() throws Exception {
      *
      * @throws Exception The test failed.
      */
-    public void testIt6() throws Exception {
-
-        final RatCheckMojo mojo = newRatCheckMojo("it6");
+    public void testRAT_343() throws Exception {
+        final RatCheckMojo mojo = newRatCheckMojo("RAT-343");
         final File ratTxtFile = getRatTxtFile(mojo);
-        final String[] expected = { " AL +\\Q" + getDir(mojo) + "pom.xml\\E", "Notes: 0", "Binaries: 0", "Archives: 0",
-                "Standards: 1$", "Apache Licensed: 1$", "Generated Documents: 0", "^0 Unknown Licenses" };
+        // POM reports as BSD because it has the BSD string in and that gets found before AL match
+        final String[] expected = { " BSD +\\Q" + getDir(mojo) + "pom.xml\\E", "Notes: 0", "Binaries: 0", "Archives: 0",
+                "Standards: 2$", "Apache Licensed: 0$", "Generated Documents: 0", "^0 Unknown Licenses" };
 
         ReportConfiguration config = mojo.getConfiguration();
-        ReportConfigurationTest.validateDefault(config);
+        // validate configuration
+        assertThat(config.isAddingLicenses()).isFalse();
+        assertThat(config.isAddingLicensesForced()).isFalse();
+        assertThat(config.getCopyrightMessage()).isNull();
+        assertThat(config.getInputFileFilter()).isNull();
+        assertThat(config.isStyleReport()).isTrue();
+        assertThat(config.getStyleSheet()).isNotNull().withFailMessage("Stylesheet should not be null");
+        assertThat(config.getDirectoryFilter()).isNotNull().withFailMessage("Directory filter should not be null");
+        assertThat(config.getDirectoryFilter()).isExactlyInstanceOf(NameBasedHiddenFileFilter.class);
+        
+        ReportConfigurationTest.validateDefaultApprovedLicenses(config, 2);
+        ReportConfigurationTest.validateDefaultLicenseFamilies(config, "BSD", "CC BY");
+        ReportConfigurationTest.validateDefaultLicenses(config, "BSD", "CC BY");
 
         mojo.execute();
         ensureRatReportIsCorrect(ratTxtFile, expected, TextUtils.EMPTY);
diff --git a/apache-rat-plugin/src/test/resources/unit/it6/pom.xml b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
similarity index 64%
rename from apache-rat-plugin/src/test/resources/unit/it6/pom.xml
rename to apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
index 73496c267..adacffffc 100644
--- a/apache-rat-plugin/src/test/resources/unit/it6/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
@@ -29,52 +29,38 @@
         <configuration>
 						<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
 						<licenses>
-							<license><family>MIT</family> <!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense" -->
-								<!-- <licenseFamilyCategory>MIT</licenseFamilyCategory>
-								<licenseFamilyName>MIT</licenseFamilyName> -->
+							<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+							<licenseFamilyCategory>MIT</licenseFamilyCategory>
+								<licenseFamilyName>MIT</licenseFamilyName> 
 								<notes></notes>
-								<!-- <patterns>
+								<patterns>
 									<pattern>Licensed MIT</pattern>
 									<pattern>Licensed under MIT</pattern>
 									<pattern>Licensed under the MIT license</pattern>
 									<pattern>MIT/GPL2 Licensed</pattern>
 									<pattern>licensed under the MIT and GPL</pattern>
 									<pattern>MIT license</pattern> 
-								</patterns> -->
-								<any>
-									<text>Licensed MIT</text>
-									<text>Licensed under MIT</text>
-									<text>Licensed under the MIT license</text>
-									<text>MIT/GPL2 Licensed</text>
-									<text>licensed under the MIT and GPL</text>
-									<text>MIT license</text>
-								</any>
+								</patterns> 
+
 							</license>
-							<license><family>BSD</family><!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">--> 
-								<!-- <licenseFamilyCategory>BSD</licenseFamilyCategory>
-								<licenseFamilyName>BSD</licenseFamilyName> -->
+							<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+								<licenseFamilyCategory>BSD</licenseFamilyCategory>
+								<licenseFamilyName>BSD</licenseFamilyName>
 								<notes></notes>
-<!--								<patterns>-->
-<!--									<pattern>BSD-style license</pattern>-->
-<!--								</patterns>-->
-<text>BSD-style license</text>
+								<patterns>
+									<pattern>BSD-style license</pattern>
+								</patterns>
 							</license>
-							<license><family>CC BY</family> <!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> -->
-								<!-- <licenseFamilyCategory>Creative Commons Attribution</licenseFamilyCategory> -->
-								<!-- <licenseFamilyName>CC BY</licenseFamilyName> -->
+							<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> 
+								 <licenseFamilyCategory>CC BY</licenseFamilyCategory> 
+								 <licenseFamilyName>Creative Commons Attribution</licenseFamilyName> 
 								<notes></notes>
-								<!-- <patterns>
+								 <patterns>
 									<pattern>creativecommons.org/licenses/by/4.0</pattern>
-								</patterns> -->
-								<text>creativecommons.org/licenses/by/4.0</text>
+								</patterns> 
 							</license>
 						</licenses>
-						<families>
-								<family><id>MIT</id><name>MIT</name></family>
-								<family><id>BSD</id><name>BSD</name></family>
-								<family><id>CC BY</id><name>CC BY</name></family>
-						</families>
-						<!-- <licenseFamilies> 
+						 <licenseFamilies> 
 							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
 								<familyName>MIT</familyName>
 							</licenseFamily>
@@ -84,7 +70,7 @@
 							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
 								<familyName>CC BY</familyName>
 							</licenseFamily>
-						</licenseFamilies> --> 
+						</licenseFamilies>  
 						<excludes>
 							<exclude>**/*.mp3</exclude>
 							<exclude>**/localhost.jks</exclude>
@@ -96,7 +82,6 @@
 							<exclude>**/.settings/**</exclude>
 							<exclude>.gitattributes</exclude>
 						</excludes>
-
         </configuration>
       </plugin>
     </plugins>
diff --git a/apache-rat-plugin/src/test/resources/unit/it6/src.txt b/apache-rat-plugin/src/test/resources/unit/it6/src.txt
deleted file mode 100644
index 72d9dffba..000000000
--- a/apache-rat-plugin/src/test/resources/unit/it6/src.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a text file, which intentionally has no Apache License Header.
-The Rat plugin should detect it.

From 336a3cf3fc4759a17712c5bada1da162777b9fa3 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 10 Jan 2024 13:52:07 +0100
Subject: [PATCH 221/299] Fixed build issue and added documentation

---
 .../analysis/license/DeprecatedConfig.java    | 18 ++++
 apache-rat-plugin/pom.xml                     |  1 +
 .../site/apt/examples/custom-license.apt.vm   | 83 ++++++++-----------
 .../org/apache/rat/mp/RatCheckMojoTest.java   |  4 +-
 .../src/test/resources/unit/RAT-343/pom.xml   |  3 +
 5 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
index 7a6e53b11..90db1e0c3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */ 
 package org.apache.rat.analysis.license;
 
 import org.apache.rat.license.ILicense;
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index cbac5333d..7b5fdddd5 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -92,6 +92,7 @@
               <exclude>src/test/resources/unit/RAT-335-GitIgnore/*</exclude>
               <exclude>src/test/resources/unit/RAT-335-GitIgnore/**/*</exclude>
               <exclude>**/*.iml</exclude>
+              <exclude>src/test/resources/unit/RAT-343/*</exclude>
               <!-- RAT-171: needs to be added since SCM ignores are only parsed in project root -->
               <exclude>**/.bzrignore</exclude>
             </excludes>
diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index 8f13163d8..992afe6a4 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -25,11 +25,12 @@ Custom License Matchers
 
   The simplest way to create a license check is to create an XML file describing
   the new license and add it to the processing with the <<additionalLicenseFiles>
-  option.  Create the file as described  
+  option.  
   
-  A custom license matcher is an implementation of
-  <<<org.apache.rat.analysis.IHeaderMatcher>>>. Suggest that your
-  source files must contain a header like the following:
+  The second option is to define the custom license directly in the POM.
+  Unlike earlier version no custom implementations are required to define
+  custom licenses.
+ 
 
 ------------------------------------------------------------------
   /**
@@ -53,15 +54,18 @@ Custom License Matchers
         <version>${currentVersion}</version>
         <configuration>
           <licenses>
-            <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-              <licenseFamilyCategory>YASL1</licenseFamilyCategory>
-              <licenseFamilyName>Yet Another Software License (YASL) 1.0</licenseFamilyName>
+            <license>
+              <family>YASL1</family>
               <notes></notes>
-              <patterns>
-                <pattern>Yet Another Software License, 1.0</pattern>
-              </patterns>
+              <text>Yet Another Software License, 1.0</text>
             </license>
           </licenses>
+          <families>
+             <family>
+               <id>YASL1</id>
+               <name>Yet Another Software License</name>
+             </family>
+          </families>
         </configuration>
       </plugin>
       ...
@@ -69,33 +73,18 @@ Custom License Matchers
   </build>
 ------------------------------------------------------------------
 
-  The following terms are used in the example:
-
-*-----------------------+-----------+
-| licenseFamilyCategory | The license family category is a very short string (exactly 5 characters, preferrably no blanks),
-|                       | which identifies the license. For example, this could be <<<AL20>>> to identify the
-|                       |  Apache License, 2.0.
-*-----------------------+-----------+
-| licenseFamilyName     | The license family name is a longer string, which gives the licenses full name. For example,
-|                       | this could be <<<Apache License, 2.0>>>.
-*-----------------------+-----------+
-| notes                 | You might specify additional notes here, like "Dual licensed GPL/MPL".
-*-----------------------+-----------+
-| patterns              | Specifies a set of patterns being searched. The source file is assumed to contain the
-|                       | license header, if at least one of these patterns is found.
-*-----------------------+-----------+
+  This is very similar to the XML format for defining the configuration.
+
 
 Approved License Families
 
-  Detecting the license is not enough in many cases as the "new"
-  license may not be considered approved by Rat.  In order to make a
-  license approved you provide a custom implementation of
-  <<<org.apache.rat.license.ILicenseFamily>>>.  Usually all you need
-  to provide the name of the license, in which case the built-in
-  <<<SimpleLicenseFamily>>> will do.
+  By default all POM defined licenses are considered approved, this is a 
+  change from pre 0.16 versons.  If there are families that are defined in
+  the pom but that should not be considered approved then a list of approved
+  license families must be provided.
 
-  To continue the example, in order to make the YASL1 license approved
-  you'd use
+  To continue the example, to be explicit that the YASL1 license is approved
+  add an approvedLicenses section listing the IDs for the approved licenses.
 
 ------------------------------------------------------------------
   <build>
@@ -107,20 +96,21 @@ Approved License Families
         <version>${currentVersion}</version>
         <configuration>
           <licenses>
-            <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-              <licenseFamilyCategory>YASL1</licenseFamilyCategory>
-              <licenseFamilyName>Yet Another Software License (YASL) 1.0</licenseFamilyName>
+            <license>
+              <family>YASL1</family>
               <notes></notes>
-              <patterns>
-                <pattern>Yet Another Software License, 1.0</pattern>
-              </patterns>
+              <text>Yet Another Software License, 1.0</text>
             </license>
           </licenses>
-          <licenseFamilies>
-            <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-              <familyName>Yet Another Software License (YASL) 1.0</familyName>
-            </licenseFamily>
-          </licenseFamilies>
+          <families>
+             <family>
+               <id>YASL1</id>
+               <name>Yet Another Software License</name>
+             </family>
+          </families>
+          <approvedLicenses>
+            <id>YASL1</id>
+          </approvedLicenses>
         </configuration>
       </plugin>
       ...
@@ -128,10 +118,5 @@ Approved License Families
   </build>
 ------------------------------------------------------------------
 
-  The following terms are used in the example:
 
-*-----------------------+-----------+
-| familyName            | The name of the license family name that is approved.
-|                       | This should match <<<licenseFamilyName>>> of your <<<licenseMatcher>>>
-*-----------------------+-----------+
 
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index d107c0480..0a8dc549d 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -203,7 +203,7 @@ public void testRAT_343() throws Exception {
         final File ratTxtFile = getRatTxtFile(mojo);
         // POM reports as BSD because it has the BSD string in and that gets found before AL match
         final String[] expected = { " BSD +\\Q" + getDir(mojo) + "pom.xml\\E", "Notes: 0", "Binaries: 0", "Archives: 0",
-                "Standards: 2$", "Apache Licensed: 0$", "Generated Documents: 0", "^0 Unknown Licenses" };
+                "Standards: 1$", "Apache Licensed: 0$", "Generated Documents: 0", "^0 Unknown Licenses" };
 
         ReportConfiguration config = mojo.getConfiguration();
         // validate configuration
@@ -216,7 +216,7 @@ public void testRAT_343() throws Exception {
         assertThat(config.getDirectoryFilter()).isNotNull().withFailMessage("Directory filter should not be null");
         assertThat(config.getDirectoryFilter()).isExactlyInstanceOf(NameBasedHiddenFileFilter.class);
         
-        ReportConfigurationTest.validateDefaultApprovedLicenses(config, 2);
+        ReportConfigurationTest.validateDefaultApprovedLicenses(config, 1);
         ReportConfigurationTest.validateDefaultLicenseFamilies(config, "BSD", "CC BY");
         ReportConfigurationTest.validateDefaultLicenses(config, "BSD", "CC BY");
 
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
index adacffffc..2d47e68de 100644
--- a/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
@@ -71,6 +71,9 @@
 								<familyName>CC BY</familyName>
 							</licenseFamily>
 						</licenseFamilies>  
+						<approvedLicenses>
+							<id>BSD</id>
+						</approvedLicenses>
 						<excludes>
 							<exclude>**/*.mp3</exclude>
 							<exclude>**/localhost.jks</exclude>

From bc4b2039ec1f0c195d3970e70589aa13e3cc6d29 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 10 Jan 2024 15:10:37 +0100
Subject: [PATCH 222/299] fixed format error

---
 apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index 992afe6a4..c81c85a3d 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -24,7 +24,7 @@ Custom License Matchers
   In such cases, you may use a custom license matcher.
 
   The simplest way to create a license check is to create an XML file describing
-  the new license and add it to the processing with the <<additionalLicenseFiles>
+  the new license and add it to the processing with the additionalLicenseFiles
   option.  
   
   The second option is to define the custom license directly in the POM.

From 6acdde70696fafb7e487a209d57b7134e009a3d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 00:31:13 +0000
Subject: [PATCH 223/299] Bump mavenPluginPluginVersion from 3.10.2 to 3.11.0

Bumps `mavenPluginPluginVersion` from 3.10.2 to 3.11.0.

Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.10.2 to 3.11.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.10.2 to 3.11.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3d9045114..5e5d7863f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenVersion>3.9.6</mavenVersion>
     <creadur.jira.id>RAT</creadur.jira.id>
     <!-- maven plugin versions -->
-    <mavenPluginPluginVersion>3.10.2</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.11.0</mavenPluginPluginVersion>
     <mavenChangesVersion>2.12.1</mavenChangesVersion>
     <mavenJavadocPluginVersion>3.6.3</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.21.2</mavenPmdPluginVersion>

From 9c71e70d780868058e6c429e03465a60c34aeae1 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 12:08:42 +0100
Subject: [PATCH 224/299] MPLUGIN-450, RAT-339: Introduce goalPrefix

---
 apache-rat-plugin/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 4213fa3c7..4e026f336 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -33,6 +33,7 @@
     <maven>${mavenMinVersion}</maven>
   </prerequisites>
   <properties>
+    <goalPrefix>apache-rat</goalPrefix>
     <currentVersion>${project.version}</currentVersion>
     <doxiaVersion>1.12.0</doxiaVersion>
     <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>

From c5c4b52f708c0d6578f59b5185a9a02b3c80aed2 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 12:15:04 +0100
Subject: [PATCH 225/299] RAT-339: define goalPrefix on help-mojo

---
 apache-rat-plugin/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 4e026f336..9c358ccca 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -63,6 +63,7 @@
           <artifactId>maven-plugin-plugin</artifactId>
           <configuration>
             <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+            <goalPrefix>apache-rat</goalPrefix>
           </configuration>
           <executions>
             <execution>

From 875d24279cac2c05b17d02964bb9cfe38232f2c7 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 12:15:06 +0100
Subject: [PATCH 226/299] Revert "MPLUGIN-450, RAT-339: Introduce goalPrefix"

This reverts commit 9c71e70d780868058e6c429e03465a60c34aeae1.
---
 apache-rat-plugin/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 9c358ccca..9068ad126 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -33,7 +33,6 @@
     <maven>${mavenMinVersion}</maven>
   </prerequisites>
   <properties>
-    <goalPrefix>apache-rat</goalPrefix>
     <currentVersion>${project.version}</currentVersion>
     <doxiaVersion>1.12.0</doxiaVersion>
     <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>

From d44c8b7e4f26c02a58ad9c1747ca7e61735fa3dc Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 15:11:48 +0100
Subject: [PATCH 227/299] RAT-343: Prepare for upcoming bugfix release taken
 from master

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3510e4db9..ba6db540a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>
   <groupId>org.apache.rat</groupId>
   <artifactId>apache-rat-project</artifactId>
-  <version>0.17-SNAPSHOT</version>
+  <version>0.16.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Creadur Rat</name>
   <url>https://creadur.apache.org/rat/</url>
@@ -61,8 +61,8 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenJavadocPluginVersion>3.6.3</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.21.2</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
-    <previousRatVersion>0.17</previousRatVersion>
-    <currentSnapshotRatVersion>0.18-SNAPSHOT</currentSnapshotRatVersion>
+    <previousRatVersion>0.16.1</previousRatVersion>
+    <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
   </properties>
   <distributionManagement>
     <site>

From 4e2a6ab524dfcf4de20bcf62330f08648a852b81 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 15:15:59 +0100
Subject: [PATCH 228/299] RAT-343, RAT-339: prepare for upcoming 0.16.1

---
 src/changes/changes.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b6a3582ad..72f478168 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -56,8 +56,13 @@ The <action> type attribute can be add,update,fix,remove.
         TODO: collect all dependabot updates for release 0.18.
       </action>
     </release>
-    -->
     <release version="0.17-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
+      <action issue="RAT-345" type="update" dev="pottlinger" due-to="dependabot">
+        TODO: collect all dependabot updates for release 0.18.
+      </action>
+    </release>
+    -->
+    <release version="0.16.1-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
       <action issue="RAT-342" type="add" dev="pottlinger">
         Use Maven wrapper (with version 3.9.6) for reproducable local builds and on ASF Jenkins and Github Actions.
       </action>

From 2315f0de35e4c18949d5e768ba8964534993996b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 15:38:59 +0100
Subject: [PATCH 229/299] RAT-343: Reinstate old configuration elements for
 Maven plugin configurations

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 72f478168..b91f08c96 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -66,6 +66,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="RAT-342" type="add" dev="pottlinger">
         Use Maven wrapper (with version 3.9.6) for reproducable local builds and on ASF Jenkins and Github Actions.
       </action>
+      <action issue="RAT-343" type="fix" dev="pottlinger" due-to="Claude Warren">
+        Reimplement old configuration elements for custom licenses in Maven plugin configurations (and updates to the webpage).
+      </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.17.
       </action>

From fed58ad333a16f0a23e4b8eed16750f04435ed6c Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 15:58:30 +0100
Subject: [PATCH 230/299] RAT-343: Prepare version in all submodules

---
 apache-rat-api/pom.xml    | 2 +-
 apache-rat-core/pom.xml   | 2 +-
 apache-rat-plugin/pom.xml | 2 +-
 apache-rat-tasks/pom.xml  | 2 +-
 apache-rat/pom.xml        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
index 2ebca482a..7fde60273 100644
--- a/apache-rat-api/pom.xml
+++ b/apache-rat-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16.1-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>apache-rat-api</artifactId>
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 360ed454f..f1cdccbe4 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16.1-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat-core</artifactId>
   <packaging>jar</packaging>
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index fcc60fdc8..5ee110d9f 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>apache-rat-project</artifactId>
     <groupId>org.apache.rat</groupId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>apache-rat-plugin</artifactId>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 3dcab27a7..6a323388e 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16.1-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat-tasks</artifactId>
   <packaging>jar</packaging>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index 73c90056c..67325de18 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.rat</groupId>
     <artifactId>apache-rat-project</artifactId>
-    <version>0.17-SNAPSHOT</version>
+    <version>0.16.1-SNAPSHOT</version>
   </parent>
   <artifactId>apache-rat</artifactId>
   <packaging>jar</packaging>

From 686d8634628108282dfc22a193680816e871e785 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 16:36:44 +0100
Subject: [PATCH 231/299] RAT-343: Add helper script to prepublish the current
 webpage

---
 .buildtools/generateStagingSiteInWebpageRepo | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 .buildtools/generateStagingSiteInWebpageRepo

diff --git a/.buildtools/generateStagingSiteInWebpageRepo b/.buildtools/generateStagingSiteInWebpageRepo
new file mode 100755
index 000000000..94cef4629
--- /dev/null
+++ b/.buildtools/generateStagingSiteInWebpageRepo
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+mvn site:site site:stage
+cp -rvf target/staging/* ../creadur-site/rat0161/

From 7a4cf43c88214b26f470a3c7932be662817081bd Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 16:40:15 +0100
Subject: [PATCH 232/299] Fix error in changelogs / release preparation

---
 src/changes/changes.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b91f08c96..7323d6ffd 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -58,7 +58,7 @@ The <action> type attribute can be add,update,fix,remove.
     </release>
     <release version="0.17-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
       <action issue="RAT-345" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.18.
+        TODO: collect all dependabot updates for release 0.17.
       </action>
     </release>
     -->
@@ -70,7 +70,7 @@ The <action> type attribute can be add,update,fix,remove.
         Reimplement old configuration elements for custom licenses in Maven plugin configurations (and updates to the webpage).
       </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
-        TODO: collect all dependabot updates for release 0.17.
+        TODO: collect all dependabot updates for release 0.16.1
       </action>
     </release>
     <release version="0.16" date="2023-12-28" description=

From cac68bdba9253b5e146dafdf39313bf2bbe4d05a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 17:32:27 +0100
Subject: [PATCH 233/299] RAT-339: Fix timestamp in footer

---
 src/site/site.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index 3a1d7b5b6..002451f8d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -98,7 +98,7 @@
     <menu ref="modules"/>
     <menu ref="reports"/>
 
-    <footer>Copyright &amp;copy; 2016-2023 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+    <footer>Copyright &amp;copy; 2016-2024 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.

From 072c25472fe7b765d189bf900d2ce91880a39624 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Thu, 11 Jan 2024 18:02:49 +0100
Subject: [PATCH 234/299] RAT-339: Republish to get correct footer info; clean
 needs to run before

---
 .buildtools/generateStagingSiteInWebpageRepo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildtools/generateStagingSiteInWebpageRepo b/.buildtools/generateStagingSiteInWebpageRepo
index 94cef4629..f870f6cc9 100755
--- a/.buildtools/generateStagingSiteInWebpageRepo
+++ b/.buildtools/generateStagingSiteInWebpageRepo
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-mvn site:site site:stage
+mvn clean site:site site:stage
 cp -rvf target/staging/* ../creadur-site/rat0161/

From 03221704368519af1002eae38dac49394f0ee4c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Jan 2024 00:06:29 +0000
Subject: [PATCH 235/299] Bump actions/cache from 3.3.2 to 3.3.3

Bumps [actions/cache](https://github.com/actions/cache) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.3.2...v3.3.3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e3a24dccc..dd9aa4343 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Configura artifact caching
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v3.3.3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

From 0d25c427845b86fa9707d00efe810b36eeae6bff Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Fri, 12 Jan 2024 17:55:59 +0100
Subject: [PATCH 236/299] RAT-348: Update gitignore reader

---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 5ee110d9f..c2c629168 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -305,7 +305,7 @@
     <dependency>
       <groupId>nl.basjes.gitignore</groupId>
       <artifactId>gitignore-reader</artifactId>
-      <version>1.2.1</version>
+      <version>1.3.0</version>
     </dependency>
   </dependencies>
   <reporting>

From 21b726a0945f905d67ef8854950aa1e4530873a3 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Fri, 12 Jan 2024 23:16:34 +0100
Subject: [PATCH 237/299] RAT-348: Update gitignore reader to 1.3.0

---
 src/changes/changes.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7323d6ffd..76f575ef3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -41,6 +41,15 @@ The <action> type attribute can be add,update,fix,remove.
     the rest are optional; order not important
 
     having the issue number first makes it easier to read the XML outline
+
+If you wonder which action types are available:
+https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
+
+ * add: added functionality to the project.
+ * fix: bug fix for the project
+ * update: updated some part of the project.
+ * remove: removed some functionality from the project.
+
 -->
 <document xmlns="http://maven.apache.org/changes/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -69,6 +78,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="RAT-343" type="fix" dev="pottlinger" due-to="Claude Warren">
         Reimplement old configuration elements for custom licenses in Maven plugin configurations (and updates to the webpage).
       </action>
+      <action issue="RAT-348" type="add" dev="pottlinger" due-to="Niels Basjes">
+        Update gitignore-reader library to 1.3.0 to get latest changes in gitignore parsing.
+      </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.16.1
       </action>

From a7d475efc520aec69ca9c8cc4665e957fbbe3fb7 Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Sat, 13 Jan 2024 17:35:33 +0100
Subject: [PATCH 238/299] RAT-349: Fix NPE on addDefaultLicenses=false

---
 .../src/main/java/org/apache/rat/mp/AbstractRatMojo.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 8c54a2024..2480526ab 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -318,6 +318,8 @@ protected ReportConfiguration getConfiguration() throws MojoExecutionException {
         reportDeprecatedProcessing();
         if (addDefaultLicenses) {
             config.setFrom(getDefaultsBuilder().build());
+        } else {
+            config.setStyleSheet(Defaults.getPlainStyleSheet());
         }
         if (additionalLicenseFiles != null) {
             for (String licenseFile : additionalLicenseFiles) {

From d03de2732be5ab3a6947064f5c6c726b93b507d6 Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Sat, 13 Jan 2024 16:28:50 +0100
Subject: [PATCH 239/299] RAT-343: Add test to validate allowing a custom
 license

---
 apache-rat-plugin/pom.xml                     |  2 +
 .../src/it/CustomLicense/invoker.properties   | 16 +++++
 .../src/it/CustomLicense/pom.xml              | 59 +++++++++++++++++++
 .../java/nl/basjes/something/Something.java   | 26 ++++++++
 4 files changed, 103 insertions(+)
 create mode 100644 apache-rat-plugin/src/it/CustomLicense/invoker.properties
 create mode 100644 apache-rat-plugin/src/it/CustomLicense/pom.xml
 create mode 100644 apache-rat-plugin/src/it/CustomLicense/src/main/java/nl/basjes/something/Something.java

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index c2c629168..021db248a 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -94,6 +94,8 @@
               <exclude>src/test/resources/unit/RAT-335-GitIgnore/**/*</exclude>
               <exclude>**/*.iml</exclude>
               <exclude>src/test/resources/unit/RAT-343/*</exclude>
+              <!-- These files have a custom license header (non Apache) to test validating custom licenses -->
+              <exclude>src/it/CustomLicense/src/**/</exclude>
               <!-- RAT-171: needs to be added since SCM ignores are only parsed in project root -->
               <exclude>**/.bzrignore</exclude>
             </excludes>
diff --git a/apache-rat-plugin/src/it/CustomLicense/invoker.properties b/apache-rat-plugin/src/it/CustomLicense/invoker.properties
new file mode 100644
index 000000000..6e8c3479e
--- /dev/null
+++ b/apache-rat-plugin/src/it/CustomLicense/invoker.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+invoker.goals = clean apache-rat:check
diff --git a/apache-rat-plugin/src/it/CustomLicense/pom.xml b/apache-rat-plugin/src/it/CustomLicense/pom.xml
new file mode 100644
index 000000000..4a03c4872
--- /dev/null
+++ b/apache-rat-plugin/src/it/CustomLicense/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.rat.test</groupId>
+  <artifactId>custom-license</artifactId>
+  <version>1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>@pom.version@</version>
+        <configuration>
+          <addDefaultLicenses>false</addDefaultLicenses>
+          <families>
+            <family>
+              <id>CC</id>
+              <name>Creative Commons</name>
+            </family>
+          </families>
+          <licenses>
+            <license>
+              <family>CC</family>
+              <id>CC-BY-NC-ND</id>
+              <notes/>
+              <name>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</name>
+              <any>
+                <text>Attribution-NonCommercial-NoDerivatives</text>
+              </any>
+            </license>
+          </licenses>
+          <approvedLicenses>
+            <approvedLicense>CC</approvedLicense>
+          </approvedLicenses>
+          <excludes>
+            <exclude>pom.xml</exclude>
+            <exclude>invoker.properties</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/apache-rat-plugin/src/it/CustomLicense/src/main/java/nl/basjes/something/Something.java b/apache-rat-plugin/src/it/CustomLicense/src/main/java/nl/basjes/something/Something.java
new file mode 100644
index 000000000..4a7f38d95
--- /dev/null
+++ b/apache-rat-plugin/src/it/CustomLicense/src/main/java/nl/basjes/something/Something.java
@@ -0,0 +1,26 @@
+/*
+ * ***********************************************************************
+ * Ok, this file is really Apache _ licensed but it has a fake header
+ * that does not match the Apache rules to test custom license validation.
+ * ***********************************************************************
+ *
+ * Something toolkit
+ * Copyright (C) 2019-2024 Niels Basjes
+ *
+ * This work is licensed under the Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://creativecommons.org/licenses/by-nc-nd/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ */
+package nl.basjes.something;
+
+public class Something {
+    private static final String something = "No real code";
+}

From adf3e1326486cc2a429558067845bd766b69eb60 Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Sat, 13 Jan 2024 16:50:22 +0100
Subject: [PATCH 240/299] RAT-343: Add simple toString for License and Family

---
 .../src/main/java/org/apache/rat/mp/Family.java              | 4 ++++
 .../src/main/java/org/apache/rat/mp/License.java             | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
index 2cdbc61e0..0b790164f 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Family.java
@@ -38,4 +38,8 @@ public ILicenseFamily build() {
         return builder.setLicenseFamilyCategory(id).setLicenseFamilyName(name).build();
     }
 
+    @Override
+    public String toString() {
+        return '{' + id + ':' + name + '}';
+    }
 }
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
index 411e9fa51..ac17c2b09 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/License.java
@@ -57,4 +57,9 @@ public ILicense build(SortedSet<ILicenseFamily> context) {
                 .setName(name).setNotes(notes).build(context);
     }
 
+    @Override
+    public String toString() {
+        return '{' + family + ':' + id + ':' + name + '}';
+    }
+
 }

From 7180cbeeebd730a8d5429849ade774a88958db3d Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Fri, 12 Jan 2024 16:25:20 +0100
Subject: [PATCH 241/299] iniital checkin

---
 .../src/main/java/org/apache/rat/Report.java  |  92 +++++---
 .../org/apache/rat/ReportConfiguration.java   |  78 +++++--
 .../main/java/org/apache/rat/Reporter.java    |  46 ++++
 .../java/org/apache/rat/utils/DefaultLog.java |  29 +++
 .../main/java/org/apache/rat/utils/Log.java   |  21 ++
 .../org/apache/rat/utils/ReportingSet.java    | 220 ++++++++++++++++++
 .../apache/rat/ReportConfigurationTest.java   |  10 +-
 .../java/org/apache/rat/ReporterTest.java     |   5 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |   5 +-
 .../org/apache/rat/mp/AbstractRatMojo.java    |  25 +-
 .../java/org/apache/rat/anttasks/Report.java  |  33 ++-
 11 files changed, 492 insertions(+), 72 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index bb72df175..f5d856428 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -51,6 +51,7 @@
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
+import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.walker.ArchiveWalker;
 import org.apache.rat.walker.DirectoryWalker;
 
@@ -103,29 +104,35 @@ public class Report {
     /**
      * List the licenses that were used for the run.
      */
-    private static final String LIST_LICENSES = "list-licenses";
+    private static final String LIST_LICENSES_ALL = "list-licenses-all";
+
     /**
-     * List the approved families for the run.
+     * List the licenses that were used for the run.
      */
-    private static final String LIST_LICENSE_FAMILIES = "list-approved-families";
+    private static final String LIST_LICENSES_APPROVED = "list-licenses-approved";
 
     /**
-     * Set unstyled XML output
+     * List the all families for the run.
      */
-    private static final String XML = "x";
+    private static final String LIST_FAMILIES_ALL = "list-families-all";
 
-    /*
-     * Format used for listing license families
+    /**
+     * List the approved families for the run.
      */
-    private static final String LICENSE_FAMILY_FORMAT = "\t%s: %s\n";
+    private static final String LIST_FAMILIES_APPROVED = "list-families-approved";
 
     /**
-     * Format used for listing licenses.
+     * Set unstyled XML output
      */
-    private static final String LICENSE_FORMAT = "%s:\t%s\n\t\t%s\n";
+    private static final String XML = "x";
+
+    private static OptionGroup LIST_LICENSES;
+    private static OptionGroup LIST_FAMILIES;
 
     /**
-     * Processes the command line and builds a configuration and executes the report.
+     * Processes the command line and builds a configuration and executes the
+     * report.
+     * 
      * @param args the arguments.
      * @throws Exception on error.
      */
@@ -151,21 +158,31 @@ public static void main(String[] args) throws Exception {
         if (args == null || args.length != 1) {
             printUsage(opts);
         } else {
-            ReportConfiguration configuration = createConfiguration(args[0],cl);
+            ReportConfiguration configuration = createConfiguration(args[0], cl);
             configuration.validate(System.err::println);
 
-            if (cl.hasOption(LIST_LICENSE_FAMILIES)) {
-                listLicenseFamilies(configuration.getLicenseFamilies(LicenseFilter.all), System.out);
-            }
-            if (cl.hasOption(LIST_LICENSES)) {
-                listLicenses(configuration.getLicenses(LicenseFilter.all), System.out);
+            if (LIST_FAMILIES.getSelected() != null || LIST_LICENSES.getSelected() != null) {
+
+                if (cl.hasOption(LIST_FAMILIES_ALL)) {
+                    Reporter.listLicenseFamilies(configuration, LicenseFilter.all);
+                }
+                if (cl.hasOption(LIST_FAMILIES_APPROVED)) {
+                    Reporter.listLicenseFamilies(configuration, LicenseFilter.approved);
+                }
+                if (cl.hasOption(LIST_LICENSES_ALL)) {
+                    Reporter.listLicenses(configuration, LicenseFilter.all);
+                }
+                if (cl.hasOption(LIST_LICENSES_APPROVED)) {
+                    Reporter.listLicenses(configuration, LicenseFilter.approved);
+                }
+            } else {
+                Reporter.report(configuration);
             }
-            Reporter.report(configuration);
         }
     }
 
     static ReportConfiguration createConfiguration(String baseDirectory, CommandLine cl) throws IOException {
-        final ReportConfiguration configuration = new ReportConfiguration();
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
 
         if (cl.hasOption('o')) {
             configuration.setOut(new File(cl.getOptionValue('o')));
@@ -223,20 +240,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
         configuration.setReportable(getDirectory(baseDirectory, configuration));
         return configuration;
     }
-
-    private static void listLicenseFamilies(SortedSet<ILicenseFamily> families, PrintStream out) {
-        out.println("Families:");
-        families.forEach(x -> out.format(LICENSE_FAMILY_FORMAT, x.getFamilyCategory(), x.getFamilyName()));
-        out.println();
-    }
-
-    private static void listLicenses(SortedSet<ILicense> licenses, PrintStream out) {
-        out.println("Licenses:");
-        licenses.forEach(lic -> out.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
-                lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
-        out.println();
-    }
-
+    
     /**
      * Creates a filename filter from patterns to exclude.
      * 
@@ -269,12 +273,24 @@ static FilenameFilter parseExclusions(List<String> excludes) {
     }
 
     static Options buildOptions() {
+        LIST_FAMILIES = new OptionGroup()
+                .addOption(
+                        Option.builder().longOpt(LIST_FAMILIES_ALL).desc("List all defined license families").build())
+                .addOption(Option.builder().longOpt(LIST_FAMILIES_APPROVED)
+                        .desc("List approved defined license families").build());
+
+        LIST_LICENSES = new OptionGroup()
+                .addOption(Option.builder().longOpt(LIST_LICENSES_ALL).desc("List all active licenses").build())
+                .addOption(
+                        Option.builder().longOpt(LIST_LICENSES_APPROVED).desc("List approved active licenses").build());
+
         Options opts = new Options();
 
         Option help = new Option(HELP, "help", false, "Print help for the RAT command line interface and exit");
         opts.addOption(help);
 
-        Option out = new Option("o", "out", true, "Define the output file where to write report (default is System.out)");
+        Option out = new Option("o", "out", true,
+                "Define the output file where to write report (default is System.out)");
         opts.addOption(out);
 
         String defaultHandlingText = " By default all approved default licenses are used";
@@ -282,8 +298,9 @@ static Options buildOptions() {
         opts.addOption(noDefaults);
 
         opts.addOption(null, LICENSES, true, "File names or URLs for license definitions");
-        opts.addOption(null, LIST_LICENSES, false, "List all active licenses");
-        opts.addOption(null, LIST_LICENSE_FAMILIES, false, "List all defined license families");
+        opts.addOptionGroup(LIST_LICENSES);
+
+        opts.addOptionGroup(LIST_FAMILIES);
         opts.addOption(null, SCAN_HIDDEN_DIRECTORIES, false, "Scan hidden directories");
 
         OptionGroup addLicenseGroup = new OptionGroup();
@@ -291,7 +308,8 @@ static Options buildOptions() {
                 + "By default new files will be created with the license header, "
                 + "to force the modification of existing files use the --force option.";
 
-        // RAT-85/RAT-203: Deprecated! added only for convenience and for backwards compatibility
+        // RAT-85/RAT-203: Deprecated! added only for convenience and for backwards
+        // compatibility
         Option addLicence = new Option(ADD_OLD, "addLicence", false, addLicenseDesc);
         addLicenseGroup.addOption(addLicence);
         Option addLicense = new Option(ADD, "addLicense", false, addLicenseDesc);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index f02a60f92..a0f3f6488 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -47,6 +47,8 @@
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
+import org.apache.rat.utils.Log;
+import org.apache.rat.utils.ReportingSet;
 import org.apache.rat.walker.NameBasedHiddenFileFilter;
 
 /**
@@ -55,20 +57,44 @@
  * configuration and invoke the {@link Reporter}.
  */
 public class ReportConfiguration {
-    private final SortedSet<ILicenseFamily> families = LicenseFamilySetFactory.emptyLicenseFamilySet();
-    private final SortedSet<ILicense> licenses = LicenseSetFactory.emptyLicenseSet();
-    private final SortedSet<String> approvedLicenseCategories = new TreeSet<>();
-    private final SortedSet<String> removedLicenseCategories = new TreeSet<>();
+    private final ReportingSet<ILicenseFamily> families;
+    private final ReportingSet<ILicense> licenses;
+    private final SortedSet<String> approvedLicenseCategories;
+    private final SortedSet<String> removedLicenseCategories;
     private boolean addingLicenses;
     private boolean addingLicensesForced;
     private String copyrightMessage;
-    private IOSupplier<OutputStream> out = null;
-    private boolean styleReport = true;
-    private IOSupplier<InputStream> styleSheet = null;
-    private IReportable reportable = null;
-    private FilenameFilter inputFileFilter = null;
-    private IOFileFilter directoryFilter = NameBasedHiddenFileFilter.HIDDEN;
+    private IOSupplier<OutputStream> out;
+    private boolean styleReport;
+    private IOSupplier<InputStream> styleSheet;
+    private IReportable reportable;
+    private FilenameFilter inputFileFilter;
+    private IOFileFilter directoryFilter;
+
+    public ReportConfiguration(Log log) {
+        families = new ReportingSet<>(LicenseFamilySetFactory.emptyLicenseFamilySet()).setLog(log);
+        licenses = new ReportingSet<>(LicenseSetFactory.emptyLicenseSet()).setLog(log);
+        approvedLicenseCategories = new TreeSet<>();
+        removedLicenseCategories = new TreeSet<>();
+        directoryFilter = NameBasedHiddenFileFilter.HIDDEN;
+    }
+    
+    public void logFamilyCollisions(Log.Level level) {
+        families.setLogLevel(level);
+    }
+    
+    public void failFamilyCollisions(boolean state) {
+        families.setFailOnDuplicate(state);
+    }
 
+    public void logLicenseCollisions(Log.Level level) {
+        licenses.setLogLevel(level);
+    }
+    
+    public void failLicenseCollisions(boolean state) {
+        licenses.setFailOnDuplicate(state);
+    }
+    
     /**
      * @return The filename filter for the potential input files.
      */
@@ -114,16 +140,18 @@ public void setReportable(IReportable reportable) {
     }
 
     /**
-     * @return the Supplier of the InputStream that is the XSLT style sheet to style the report with.
+     * @return the Supplier of the InputStream that is the XSLT style sheet to style
+     * the report with.
      */
     public IOSupplier<InputStream> getStyleSheet() {
         return styleSheet;
     }
 
     /**
-     * Sets the style sheet for custom processing.
-     * The IOSupplier may be called multiple times, so the input stream must be 
-     * able to be opened and closed multiple times.
+     * Sets the style sheet for custom processing. The IOSupplier may be called
+     * multiple times, so the input stream must be able to be opened and closed
+     * multiple times.
+     * 
      * @param styleSheet the XSLT style sheet to style the report with.
      */
     public void setStyleSheet(IOSupplier<InputStream> styleSheet) {
@@ -155,9 +183,9 @@ public void setStyleSheet(File styleSheet) {
     }
 
     /**
-     * Sets the style sheet for custom processing.
-     * The stylesheet may be opened multiple times so the URI must be capable of being opened
-     * multiple times.
+     * Sets the style sheet for custom processing. The stylesheet may be opened
+     * multiple times so the URI must be capable of being opened multiple times.
+     * 
      * @param styleSheet the URI of the XSLT style sheet to style the report with.
      */
     public void setStyleSheet(URI styleSheet) {
@@ -165,21 +193,21 @@ public void setStyleSheet(URI styleSheet) {
         try {
             setStyleSheet(styleSheet.toURL());
         } catch (MalformedURLException e) {
-            throw new ConfigurationException( "Unable to process stylesheet", e);
+            throw new ConfigurationException("Unable to process stylesheet", e);
         }
     }
 
     /**
-     * Sets the style sheet for custom processing.
-     * The stylesheet may be opened multiple times so the URL must be capable of being opened
-     * multiple times.
+     * Sets the style sheet for custom processing. The stylesheet may be opened
+     * multiple times so the URL must be capable of being opened multiple times.
+     * 
      * @param styleSheet the URL of the XSLT style sheet to style the report with.
      */
     public void setStyleSheet(URL styleSheet) {
         Objects.requireNonNull(styleSheet, "styleSheet file should not be null");
         setStyleSheet(styleSheet::openStream);
     }
-    
+
     /**
      * @return {@code true} if the XML report should be styled.
      */
@@ -312,9 +340,9 @@ public void addFamilies(Collection<ILicenseFamily> families) {
         this.families.addAll(families);
     }
 
-    public SortedSet<ILicenseFamily> getFamilies() {
-        return Collections.unmodifiableSortedSet(families);
-    }
+//    public SortedSet<ILicenseFamily> getFamilies() {
+//        return Collections.unmodifiableSortedSet(families);
+//    }
 
     /**
      * Adds an ILicenseFamily to the list of approved licenses.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index 2be95fb67..09754437e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -20,12 +20,18 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PipedReader;
 import java.io.PipedWriter;
+import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Writer;
+import java.util.SortedSet;
 
 import org.apache.rat.api.RatException;
+import org.apache.rat.license.ILicense;
+import org.apache.rat.license.ILicenseFamily;
+import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
 import org.apache.rat.report.xml.XmlReportFactory;
@@ -37,6 +43,16 @@
  */
 public class Reporter {
 
+    /*
+     * Format used for listing license families
+     */
+    private static final String LICENSE_FAMILY_FORMAT = "\t%s: %s\n";
+
+    /**
+     * Format used for listing licenses.
+     */
+    private static final String LICENSE_FORMAT = "%s:\t%s\n\t\t%s\n";
+    
     private Reporter() {
         // Do not instantiate
     }
@@ -94,4 +110,34 @@ private static ClaimStatistic report(Writer outputWriter, ReportConfiguration co
             throw new IOException(e);
         }
     }
+   
+    /**
+     * lists the license families information on the configured output stream.
+     * @param configuration The configuration for the system
+     * @throws IOException if PrintWriter can not be retrieved from configuration.
+     */
+    public static void listLicenseFamilies(ReportConfiguration configuration, LicenseFilter filter) throws IOException {
+        try (PrintWriter pw = configuration.getWriter().get()) {
+            pw.format("Families (%s):%n", filter);
+            configuration.getLicenseFamilies(filter)
+                    .forEach(x -> pw.format(LICENSE_FAMILY_FORMAT, x.getFamilyCategory(), x.getFamilyName()));
+            pw.println();
+        }
+    }
+
+    /**
+     * lists the licenses on the configured output stream.
+     * @param configuration The configuration for the system
+     * @throws IOException if PrintWriter can not be retrieved from configuration.
+     */
+    public static void listLicenses(ReportConfiguration configuration, LicenseFilter filter) throws IOException {
+        try (PrintWriter pw = configuration.getWriter().get()) {
+            pw.format("Licenses (%s):%n", filter);
+            configuration.getLicenses(filter)
+                    .forEach(lic -> pw.format(LICENSE_FORMAT, lic.getLicenseFamily().getFamilyCategory(),
+                            lic.getLicenseFamily().getFamilyName(), lic.getNotes()));
+            pw.println();
+        }
+    }
+
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
new file mode 100644
index 000000000..abf8e6c9e
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
@@ -0,0 +1,29 @@
+package org.apache.rat.utils;
+
+/**
+ * A default implementation of Log that writes to System.out and System.err
+ */
+public class DefaultLog implements Log {
+
+    /**
+     * The instance of the default log.
+     */
+    public static final DefaultLog INSTANCE = new DefaultLog();
+
+    private DefaultLog() {
+    }
+
+    @Override
+    public void log(Level level, String msg) {
+        switch (level) {
+        case DEBUG:
+        case INFO:
+        case WARN:
+            System.out.format("%s: %s%n", level, msg);
+            break;
+        case ERROR:
+            System.err.format("%s: %s%n", level, msg);
+            break;
+        }
+    }
+}
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
new file mode 100644
index 000000000..4d76ebf7b
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
@@ -0,0 +1,21 @@
+package org.apache.rat.utils;
+
+import java.util.function.Consumer;
+
+/**
+ * The definition of logging for the core.  UIs are expected to provide an implementation of 
+ * Log to log data to the appropriate system within the UI.
+ */
+public interface Log {
+    /**
+     * The log levels supported by logging.
+     */
+    public enum Level {DEBUG, INFO, WARN, ERROR };
+
+    /**
+     * Writes a message at a specific log level.
+     * @param level The log level to write at.
+     * @param msg the Message to write.
+     */
+    void log(Level level, String msg);
+}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
new file mode 100644
index 000000000..0edb1d3f3
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
@@ -0,0 +1,220 @@
+package org.apache.rat.utils;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.Spliterator;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * A sorted set that reports insertion collisions.
+ * @param <T> the type of object
+ */
+public class ReportingSet<T> implements SortedSet<T> {
+    private final SortedSet<T> delegate;
+    private boolean failOnDuplicate = false;
+    private Log.Level duplicateLogLevel = Log.Level.WARN;
+    private Log log = DefaultLog.INSTANCE;
+
+    /**
+     * Constructor.
+     * Creates a TreeSet of type T.
+     */
+    public ReportingSet() {
+        this(new TreeSet<T>());
+    }
+    
+    /**
+     * Constructs.
+     * 
+     * @param delegate the SortedSet to delegate to.
+     */
+    public ReportingSet(SortedSet<T> delegate) {
+        this.delegate = delegate;
+    }
+
+    /**
+     * If set true attempts to duplicate will throw an IllegalArgumentException.
+     * The default state is false;.
+     * @param state the state to set.
+     * @return this for chaining.
+     */
+    public ReportingSet<T> setFailOnDuplicate(boolean state) {
+        this.failOnDuplicate = state;
+        return this;
+    }
+
+    /**
+     * Sets the log that the reporting set will log to.
+     * if not set the DefaultLog is used.
+     * @param log the Log implementation to use.
+     * @return this for chaining.
+     */
+    public ReportingSet<T> setLog(Log log) {
+        this.log = log;
+        return this;
+    }
+
+    /**
+     * Sets the log level that the reporting set will log at.
+     * if not set the default level is WARN.
+     * @param level the log level to use.
+     * @return this for chaining.
+     */
+    public ReportingSet<T> setLogLevel(Log.Level level) {
+        this.duplicateLogLevel = level;
+        return this;
+    }
+
+    private ReportingSet<T> sameConfig(SortedSet<T> delegate) {
+        ReportingSet<T> result = delegate instanceof ReportingSet ? (ReportingSet<T>) delegate : new ReportingSet<>(delegate);
+        return result.setFailOnDuplicate(this.failOnDuplicate).setLog(this.log).setLogLevel(this.duplicateLogLevel);
+    }
+
+    @Override
+    public boolean add(T e) {
+        if (delegate.contains(e)) {
+            String msg = String.format("Duplicate %s detected %s", e,
+                    failOnDuplicate ? "" : " - duplicate ignored");
+            log.log(duplicateLogLevel, msg);
+            if (failOnDuplicate) {
+                throw new IllegalArgumentException(msg);
+            }
+            return false;
+        }
+        return delegate.add(e);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends T> c) {
+        boolean updated = false;
+        for (T e : c) {
+            updated |= add(e);
+        }
+        return updated;
+    }
+
+    @Override
+    public void clear() {
+        delegate.clear();
+    }
+
+    @Override
+    public Comparator<? super T> comparator() {
+        return delegate.comparator();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return delegate.contains(o);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return delegate.containsAll(c);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return delegate.equals(o);
+    }
+
+    @Override
+    public T first() {
+        return delegate.first();
+    }
+
+    @Override
+    public void forEach(Consumer<? super T> action) {
+        delegate.forEach(action);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    @Override
+    public ReportingSet<T> headSet(T toElement) {
+        return sameConfig(delegate.headSet(toElement));
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return delegate.iterator();
+    }
+
+    @Override
+    public T last() {
+        return delegate.last();
+    }
+
+    @Override
+    public Stream<T> parallelStream() {
+        return delegate.parallelStream();
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return delegate.remove(o);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    @Override
+    public boolean removeIf(Predicate<? super T> filter) {
+        return delegate.removeIf(filter);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public Spliterator<T> spliterator() {
+        return delegate.spliterator();
+    }
+
+    @Override
+    public Stream<T> stream() {
+        return delegate.stream();
+    }
+
+    @Override
+    public ReportingSet<T> subSet(T fromElement, T toElement) {
+        return sameConfig(delegate.subSet(fromElement, toElement));
+    }
+
+    @Override
+    public ReportingSet<T> tailSet(T fromElement) {
+        return sameConfig(delegate.tailSet(fromElement));
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return delegate.toArray(a);
+    }
+}
\ No newline at end of file
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 33346d539..cf48a6348 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -50,6 +50,8 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.testhelpers.TestingLicense;
+import org.apache.rat.utils.DefaultLog;
+import org.apache.rat.utils.Log;
 import org.apache.rat.walker.NameBasedHiddenFileFilter;
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +62,7 @@ public class ReportConfigurationTest {
 
     @Before
     public void setup() {
-        underTest = new ReportConfiguration();
+        underTest = new ReportConfiguration((Log)DefaultLog.INSTANCE);
     }
 
     @Test
@@ -357,7 +359,7 @@ public void testValidate() {
     
     @Test
     public void testSetOut() throws IOException {
-        ReportConfiguration config = new ReportConfiguration();
+        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
         OutputStreamIntercepter osi = new OutputStreamIntercepter();
         config.setOut(() -> osi);
         assertThat(osi.closeCount).isEqualTo(0);
@@ -396,11 +398,11 @@ public static void validateDefaultApprovedLicenses(ReportConfiguration config, i
      * @param config the configuration to test.
      */
     public static void validateDefaultLicenseFamilies(ReportConfiguration config, String...additionalIds) {
-        assertThat(config.getFamilies()).hasSize(ConfigurationReaderTest.EXPECTED_IDS.length + additionalIds.length);
+        assertThat(config.getLicenseFamilies(LicenseFilter.all)).hasSize(ConfigurationReaderTest.EXPECTED_IDS.length + additionalIds.length);
         List<String> expected = new ArrayList<>();
         expected.addAll(Arrays.asList(ConfigurationReaderTest.EXPECTED_IDS));
         expected.addAll(Arrays.asList(additionalIds));
-        for (ILicenseFamily family : config.getFamilies()) {
+        for (ILicenseFamily family : config.getLicenseFamilies(LicenseFilter.all)) {
             assertThat(expected).contains(family.getFamilyCategory().trim());
         }
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index ed3d96f9a..d2fd9713b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -33,6 +33,7 @@
 import org.apache.commons.io.filefilter.HiddenFileFilter;
 import org.apache.rat.test.utils.Resources;
 import org.apache.rat.testhelpers.XmlUtils;
+import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -49,7 +50,7 @@ public void xmlReportTest() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final ReportConfiguration configuration = new ReportConfiguration();
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
         configuration.setStyleReport(false);
         configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath), HiddenFileFilter.HIDDEN));
@@ -90,7 +91,7 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final ReportConfiguration configuration = new ReportConfiguration();
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
         configuration.setFrom(defaults);
         configuration.setReportable(new DirectoryWalker(new File(elementsPath), HiddenFileFilter.HIDDEN));
         configuration.setOut(() -> out);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index c1113d755..2e060a0f5 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -44,6 +44,7 @@
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.TestingMatcher;
 import org.apache.rat.testhelpers.XmlUtils;
+import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.Before;
 import org.junit.Test;
@@ -79,7 +80,7 @@ public void standardReport() throws Exception {
 
         DirectoryWalker directory = new DirectoryWalker(new File(elementsPath), IGNORE_EMPTY, HiddenFileFilter.HIDDEN);
         final ClaimStatistic statistic = new ClaimStatistic();
-        final ReportConfiguration configuration = new ReportConfiguration();
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
         configuration.addLicense(testingLicense);
         RatReport report = XmlReportFactory.createStandardReport(writer, statistic, configuration);
         report.startReport();
@@ -109,7 +110,7 @@ public void testNoLicense() throws Exception {
         when(mockLicense.getLicenseFamily()).thenReturn(family);
 
         final ClaimStatistic statistic = new ClaimStatistic();
-        final ReportConfiguration configuration = new ReportConfiguration();
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
         // configuration.addLicense(mockLicense);
         try {
             XmlReportFactory.createStandardReport(writer, statistic, configuration);
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
index 8c54a2024..07f167f7b 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
@@ -313,8 +313,31 @@ private void processLicenseFamilies(ReportConfiguration config) {
         }
     }
     
+    private org.apache.rat.utils.Log makeLog() {
+        return new org.apache.rat.utils.Log() {
+            Log log = getLog();
+            @Override
+            public void log(Level level, String msg) {
+                switch (level)
+                {
+                case DEBUG:
+                    log.debug(msg);
+                    break;
+                case INFO:
+                    log.info(msg);;
+                    break;
+                case WARN:
+                    log.warn(msg);
+                    break;
+                case ERROR:
+                    log.error(msg);
+                    break;
+            }
+            }};
+    }
+    
     protected ReportConfiguration getConfiguration() throws MojoExecutionException {
-        ReportConfiguration config = new ReportConfiguration();
+        ReportConfiguration config = new ReportConfiguration(makeLog());
         reportDeprecatedProcessing();
         if (addDefaultLicenses) {
             config.setFrom(getDefaultsBuilder().build());
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index 880a43285..c5b4670bd 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.PrintWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -35,6 +36,7 @@
 import org.apache.rat.configuration.LicenseReader;
 import org.apache.rat.configuration.MatcherReader;
 import org.apache.rat.license.LicenseSetFactory;
+import org.apache.rat.utils.Log;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -75,7 +77,7 @@ public class Report extends Task {
     private Union nestedResources;
 
     public Report() {
-        configuration = new ReportConfiguration();
+        configuration = new ReportConfiguration(new Logger());
         configuration.setOut(() -> new LogOutputStream(this, Project.MSG_INFO));
         defaultsBuilder = Defaults.builder();
     }
@@ -290,4 +292,33 @@ public LicenseSetFactory.LicenseFilter internalFilter() {
             return LicenseSetFactory.LicenseFilter.valueOf(getValue());
         }
     }
+    
+    private class Logger implements Log {
+
+        private void write(int level, String msg) {
+            try (PrintWriter pw = new PrintWriter(new LogOutputStream(Report.this, level)))
+            {
+               pw.write(msg);
+            }
+        }
+
+        @Override
+        public void log(Level level, String msg) {
+            switch (level) {
+            case DEBUG:
+                write(Project.MSG_DEBUG, msg);
+                break;
+            case INFO:
+                write(Project.MSG_INFO, msg);
+                break;
+            case WARN:
+                write(Project.MSG_WARN, msg);
+                break;
+            case ERROR:
+                write(Project.MSG_ERR, msg);
+                break;
+            }
+        }
+        
+    }
 }

From 612e0b2edd62c43aaa4b36a120323d6546428d3a Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Fri, 12 Jan 2024 19:30:50 +0100
Subject: [PATCH 242/299] initial implementation

---
 .../src/main/java/org/apache/rat/Report.java  |   5 +-
 .../org/apache/rat/ReportConfiguration.java   |   8 +-
 .../java/org/apache/rat/utils/DefaultLog.java |  18 ++++
 .../main/java/org/apache/rat/utils/Log.java   |  20 +++-
 .../org/apache/rat/utils/ReportingSet.java    |  56 +++++++++-
 .../apache/rat/ReportConfigurationTest.java   | 101 +++++++++++++++++-
 6 files changed, 193 insertions(+), 15 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index f5d856428..960f1f61d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -29,7 +29,6 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.SortedSet;
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.commons.cli.CommandLine;
@@ -47,8 +46,6 @@
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.config.AddLicenseHeaders;
-import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.utils.DefaultLog;
@@ -263,7 +260,7 @@ static FilenameFilter parseExclusions(List<String> excludes) {
                 // wildcards to give users more choices to configure exclusions
                 orFilter.addFileFilter(new RegexFileFilter(exclusion));
                 orFilter.addFileFilter(new NameFileFilter(exclusion));
-                orFilter.addFileFilter(new WildcardFileFilter(exclusion));
+                orFilter.addFileFilter(WildcardFileFilter.builder().setWildcards(exclusion).get());
             } catch (PatternSyntaxException e) {
                 System.err.println("Will skip given exclusion '" + exclude + "' due to " + e);
             }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index a0f3f6488..ac89a10c8 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -72,8 +72,10 @@ public class ReportConfiguration {
     private IOFileFilter directoryFilter;
 
     public ReportConfiguration(Log log) {
-        families = new ReportingSet<>(LicenseFamilySetFactory.emptyLicenseFamilySet()).setLog(log);
-        licenses = new ReportingSet<>(LicenseSetFactory.emptyLicenseSet()).setLog(log);
+        families = new ReportingSet<>(LicenseFamilySetFactory.emptyLicenseFamilySet()).setLog(log)
+                .setMsgFormat( s -> String.format("LicenseFamily category: %s",  s.getFamilyCategory()));
+        licenses = new ReportingSet<>(LicenseSetFactory.emptyLicenseSet()).setLog(log)
+                .setMsgFormat( s -> String.format( "License %s (%s) of type %s", s.getName(), s.getId(), s.getLicenseFamily().getFamilyCategory()));
         approvedLicenseCategories = new TreeSet<>();
         removedLicenseCategories = new TreeSet<>();
         directoryFilter = NameBasedHiddenFileFilter.HIDDEN;
@@ -275,7 +277,7 @@ public IOSupplier<PrintWriter> getWriter() {
     public void addLicense(ILicense license) {
         if (license != null) {
             this.licenses.add(license);
-            this.families.add(license.getLicenseFamily());
+            this.families.addIfNotPresent(license.getLicenseFamily());
         }
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
index abf8e6c9e..8cc6794ff 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.utils;
 
 /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
index 4d76ebf7b..2d5c48968 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
@@ -1,7 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.utils;
 
-import java.util.function.Consumer;
-
 /**
  * The definition of logging for the core.  UIs are expected to provide an implementation of 
  * Log to log data to the appropriate system within the UI.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
index 0edb1d3f3..a48901410 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ */
 package org.apache.rat.utils;
 
 import java.util.Collection;
@@ -7,6 +25,7 @@
 import java.util.Spliterator;
 import java.util.TreeSet;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
@@ -19,6 +38,7 @@ public class ReportingSet<T> implements SortedSet<T> {
     private boolean failOnDuplicate = false;
     private Log.Level duplicateLogLevel = Log.Level.WARN;
     private Log log = DefaultLog.INSTANCE;
+    private Function<T,String> duplicateFmt = (t) -> String.format("Duplicate %s (%s) detected %s", t.getClass(), t);
 
     /**
      * Constructor.
@@ -37,6 +57,15 @@ public ReportingSet(SortedSet<T> delegate) {
         this.delegate = delegate;
     }
 
+    /**
+     * Set the message format used to format display.
+     * @param msgFormat a format string taking the Class name and string representation of the 
+     * @return
+     */
+    public ReportingSet<T> setMsgFormat(Function<T,String> msgFmt) {
+        duplicateFmt = msgFmt;
+        return this;
+    }
     /**
      * If set true attempts to duplicate will throw an IllegalArgumentException.
      * The default state is false;.
@@ -75,12 +104,33 @@ private ReportingSet<T> sameConfig(SortedSet<T> delegate) {
         return result.setFailOnDuplicate(this.failOnDuplicate).setLog(this.log).setLogLevel(this.duplicateLogLevel);
     }
 
+    /**
+     * Adds the item if it is not present.  Does not report collisions.
+     * @param e the item to add.
+     * @return true if the item was added, false otherwise.
+     */
+    public boolean addIfNotPresent(T e) {
+        return add(false, e);
+    }
+    
     @Override
     public boolean add(T e) {
+        return add(true, e);
+    }
+    
+    /**
+     * Attempts to add an item.  Report failures if reportDup is true.
+     * @param reportDup the reporting flag.
+     * @param e the item to add
+     * @return true if the item was added.
+     */
+    private boolean add(boolean reportDup, T e) {
         if (delegate.contains(e)) {
-            String msg = String.format("Duplicate %s detected %s", e,
-                    failOnDuplicate ? "" : " - duplicate ignored");
-            log.log(duplicateLogLevel, msg);
+            String msg = String.format("%s",ReportingSet.this.duplicateFmt.apply(e));
+            if (reportDup) {
+                msg +=  failOnDuplicate ? "" : " - duplicate ignored";
+                log.log(duplicateLogLevel, msg);
+            } 
             if (failOnDuplicate) {
                 throw new IllegalArgumentException(msg);
             }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index cf48a6348..ca48e970c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -19,6 +19,9 @@
 package org.apache.rat;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -43,6 +46,7 @@
 import org.apache.commons.io.filefilter.FalseFileFilter;
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.rat.ReportConfiguration.NoCloseOutputStream;
+import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.config.AddLicenseHeaders;
 import org.apache.rat.configuration.ConfigurationReaderTest;
 import org.apache.rat.license.ILicense;
@@ -50,19 +54,22 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.testhelpers.TestingLicense;
-import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.utils.Log;
+import org.apache.rat.utils.Log.Level;
 import org.apache.rat.walker.NameBasedHiddenFileFilter;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class ReportConfigurationTest {
 
     private ReportConfiguration underTest;
+    private LoggingCapture log;
 
     @Before
     public void setup() {
-        underTest = new ReportConfiguration((Log)DefaultLog.INSTANCE);
+        log = new LoggingCapture();
+        underTest = new ReportConfiguration(log);
     }
 
     @Test
@@ -359,7 +366,7 @@ public void testValidate() {
     
     @Test
     public void testSetOut() throws IOException {
-        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
+        ReportConfiguration config = new ReportConfiguration(log);
         OutputStreamIntercepter osi = new OutputStreamIntercepter();
         config.setOut(() -> osi);
         assertThat(osi.closeCount).isEqualTo(0);
@@ -373,6 +380,79 @@ public void testSetOut() throws IOException {
         assertThat(osi.closeCount).isEqualTo(2);
     }
     
+    @Test
+    public void testDuplicateFamilyWarns() {
+        underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name"));
+        assertFalse(log.captured.toString().contains("CAT"));
+        
+        // verify second setting changes logs issue
+        underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
+        assertTrue(log.captured.toString().contains("CAT"));
+        
+        // verify name not changed
+        assertEquals("name", underTest.getLicenseFamilies(LicenseFilter.all).stream()
+                .filter(s -> s.getFamilyCategory().equals("CAT  ")).map(s -> s.getFamilyName()).findFirst().get());
+    }
+    
+    @Test
+    public void testSettingDuplicateFamilyLogLevelWorks() {
+        underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name"));
+        assertFalse(log.captured.toString().contains("CAT"));
+        
+        // verify second setting changes logs level
+        underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
+        assertTrue(log.captured.toString().contains("WARN"));
+        
+        
+        log.clear();
+        underTest.logFamilyCollisions(Level.ERROR);
+        underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
+        assertTrue(log.captured.toString().contains("ERROR"));
+        
+    }
+    
+    @Test
+    public void testDuplicateLicenseWarns() {
+        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("family name").build();
+        IHeaderMatcher matcher = Mockito.mock(IHeaderMatcher.class);
+        when(matcher.getId()).thenReturn("Macher ID");
+        underTest.addFamily(family);
+        underTest.addLicense(ILicense.builder().setId("ID").setName("license name").setLicenseFamilyCategory(family.getFamilyCategory())
+                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        assertFalse(log.captured.toString().contains("ID"));
+        
+        // verify second setting changes logs issue
+        underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setLicenseFamilyCategory(family.getFamilyCategory())
+                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        assertTrue(log.captured.toString().contains("ID"));        
+        // verify name not changed
+        assertEquals("license name", underTest.getLicenses(LicenseFilter.all).stream()
+                .filter(s -> s.getLicenseFamily().getFamilyCategory().equals("CAT  ")).map(s -> s.getName()).findFirst().get());
+    }
+    
+    @Test
+    public void testSettingDuplicateLicenseLogLevelWorks() {
+        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("family name").build();
+        IHeaderMatcher matcher = Mockito.mock(IHeaderMatcher.class);
+        when(matcher.getId()).thenReturn("Macher ID");
+        underTest.addFamily(family);
+        underTest.addLicense(ILicense.builder().setId("ID").setName("license name").setLicenseFamilyCategory(family.getFamilyCategory())
+                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        
+        // verify second setting changes logs issue
+        underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setLicenseFamilyCategory(family.getFamilyCategory())
+                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        assertTrue(log.captured.toString().contains("WARN"));
+        
+        log.clear();
+        underTest.logLicenseCollisions(Level.ERROR);
+        
+        // verify second setting changes logs issue
+        underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setLicenseFamilyCategory(family.getFamilyCategory())
+                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        assertTrue(log.captured.toString().contains("ERROR"));
+    }
+    
     /**
      * Validates that the configuration contains the default approved licenses.
      * @param config The configuration to test.
@@ -441,6 +521,21 @@ public static void validateDefault(ReportConfiguration config) {
         validateDefaultLicenses(config);
     }
     
+    private class LoggingCapture implements Log {
+
+        StringBuilder captured = new StringBuilder();
+        
+        public void clear() {
+            captured = new StringBuilder();
+        }
+        
+        @Override
+        public void log(Level level, String msg) {
+            captured.append( String.format("%s: %s%n", level, msg));
+        }
+        
+    }
+    
     static class OutputStreamIntercepter extends OutputStream {
         
         int closeCount = 0;

From fc72300e60714e1beb348c06c2316574cb087466 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 13 Jan 2024 17:14:45 +0100
Subject: [PATCH 243/299] Added logging of license and family collisions. Also
 upgraded to Junit 5

---
 apache-rat-api/pom.xml                        |   5 -
 .../api/domain/LicenseFamilyBuilderTest.java  | 126 ++---
 .../rat/api/domain/RatLicenseFamilyTest.java  | 452 +++++++++---------
 apache-rat-core/pom.xml                       |  13 +-
 .../src/main/java/org/apache/rat/Report.java  |  89 ++--
 .../org/apache/rat/ReportConfiguration.java   |  61 ++-
 .../apache/rat/license/LicenseSetFactory.java |   6 +-
 .../main/java/org/apache/rat/utils/Log.java   |   2 +-
 .../org/apache/rat/utils/ReportingSet.java    |  32 +-
 .../java/org/apache/rat/DefaultsTest.java     |   9 +-
 .../apache/rat/ReportConfigurationTest.java   | 111 +++--
 .../test/java/org/apache/rat/ReportTest.java  |  24 +-
 .../org/apache/rat/ReportTransformerTest.java |   5 +-
 .../java/org/apache/rat/ReporterTest.java     |  12 +-
 .../rat/analysis/AnalyserFactoryTest.java     |  31 +-
 .../rat/analysis/HeaderCheckWorkerTest.java   |   7 +-
 .../analysis/license/AbstractLicenseTest.java |  77 ++-
 .../license/ApacheSoftwareLicenseTest.java    |   9 +-
 .../AppliedApacheSoftwareLicenseTest.java     |   9 +-
 .../analysis/license/CDDL1LicenseTest.java    |   8 +-
 .../analysis/license/DirectoryScanner.java    |  10 +-
 .../rat/analysis/license/GPLLicenseTest.java  |  28 +-
 .../license/GeneratedLicenseTest.java         |   9 +-
 .../analysis/license/IllumosLicenseTest.java  |   9 +-
 .../rat/analysis/license/MITLicenseTest.java  |   8 +-
 .../analysis/license/OASISLicenseTest.java    |   8 +-
 .../rat/analysis/license/W3CLicenseTest.java  |  26 +-
 .../rat/analysis/matchers/AndMatcherTest.java |   5 +-
 .../matchers/CopyrightMatcherTest.java        | 142 +++---
 .../matchers/FullTextMatcherTest.java         |   9 +-
 .../rat/analysis/matchers/NotMatcherTest.java |  16 +-
 .../rat/analysis/matchers/OrMatcherTest.java  |  16 +-
 .../analysis/matchers/SPDXMatcherTest.java    |   8 +-
 .../matchers/SimpleCopyrightTests.java        |   4 +-
 .../matchers/SimpleRegexMatcherTest.java      |   8 +-
 .../matchers/SimpleTextMatcherTest.java       |   8 +-
 .../rat/annotation/TestLicenseAppender.java   | 214 +++------
 .../rat/config/AddLicenseHeadersTest.java     |   8 +-
 .../apache/rat/config/ReportFormatTest.java   |  10 +-
 .../SourceCodeManagementSystemsTest.java      |  18 +-
 .../ConfigurationReaderTest.java              |  10 +-
 .../apache/rat/configuration/FormatTest.java  |   6 +-
 .../rat/document/ToNameTransformerTest.java   |  14 +-
 .../impl/SingularFileDocumentTest.java        |  18 +-
 .../impl/guesser/ArchiveGuesserTest.java      |   4 +-
 .../impl/guesser/BinaryGuesserTest.java       |  14 +-
 .../document/impl/guesser/GuessUtilsTest.java |   4 +-
 .../impl/guesser/NoteGuesserTest.java         |   4 +-
 .../util/DocumentAnalyserMultiplexerTest.java |  20 +-
 .../rat/header/ArrayCharFilterTest.java       |  12 +-
 .../header/FilteringSequenceFactoryTest.java  |  20 +-
 .../apache/rat/header/HeaderMatcherTest.java  |  25 +-
 .../header/HeaderMatcherWithBeansTest.java    |  29 +-
 .../apache/rat/policy/DefaultPolicyTest.java  |  24 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |  37 +-
 .../apache/rat/report/xml/XmlReportTest.java  |  13 +-
 .../report/xml/writer/XmlWriterUtilsTest.java |  12 +-
 .../xml/writer/impl/base/XmlWriterTest.java   | 437 ++++++++---------
 .../org/apache/rat/testhelpers/TextUtils.java |  12 +-
 .../org/apache/rat/testhelpers/XmlUtils.java  |   4 +-
 .../rat/walker/DirectoryWalkerTest.java       |  31 +-
 .../rat/walker/FileNameComparatorTest.java    |   8 +-
 .../resources/violations/FilterTest.cs.new    | 109 +++++
 apache-rat-plugin/pom.xml                     |  15 +-
 .../rat/mp/util/ExclusionHelperTest.java      |  36 +-
 .../rat/mp/util/ScmIgnoreParserTest.java      |  42 +-
 apache-rat-tasks/pom.xml                      |   8 +-
 apache-rat-tools/pom.xml.new                  | 104 ++++
 pom.xml                                       |  42 +-
 69 files changed, 1546 insertions(+), 1220 deletions(-)
 create mode 100644 apache-rat-core/src/test/resources/violations/FilterTest.cs.new
 create mode 100644 apache-rat-tools/pom.xml.new

diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
index 7fde60273..2a5c798e3 100644
--- a/apache-rat-api/pom.xml
+++ b/apache-rat-api/pom.xml
@@ -28,11 +28,6 @@
   <description>Shared beans and services.</description>
   <dependencies>
     <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
diff --git a/apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java b/apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java
index 3883e90a4..a86d7712b 100644
--- a/apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java
+++ b/apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java
@@ -1,63 +1,63 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.api.domain;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class LicenseFamilyBuilderTest {
-
-    @Test
-    public void testBuilderBuilds() {
-        final LicenseFamily family =
-                LicenseFamilyBuilder.aLicenseFamily().build();
-        assertNotNull("Builder should build", family);
-    }
-
-    @Test
-    public void testWithNotes() {
-        final String someNotes = "Some notes";
-        final LicenseFamily family =
-                LicenseFamilyBuilder.aLicenseFamily().withNotes(someNotes)
-                        .build();
-        assertThat(family.getNotes(), is(someNotes));
-    }
-
-    @Test
-    public void testWithCategory() {
-        final String someCategory = "Some license category";
-        final LicenseFamily family =
-                LicenseFamilyBuilder.aLicenseFamily()
-                        .withCategory(someCategory).build();
-        assertThat(family.getCategory(), is(someCategory));
-    }
-
-    @Test
-    public void testWithName() {
-        final String someName = "A name for a license";
-        final LicenseFamily family =
-                LicenseFamilyBuilder.aLicenseFamily().withName(someName)
-                        .build();
-        assertThat(family.getName(), is(someName));
-
-    }
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one
+// * or more contributor license agreements.  See the NOTICE file
+// * distributed with this work for additional information
+// * regarding copyright ownership.  The ASF licenses this file
+// *  to you under the Apache License, Version 2.0 (the
+// * "License"); you may not use this file except in compliance
+// *  with the License.  You may obtain a copy of the License at
+// *
+// *   http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing,
+// * software distributed under the License is distributed on an
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// * KIND, either express or implied.  See the License for the
+// * specific language governing permissions and limitations
+// * under the License.
+// */
+//package org.apache.rat.api.domain;
+//
+//import static org.hamcrest.CoreMatchers.is;
+//import static org.hamcrest.MatcherAssert.assertThat;
+//import static org.junit.Assert.assertNotNull;
+//
+//import org.junit.Test;
+//
+//public class LicenseFamilyBuilderTest {
+//
+//    @Test
+//    public void testBuilderBuilds() {
+//        final LicenseFamily family =
+//                LicenseFamilyBuilder.aLicenseFamily().build();
+//        assertNotNull("Builder should build", family);
+//    }
+//
+//    @Test
+//    public void testWithNotes() {
+//        final String someNotes = "Some notes";
+//        final LicenseFamily family =
+//                LicenseFamilyBuilder.aLicenseFamily().withNotes(someNotes)
+//                        .build();
+//        assertThat(family.getNotes(), is(someNotes));
+//    }
+//
+//    @Test
+//    public void testWithCategory() {
+//        final String someCategory = "Some license category";
+//        final LicenseFamily family =
+//                LicenseFamilyBuilder.aLicenseFamily()
+//                        .withCategory(someCategory).build();
+//        assertThat(family.getCategory(), is(someCategory));
+//    }
+//
+//    @Test
+//    public void testWithName() {
+//        final String someName = "A name for a license";
+//        final LicenseFamily family =
+//                LicenseFamilyBuilder.aLicenseFamily().withName(someName)
+//                        .build();
+//        assertThat(family.getName(), is(someName));
+//
+//    }
+//}
diff --git a/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java b/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
index 9270510e7..cee8b0f6a 100644
--- a/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
+++ b/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
@@ -1,226 +1,226 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.api.domain;
-
-import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
-import static org.apache.rat.api.domain.RatLicenseFamily.CDDL1;
-import static org.apache.rat.api.domain.RatLicenseFamily.DOJO;
-import static org.apache.rat.api.domain.RatLicenseFamily.GPL1;
-import static org.apache.rat.api.domain.RatLicenseFamily.GPL2;
-import static org.apache.rat.api.domain.RatLicenseFamily.GPL3;
-import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
-import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
-import static org.apache.rat.api.domain.RatLicenseFamily.TMF854;
-import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
-import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.junit.Test;
-
-public class RatLicenseFamilyTest {
-
-    @Test
-    public void testW3CLicenseFamilyCategory() {
-        assertThat(W3C.getCategory(), is("W3C  "));
-    }
-
-    @Test
-    public void testW3CLicenseFamilyName() {
-        assertThat(W3C.getName(), is("W3C Software Copyright"));
-    }
-
-    @Test
-    public void testW3CLicenseFamilyNotes() {
-        assertThat(
-                W3C.getNotes(),
-                is("Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231."));
-    }
-
-    @Test
-    public void testW3CDocLicenseFamilyCategory() {
-        assertThat(W3C_DOCUMENTATION.getCategory(), is("W3CD "));
-    }
-
-    @Test
-    public void testW3CDocLicenseFamilyName() {
-        assertThat(W3C_DOCUMENTATION.getName(), is("W3C Document Copyright"));
-    }
-
-    @Test
-    public void testW3CDocLicenseFamilyNotes() {
-        assertThat(
-                W3C_DOCUMENTATION.getNotes(),
-                is("Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231."));
-    }
-
-	@Test
-	public void testAPACHELicenseFamilyCategory() {
-		assertThat(APACHE.getCategory(), is("AL   "));
-	}
-
-	@Test
-	public void testAPACHELicenseFamilyName() {
-		assertThat(APACHE.getName(), is("Apache License Version 2.0"));
-	}
-
-	@Test
-	public void testAPACHELicenseFamilyNotes() {
-		assertThat(
-				APACHE.getNotes(),
-				is("Note that APACHE requires a NOTICE. All modifications require notes. See http://www.apache.org/licenses/LICENSE-2.0."));
-	}
-
-	@Test
-	public void testGPL1LicenseFamilyCategory() {
-		assertThat(GPL1.getCategory(), is("GPL1 "));
-	}
-
-	@Test
-	public void testGPL1LicenseFamilyName() {
-		assertThat(GPL1.getName(), is("GNU General Public License, version 1"));
-	}
-
-	@Test
-	public void testGPL1LicenseFamilyNotes() {
-		assertThat(
-				GPL1.getNotes(),
-				is("Note that GPL1 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-1.0.html."));
-	}
-
-	@Test
-	public void testGPL2LicenseFamilyCategory() {
-		assertThat(GPL2.getCategory(), is("GPL2 "));
-	}
-
-	@Test
-	public void testGPL2LicenseFamilyName() {
-		assertThat(GPL2.getName(), is("GNU General Public License, version 2"));
-	}
-
-	@Test
-	public void testGPL2LicenseFamilyNotes() {
-		assertThat(
-				GPL2.getNotes(),
-				is("Note that GPL2 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-2.0.html."));
-	}
-
-	@Test
-	public void testGPL3LicenseFamilyCategory() {
-		assertThat(GPL3.getCategory(), is("GPL3 "));
-	}
-
-	@Test
-	public void testGPL3LicenseFamilyName() {
-		assertThat(GPL3.getName(), is("GNU General Public License, version 3"));
-	}
-
-	@Test
-	public void testGPL3LicenseFamilyNotes() {
-		assertThat(
-				GPL3.getNotes(),
-				is("Note that GPL3 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-3.0.html."));
-	}
-
-	@Test
-	public void testMITLicenseFamilyCategory() {
-		assertThat(MIT.getCategory(), is("MIT  "));
-	}
-
-	@Test
-	public void testMITLicenseFamilyName() {
-		assertThat(MIT.getName(), is("The MIT License"));
-	}
-
-	@Test
-	public void testMITLicenseFamilyNotes() {
-		assertThat(
-				MIT.getNotes(),
-				is("Note that MIT requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/MIT."));
-	}
-
-	@Test
-	public void testCDDL1LicenseFamilyCategory() {
-		assertThat(CDDL1.getCategory(), is("CDDL1"));
-	}
-
-	@Test
-	public void testCDDL1LicenseFamilyName() {
-		assertThat(CDDL1.getName(),
-				is("COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"));
-	}
-
-	@Test
-	public void testCDDL1LicenseFamilyNotes() {
-		assertThat(
-				CDDL1.getNotes(),
-				is("Note that CDDL1 requires a NOTICE. All modifications require notes. See https://oss.oracle.com/licenses/CDDL."));
-	}
-
-	@Test
-	public void testOASISLicenseFamilyCategory() {
-		assertThat(OASIS.getCategory(), is("OASIS"));
-	}
-
-	@Test
-	public void testOASISLicenseFamilyName() {
-		assertThat(OASIS.getName(), is("OASIS Open License"));
-	}
-
-	@Test
-	public void testOASISLicenseFamilyNotes() {
-		assertThat(
-				OASIS.getNotes(),
-				is("Note that OASIS requires a NOTICE. All modifications require notes. See https://www.oasis-open.org/policies-guidelines/ipr."));
-	}
-	
-	@Test
-	public void testTMF854LicenseFamilyCategory() {
-		assertThat(TMF854.getCategory(), is("TMF  "));
-	}
-
-	@Test
-	public void testTMF854LicenseFamilyName() {
-		assertThat(TMF854.getName(), is("Modified BSD License"));
-	}
-
-	@Test
-	public void testTMF854LicenseFamilyNotes() {
-		assertThat(
-				TMF854.getNotes(),
-				is("Note that TMF854 requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/BSD-3-Clause."));
-	}
-	
-	@Test
-	public void testDOJOLicenseFamilyCategory() {
-		assertThat(DOJO.getCategory(), is("DOJO "));
-	}
-
-	@Test
-	public void testDOJOLicenseFamilyName() {
-		assertThat(DOJO.getName(), is("Modified BSD License"));
-	}
-
-	@Test
-	public void testDOJOLicenseFamilyNotes() {
-		assertThat(
-				DOJO.getNotes(),
-				is("Note that DOJO requires a NOTICE. All modifications require notes. See http://dojotoolkit.org/community/licensing.shtml."));
-	}
-}
+///*
+// * Licensed to the Apache Software Foundation (ASF) under one
+// * or more contributor license agreements.  See the NOTICE file
+// * distributed with this work for additional information
+// * regarding copyright ownership.  The ASF licenses this file
+// *  to you under the Apache License, Version 2.0 (the
+// * "License"); you may not use this file except in compliance
+// *  with the License.  You may obtain a copy of the License at
+// *
+// *   http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing,
+// * software distributed under the License is distributed on an
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// * KIND, either express or implied.  See the License for the
+// * specific language governing permissions and limitations
+// * under the License.
+// */
+//package org.apache.rat.api.domain;
+//
+//import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
+//import static org.apache.rat.api.domain.RatLicenseFamily.CDDL1;
+//import static org.apache.rat.api.domain.RatLicenseFamily.DOJO;
+//import static org.apache.rat.api.domain.RatLicenseFamily.GPL1;
+//import static org.apache.rat.api.domain.RatLicenseFamily.GPL2;
+//import static org.apache.rat.api.domain.RatLicenseFamily.GPL3;
+//import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
+//import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
+//import static org.apache.rat.api.domain.RatLicenseFamily.TMF854;
+//import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
+//import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
+//import static org.hamcrest.CoreMatchers.is;
+//import static org.hamcrest.MatcherAssert.assertThat;
+//
+//import org.junit.Test;
+//
+//public class RatLicenseFamilyTest {
+//
+//    @Test
+//    public void testW3CLicenseFamilyCategory() {
+//        assertThat(W3C.getCategory(), is("W3C  "));
+//    }
+//
+//    @Test
+//    public void testW3CLicenseFamilyName() {
+//        assertThat(W3C.getName(), is("W3C Software Copyright"));
+//    }
+//
+//    @Test
+//    public void testW3CLicenseFamilyNotes() {
+//        assertThat(
+//                W3C.getNotes(),
+//                is("Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231."));
+//    }
+//
+//    @Test
+//    public void testW3CDocLicenseFamilyCategory() {
+//        assertThat(W3C_DOCUMENTATION.getCategory(), is("W3CD "));
+//    }
+//
+//    @Test
+//    public void testW3CDocLicenseFamilyName() {
+//        assertThat(W3C_DOCUMENTATION.getName(), is("W3C Document Copyright"));
+//    }
+//
+//    @Test
+//    public void testW3CDocLicenseFamilyNotes() {
+//        assertThat(
+//                W3C_DOCUMENTATION.getNotes(),
+//                is("Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231."));
+//    }
+//
+//	@Test
+//	public void testAPACHELicenseFamilyCategory() {
+//		assertThat(APACHE.getCategory(), is("AL   "));
+//	}
+//
+//	@Test
+//	public void testAPACHELicenseFamilyName() {
+//		assertThat(APACHE.getName(), is("Apache License Version 2.0"));
+//	}
+//
+//	@Test
+//	public void testAPACHELicenseFamilyNotes() {
+//		assertThat(
+//				APACHE.getNotes(),
+//				is("Note that APACHE requires a NOTICE. All modifications require notes. See http://www.apache.org/licenses/LICENSE-2.0."));
+//	}
+//
+//	@Test
+//	public void testGPL1LicenseFamilyCategory() {
+//		assertThat(GPL1.getCategory(), is("GPL1 "));
+//	}
+//
+//	@Test
+//	public void testGPL1LicenseFamilyName() {
+//		assertThat(GPL1.getName(), is("GNU General Public License, version 1"));
+//	}
+//
+//	@Test
+//	public void testGPL1LicenseFamilyNotes() {
+//		assertThat(
+//				GPL1.getNotes(),
+//				is("Note that GPL1 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-1.0.html."));
+//	}
+//
+//	@Test
+//	public void testGPL2LicenseFamilyCategory() {
+//		assertThat(GPL2.getCategory(), is("GPL2 "));
+//	}
+//
+//	@Test
+//	public void testGPL2LicenseFamilyName() {
+//		assertThat(GPL2.getName(), is("GNU General Public License, version 2"));
+//	}
+//
+//	@Test
+//	public void testGPL2LicenseFamilyNotes() {
+//		assertThat(
+//				GPL2.getNotes(),
+//				is("Note that GPL2 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-2.0.html."));
+//	}
+//
+//	@Test
+//	public void testGPL3LicenseFamilyCategory() {
+//		assertThat(GPL3.getCategory(), is("GPL3 "));
+//	}
+//
+//	@Test
+//	public void testGPL3LicenseFamilyName() {
+//		assertThat(GPL3.getName(), is("GNU General Public License, version 3"));
+//	}
+//
+//	@Test
+//	public void testGPL3LicenseFamilyNotes() {
+//		assertThat(
+//				GPL3.getNotes(),
+//				is("Note that GPL3 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-3.0.html."));
+//	}
+//
+//	@Test
+//	public void testMITLicenseFamilyCategory() {
+//		assertThat(MIT.getCategory(), is("MIT  "));
+//	}
+//
+//	@Test
+//	public void testMITLicenseFamilyName() {
+//		assertThat(MIT.getName(), is("The MIT License"));
+//	}
+//
+//	@Test
+//	public void testMITLicenseFamilyNotes() {
+//		assertThat(
+//				MIT.getNotes(),
+//				is("Note that MIT requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/MIT."));
+//	}
+//
+//	@Test
+//	public void testCDDL1LicenseFamilyCategory() {
+//		assertThat(CDDL1.getCategory(), is("CDDL1"));
+//	}
+//
+//	@Test
+//	public void testCDDL1LicenseFamilyName() {
+//		assertThat(CDDL1.getName(),
+//				is("COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"));
+//	}
+//
+//	@Test
+//	public void testCDDL1LicenseFamilyNotes() {
+//		assertThat(
+//				CDDL1.getNotes(),
+//				is("Note that CDDL1 requires a NOTICE. All modifications require notes. See https://oss.oracle.com/licenses/CDDL."));
+//	}
+//
+//	@Test
+//	public void testOASISLicenseFamilyCategory() {
+//		assertThat(OASIS.getCategory(), is("OASIS"));
+//	}
+//
+//	@Test
+//	public void testOASISLicenseFamilyName() {
+//		assertThat(OASIS.getName(), is("OASIS Open License"));
+//	}
+//
+//	@Test
+//	public void testOASISLicenseFamilyNotes() {
+//		assertThat(
+//				OASIS.getNotes(),
+//				is("Note that OASIS requires a NOTICE. All modifications require notes. See https://www.oasis-open.org/policies-guidelines/ipr."));
+//	}
+//	
+//	@Test
+//	public void testTMF854LicenseFamilyCategory() {
+//		assertThat(TMF854.getCategory(), is("TMF  "));
+//	}
+//
+//	@Test
+//	public void testTMF854LicenseFamilyName() {
+//		assertThat(TMF854.getName(), is("Modified BSD License"));
+//	}
+//
+//	@Test
+//	public void testTMF854LicenseFamilyNotes() {
+//		assertThat(
+//				TMF854.getNotes(),
+//				is("Note that TMF854 requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/BSD-3-Clause."));
+//	}
+//	
+//	@Test
+//	public void testDOJOLicenseFamilyCategory() {
+//		assertThat(DOJO.getCategory(), is("DOJO "));
+//	}
+//
+//	@Test
+//	public void testDOJOLicenseFamilyName() {
+//		assertThat(DOJO.getName(), is("Modified BSD License"));
+//	}
+//
+//	@Test
+//	public void testDOJOLicenseFamilyNotes() {
+//		assertThat(
+//				DOJO.getNotes(),
+//				is("Note that DOJO requires a NOTICE. All modifications require notes. See http://dojotoolkit.org/community/licensing.shtml."));
+//	}
+//}
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index f1cdccbe4..e5637a66e 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -113,9 +113,16 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 960f1f61d..6eda20647 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -30,6 +30,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
@@ -49,6 +50,7 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.utils.DefaultLog;
+import org.apache.rat.utils.Log.Level;
 import org.apache.rat.walker.ArchiveWalker;
 import org.apache.rat.walker.DirectoryWalker;
 
@@ -101,30 +103,19 @@ public class Report {
     /**
      * List the licenses that were used for the run.
      */
-    private static final String LIST_LICENSES_ALL = "list-licenses-all";
-
-    /**
-     * List the licenses that were used for the run.
-     */
-    private static final String LIST_LICENSES_APPROVED = "list-licenses-approved";
+    private static final String LIST_LICENSES = "list-licenses";
 
     /**
      * List the all families for the run.
      */
-    private static final String LIST_FAMILIES_ALL = "list-families-all";
+    private static final String LIST_FAMILIES = "list-families";
 
-    /**
-     * List the approved families for the run.
-     */
-    private static final String LIST_FAMILIES_APPROVED = "list-families-approved";
 
     /**
      * Set unstyled XML output
      */
     private static final String XML = "x";
 
-    private static OptionGroup LIST_LICENSES;
-    private static OptionGroup LIST_FAMILIES;
 
     /**
      * Processes the command line and builds a configuration and executes the
@@ -158,21 +149,24 @@ public static void main(String[] args) throws Exception {
             ReportConfiguration configuration = createConfiguration(args[0], cl);
             configuration.validate(System.err::println);
 
-            if (LIST_FAMILIES.getSelected() != null || LIST_LICENSES.getSelected() != null) {
-
-                if (cl.hasOption(LIST_FAMILIES_ALL)) {
-                    Reporter.listLicenseFamilies(configuration, LicenseFilter.all);
-                }
-                if (cl.hasOption(LIST_FAMILIES_APPROVED)) {
-                    Reporter.listLicenseFamilies(configuration, LicenseFilter.approved);
+            boolean dryRun = false;
+            
+            if (cl.hasOption(LIST_FAMILIES)) {
+                LicenseFilter f = LicenseFilter.fromText(cl.getOptionValue(LIST_FAMILIES));
+                if (f != LicenseFilter.none) {                        
+                    dryRun = true;
+                    Reporter.listLicenseFamilies(configuration, f);
                 }
-                if (cl.hasOption(LIST_LICENSES_ALL)) {
-                    Reporter.listLicenses(configuration, LicenseFilter.all);
-                }
-                if (cl.hasOption(LIST_LICENSES_APPROVED)) {
-                    Reporter.listLicenses(configuration, LicenseFilter.approved);
+            }
+            if (cl.hasOption(LIST_LICENSES)) {
+                LicenseFilter f = LicenseFilter.fromText(cl.getOptionValue(LIST_LICENSES));
+                if (f != LicenseFilter.none) {                        
+                    dryRun = true;
+                    Reporter.listLicenses(configuration, f);
                 }
-            } else {
+            }
+            
+            if (!dryRun) {
                 Reporter.report(configuration);
             }
         }
@@ -270,21 +264,22 @@ static FilenameFilter parseExclusions(List<String> excludes) {
     }
 
     static Options buildOptions() {
-        LIST_FAMILIES = new OptionGroup()
-                .addOption(
-                        Option.builder().longOpt(LIST_FAMILIES_ALL).desc("List all defined license families").build())
-                .addOption(Option.builder().longOpt(LIST_FAMILIES_APPROVED)
-                        .desc("List approved defined license families").build());
-
-        LIST_LICENSES = new OptionGroup()
-                .addOption(Option.builder().longOpt(LIST_LICENSES_ALL).desc("List all active licenses").build())
-                .addOption(
-                        Option.builder().longOpt(LIST_LICENSES_APPROVED).desc("List approved active licenses").build());
-
-        Options opts = new Options();
-
-        Option help = new Option(HELP, "help", false, "Print help for the RAT command line interface and exit");
-        opts.addOption(help);
+        String licFilterValues = String.join(", ", 
+                Arrays.stream(LicenseFilter.values()).map(LicenseFilter::name).collect(Collectors.toList()));
+
+        Options opts = new Options()
+        
+        .addOption(
+                Option.builder().hasArg(true).longOpt(LIST_FAMILIES)
+                .desc("List the defined license families Valid options are: "+licFilterValues+". Default=none")
+                .build())
+        .addOption(
+                Option.builder().hasArg(true).longOpt(LIST_LICENSES)
+                .desc("List the defined licenses Valid options are: "+licFilterValues+". Default=none")
+                .build())
+
+        .addOption(new Option(HELP, "help", false, "Print help for the RAT command line interface and exit"));
+        
 
         Option out = new Option("o", "out", true,
                 "Define the output file where to write report (default is System.out)");
@@ -295,9 +290,6 @@ static Options buildOptions() {
         opts.addOption(noDefaults);
 
         opts.addOption(null, LICENSES, true, "File names or URLs for license definitions");
-        opts.addOptionGroup(LIST_LICENSES);
-
-        opts.addOptionGroup(LIST_FAMILIES);
         opts.addOption(null, SCAN_HIDDEN_DIRECTORIES, false, "Scan hidden directories");
 
         OptionGroup addLicenseGroup = new OptionGroup();
@@ -380,10 +372,9 @@ private Report() {
     private static IReportable getDirectory(String baseDirectory, ReportConfiguration config) {
         try (PrintStream out = new PrintStream(config.getOutput().get())) {
             File base = new File(baseDirectory);
+            
             if (!base.exists()) {
-                out.print("ERROR: ");
-                out.print(baseDirectory);
-                out.print(" does not exist.\n");
+                config.getLog().log(Level.ERROR, "Directory '"+baseDirectory+"' does not exist");
                 return null;
             }
 
@@ -394,9 +385,7 @@ private static IReportable getDirectory(String baseDirectory, ReportConfiguratio
             try {
                 return new ArchiveWalker(base, config.getInputFileFilter());
             } catch (IOException ex) {
-                out.print("ERROR: ");
-                out.print(baseDirectory);
-                out.print(" is not valid gzip data.\n");
+                config.getLog().log(Level.ERROR, "file '"+baseDirectory+"' is not valid gzip data.");
                 return null;
             }
         } catch (IOException e) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index ac89a10c8..91b78c6f9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -70,31 +70,63 @@ public class ReportConfiguration {
     private IReportable reportable;
     private FilenameFilter inputFileFilter;
     private IOFileFilter directoryFilter;
+    private Log log;
 
+   
+    /**
+     * Constructor
+     * @param log The Log implementation that messages will be written to.
+     */
     public ReportConfiguration(Log log) {
+        this.log = log;
         families = new ReportingSet<>(LicenseFamilySetFactory.emptyLicenseFamilySet()).setLog(log)
-                .setMsgFormat( s -> String.format("LicenseFamily category: %s",  s.getFamilyCategory()));
+                .setMsgFormat( s -> String.format("Duplicate LicenseFamily category: %s",  s.getFamilyCategory()));
         licenses = new ReportingSet<>(LicenseSetFactory.emptyLicenseSet()).setLog(log)
-                .setMsgFormat( s -> String.format( "License %s (%s) of type %s", s.getName(), s.getId(), s.getLicenseFamily().getFamilyCategory()));
+                .setMsgFormat( s -> String.format( "Duplicate License %s (%s) of type %s", s.getName(), s.getId(), s.getLicenseFamily().getFamilyCategory()));
         approvedLicenseCategories = new TreeSet<>();
         removedLicenseCategories = new TreeSet<>();
         directoryFilter = NameBasedHiddenFileFilter.HIDDEN;
+        styleReport = true;
     }
     
+    /**
+     * Retrieves the Log that was provided in the constructor.
+     * @return the Log for the system.
+     */
+    public Log getLog() {
+        return log;
+    }
+    /**
+     * Set the log level for reporting collisions in the set of license families.
+     * <p>NOTE: should be set before licenses or license families are added.</p>
+     * @param level The log level to use.
+     */
     public void logFamilyCollisions(Log.Level level) {
         families.setLogLevel(level);
     }
     
-    public void failFamilyCollisions(boolean state) {
-        families.setFailOnDuplicate(state);
+    /**
+     * Sets the reporting option for duplicate license families.
+     * @param state The ReportingSet.Option to use for reporting.
+     */
+    public void familyDuplicateOption(ReportingSet.Options state) {
+        families.setDuplicateOption(state);
     }
 
+    /**
+     * Sets the log level for reporting license collisions.
+     * @param level The log level.
+     */
     public void logLicenseCollisions(Log.Level level) {
         licenses.setLogLevel(level);
     }
     
-    public void failLicenseCollisions(boolean state) {
-        licenses.setFailOnDuplicate(state);
+    /**
+     * Sets the reporting option for duplicate licenses.
+     * @param state the ReportingSt.Option to use for reporting.
+     */
+    public void licenseDuplicateOption(ReportingSet.Options state) {
+        licenses.setDuplicateOption(state);
     }
     
     /**
@@ -168,7 +200,7 @@ public void setStyleSheet(IOSupplier<InputStream> styleSheet) {
      * @param defaults The defaults to set.
      */
     public void setFrom(Defaults defaults) {
-        addLicenses(defaults.getLicenses(LicenseFilter.all));
+        addLicensesIfNotPresent(defaults.getLicenses(LicenseFilter.all));
         addApprovedLicenseCategories(defaults.getLicenseIds(LicenseFilter.approved));
         if (isStyleReport() && getStyleSheet() == null) {
             setStyleSheet(Defaults.getPlainStyleSheet());
@@ -307,6 +339,17 @@ public void addLicenses(Collection<ILicense> licenses) {
         licenses.stream().map(ILicense::getLicenseFamily).forEach(families::add);
     }
 
+    /**
+     * Adds multiple licenses to the list of licenses. Does not add the licenses to
+     * the list of approved licenses.
+     *
+     * @param licenses The licenses to add.
+     */
+    public void addLicensesIfNotPresent(Collection<ILicense> licenses) {
+        this.licenses.addAllIfNotPresent(licenses);
+        licenses.stream().map(ILicense::getLicenseFamily).forEach(families::addIfNotPresent);
+    }
+    
     /**
      * Adds a license family to the list of families. Does not add the family to the
      * list of approved licenses.
@@ -342,10 +385,6 @@ public void addFamilies(Collection<ILicenseFamily> families) {
         this.families.addAll(families);
     }
 
-//    public SortedSet<ILicenseFamily> getFamilies() {
-//        return Collections.unmodifiableSortedSet(families);
-//    }
-
     /**
      * Adds an ILicenseFamily to the list of approved licenses.
      *
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
index 24ff1dff5..4d805ec1b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -36,7 +36,11 @@ public enum LicenseFilter {
         /** Only approved licenses are returned */
         approved,
         /** No licenses are returned */
-        none
+        none;
+        
+        static public LicenseFilter fromText(String s) {
+            return LicenseFilter.valueOf(s.toLowerCase());
+        }
     }
 
     private final SortedSet<ILicense> licenses;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
index 2d5c48968..f70521bb5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
@@ -26,7 +26,7 @@ public interface Log {
     /**
      * The log levels supported by logging.
      */
-    public enum Level {DEBUG, INFO, WARN, ERROR };
+    public enum Level {OFF, DEBUG, INFO, WARN, ERROR };
 
     /**
      * Writes a message at a specific log level.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
index a48901410..6cf738a35 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
@@ -35,11 +35,13 @@
  */
 public class ReportingSet<T> implements SortedSet<T> {
     private final SortedSet<T> delegate;
-    private boolean failOnDuplicate = false;
+    private Options duplicateOption = Options.IGNORE;
     private Log.Level duplicateLogLevel = Log.Level.WARN;
     private Log log = DefaultLog.INSTANCE;
     private Function<T,String> duplicateFmt = (t) -> String.format("Duplicate %s (%s) detected %s", t.getClass(), t);
 
+    public enum Options { OVERWRITE, IGNORE, FAIL }
+    
     /**
      * Constructor.
      * Creates a TreeSet of type T.
@@ -72,8 +74,8 @@ public ReportingSet<T> setMsgFormat(Function<T,String> msgFmt) {
      * @param state the state to set.
      * @return this for chaining.
      */
-    public ReportingSet<T> setFailOnDuplicate(boolean state) {
-        this.failOnDuplicate = state;
+    public ReportingSet<T> setDuplicateOption(Options state) {
+        this.duplicateOption = state;
         return this;
     }
 
@@ -101,7 +103,7 @@ public ReportingSet<T> setLogLevel(Log.Level level) {
 
     private ReportingSet<T> sameConfig(SortedSet<T> delegate) {
         ReportingSet<T> result = delegate instanceof ReportingSet ? (ReportingSet<T>) delegate : new ReportingSet<>(delegate);
-        return result.setFailOnDuplicate(this.failOnDuplicate).setLog(this.log).setLogLevel(this.duplicateLogLevel);
+        return result.setDuplicateOption(this.duplicateOption).setLog(this.log).setLogLevel(this.duplicateLogLevel);
     }
 
     /**
@@ -128,13 +130,18 @@ private boolean add(boolean reportDup, T e) {
         if (delegate.contains(e)) {
             String msg = String.format("%s",ReportingSet.this.duplicateFmt.apply(e));
             if (reportDup) {
-                msg +=  failOnDuplicate ? "" : " - duplicate ignored";
+                msg =  String.format( "%s (action: %s)", msg, duplicateOption);
                 log.log(duplicateLogLevel, msg);
-            } 
-            if (failOnDuplicate) {
+            }
+            switch (duplicateOption) {
+            case FAIL:
                 throw new IllegalArgumentException(msg);
+            case IGNORE:
+                return false;
+            case OVERWRITE:
+                delegate.remove(e);
+                return delegate.add(e);
             }
-            return false;
         }
         return delegate.add(e);
     }
@@ -148,6 +155,15 @@ public boolean addAll(Collection<? extends T> c) {
         return updated;
     }
 
+ 
+    public boolean addAllIfNotPresent(Collection<? extends T> c) {
+        boolean updated = false;
+        for (T e : c) {
+            updated |= addIfNotPresent(e);
+        }
+        return updated;
+    }
+    
     @Override
     public void clear() {
         delegate.clear();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index 478e1bcb8..ad4ebe5c9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
@@ -18,8 +18,10 @@
  */
 package org.apache.rat;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -27,7 +29,8 @@
 
 import org.apache.rat.license.ILicense;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class DefaultsTest {
     private static final String[] FAMILIES = { "BSD-3", "GEN  ", "AL   ", "OASIS", "W3CD ", "W3C  ", "GPL1 ",
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index ca48e970c..8cdd62312 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -19,9 +19,10 @@
 package org.apache.rat;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -40,6 +41,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.SortedSet;
+import java.util.function.Function;
 
 import org.apache.commons.io.filefilter.AndFileFilter;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
@@ -56,9 +58,10 @@
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.utils.Log;
 import org.apache.rat.utils.Log.Level;
+import org.apache.rat.utils.ReportingSet.Options;
 import org.apache.rat.walker.NameBasedHiddenFileFilter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class ReportConfigurationTest {
@@ -66,7 +69,7 @@ public class ReportConfigurationTest {
     private ReportConfiguration underTest;
     private LoggingCapture log;
 
-    @Before
+    @BeforeEach
     public void setup() {
         log = new LoggingCapture();
         underTest = new ReportConfiguration(log);
@@ -381,76 +384,106 @@ public void testSetOut() throws IOException {
     }
     
     @Test
-    public void testDuplicateFamilyWarns() {
+    public void logFamilyCollisionTest() {
+        // setup
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name"));
         assertFalse(log.captured.toString().contains("CAT"));
-        
-        // verify second setting changes logs issue
+       
+        // verify default collision logs WARNING
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-        assertTrue(log.captured.toString().contains("CAT"));
+        assertTrue(log.captured.toString().contains("WARN"), ()->"default value not WARN");
+        assertTrue(log.captured.toString().contains("CAT"), ()->"'CAT' not found");
         
-        // verify name not changed
-        assertEquals("name", underTest.getLicenseFamilies(LicenseFilter.all).stream()
-                .filter(s -> s.getFamilyCategory().equals("CAT  ")).map(s -> s.getFamilyName()).findFirst().get());
+        // verify level setting works.
+        for (Level l : Level.values()) {
+        log.clear();
+        underTest.logFamilyCollisions(l);
+        underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
+        assertTrue(log.captured.toString().contains("CAT"), ()->"'CAT' not found");
+        assertTrue(log.captured.toString().contains(l.name()), ()->"logging not set to "+l);
+        }
+
     }
     
     @Test
-    public void testSettingDuplicateFamilyLogLevelWorks() {
+    public void familyDuplicateOptionsTest() {
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name"));
         assertFalse(log.captured.toString().contains("CAT"));
         
-        // verify second setting changes logs level
+        // verify default second setting ignores change
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-        assertTrue(log.captured.toString().contains("WARN"));
-        
+        assertTrue(log.captured.toString().contains("CAT"));
+        assertEquals("name", underTest.getLicenseFamilies(LicenseFilter.all).stream()
+                .filter(s -> s.getFamilyCategory().equals("CAT  ")).map(s -> s.getFamilyName()).findFirst().get());
         
-        log.clear();
-        underTest.logFamilyCollisions(Level.ERROR);
+        underTest.familyDuplicateOption(Options.OVERWRITE);
+        // verify second setting ignores change
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-        assertTrue(log.captured.toString().contains("ERROR"));
-        
+        assertTrue(log.captured.toString().contains("CAT"));
+        assertEquals("name2", underTest.getLicenseFamilies(LicenseFilter.all).stream()
+                .filter(s -> s.getFamilyCategory().equals("CAT  ")).map(s -> s.getFamilyName()).findFirst().get());
+
+        // verify fail throws exception
+        underTest.familyDuplicateOption(Options.FAIL);
+        assertThrows( IllegalArgumentException.class, ()->underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2")));
+  
+        underTest.familyDuplicateOption(Options.IGNORE);
     }
     
+    
     @Test
-    public void testDuplicateLicenseWarns() {
+    public void logLicenseCollisionTest() {
+        // setup
         ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("family name").build();
         IHeaderMatcher matcher = Mockito.mock(IHeaderMatcher.class);
         when(matcher.getId()).thenReturn("Macher ID");
         underTest.addFamily(family);
         underTest.addLicense(ILicense.builder().setId("ID").setName("license name").setLicenseFamilyCategory(family.getFamilyCategory())
                 .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
-        assertFalse(log.captured.toString().contains("ID"));
+        
+        // verify default collistion logs WARN
+        underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setLicenseFamilyCategory(family.getFamilyCategory())
+                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        assertTrue(log.captured.toString().contains("WARN"));
+        
+        log.clear();
+        underTest.logLicenseCollisions(Level.ERROR);
         
         // verify second setting changes logs issue
         underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setLicenseFamilyCategory(family.getFamilyCategory())
                 .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
-        assertTrue(log.captured.toString().contains("ID"));        
-        // verify name not changed
-        assertEquals("license name", underTest.getLicenses(LicenseFilter.all).stream()
-                .filter(s -> s.getLicenseFamily().getFamilyCategory().equals("CAT  ")).map(s -> s.getName()).findFirst().get());
+        assertTrue(log.captured.toString().contains("ERROR"));
+
     }
     
     @Test
-    public void testSettingDuplicateLicenseLogLevelWorks() {
+    public void licenseDuplicateOptionsTest() {
+        // setup
         ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("family name").build();
         IHeaderMatcher matcher = Mockito.mock(IHeaderMatcher.class);
         when(matcher.getId()).thenReturn("Macher ID");
         underTest.addFamily(family);
-        underTest.addLicense(ILicense.builder().setId("ID").setName("license name").setLicenseFamilyCategory(family.getFamilyCategory())
-                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        Function<String,ILicense> makeLicense = s -> ILicense.builder().setId("ID").setName(s).setLicenseFamilyCategory(family.getFamilyCategory())
+                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all));
+                
+        underTest.addLicense(makeLicense.apply("license name"));
         
-        // verify second setting changes logs issue
-        underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setLicenseFamilyCategory(family.getFamilyCategory())
-                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
+        // verify default second setting ignores change
+        underTest.addLicense(makeLicense.apply("license name2"));
         assertTrue(log.captured.toString().contains("WARN"));
+        assertEquals("license name",
+                underTest.getLicenses(LicenseFilter.all).stream().map(ILicense::getName).findFirst().get());
         
-        log.clear();
-        underTest.logLicenseCollisions(Level.ERROR);
+        underTest.licenseDuplicateOption(Options.OVERWRITE);
+        underTest.addLicense(makeLicense.apply("license name2"));
+        assertEquals("license name2",
+                underTest.getLicenses(LicenseFilter.all).stream().map(ILicense::getName).findFirst().get());
         
-        // verify second setting changes logs issue
-        underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setLicenseFamilyCategory(family.getFamilyCategory())
-                .setMatcher( matcher ).build(underTest.getLicenseFamilies(LicenseFilter.all)));
-        assertTrue(log.captured.toString().contains("ERROR"));
+         
+        // verify fail throws exception
+        underTest.licenseDuplicateOption(Options.FAIL);
+        assertThrows( IllegalArgumentException.class, ()-> underTest.addLicense(makeLicense.apply("another name")));
+
     }
     
     /**
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index e9067c10b..60d13e0a0 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -18,7 +18,10 @@
  */
 package org.apache.rat;
 
-import static org.junit.Assert.assertNotNull;
+
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -31,8 +34,7 @@
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ReportTest {
     @Test
@@ -56,11 +58,11 @@ public void testOutputOption() throws Exception {
         ReportConfiguration config = Report.createConfiguration("target/test-classes/elements", cl);
         Reporter.report(config);
         File output = new File("target/test");
-        Assert.assertTrue(output.exists());
+        assertTrue(output.exists());
         String content = FileUtils.readFileToString(output, StandardCharsets.UTF_8);
-        Assert.assertTrue(content.contains("2 Unknown Licenses"));
-        Assert.assertTrue(content.contains("target/test-classes/elements/Source.java"));
-        Assert.assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
+        assertTrue(content.contains("2 Unknown Licenses"));
+        assertTrue(content.contains("target/test-classes/elements/Source.java"));
+        assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
     }
 
     @Test
@@ -71,11 +73,11 @@ public void testDefaultOutput() throws Exception {
         CommandLine cl = new DefaultParser().parse(Report.buildOptions(), new String[]{});
         ReportConfiguration config = Report.createConfiguration("target/test-classes/elements", cl);
         Reporter.report(config);
-        Assert.assertTrue(output.exists());
+        assertTrue(output.exists());
         String content = FileUtils.readFileToString(output, StandardCharsets.UTF_8);
-        Assert.assertTrue(content.contains("2 Unknown Licenses"));
-        Assert.assertTrue(content.contains("target/test-classes/elements/Source.java"));
-        Assert.assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
+        assertTrue(content.contains("2 Unknown Licenses"));
+        assertTrue(content.contains("target/test-classes/elements/Source.java"));
+        assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
         System.setOut(origin);
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTransformerTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTransformerTest.java
index e9f6338aa..96102864c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTransformerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTransformerTest.java
@@ -19,14 +19,15 @@
 package org.apache.rat;
 
 import org.apache.rat.test.utils.Resources;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.StringReader;
 import java.io.StringWriter;
 
-import static org.junit.Assert.assertNotNull;
 
 public class ReportTransformerTest {
     
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index d2fd9713b..3d05de02c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.rat;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -35,7 +35,7 @@
 import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.walker.DirectoryWalker;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
@@ -99,7 +99,7 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
 
         String document = out.toString();
         // System.out.println(document);
-        assertTrue("'Generated at' is present in " + document, document.startsWith(HEADER));
+        assertTrue(document.startsWith(HEADER), "'Generated at' is present in " + document );
 
         // final int generatedAtLineEnd = document.indexOf(NL, HEADER.length());
         find("^Notes: 2$", document);
@@ -130,7 +130,7 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
     }
 
     private void find(String pattern, String document) {
-        assertTrue(String.format("Could not find '%s'", pattern),
-                Pattern.compile(pattern, Pattern.MULTILINE).matcher(document).find());
+        assertTrue(
+                Pattern.compile(pattern, Pattern.MULTILINE).matcher(document).find(), () ->String.format("Could not find '%s'", pattern));
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index 18228f5c3..2442cdf3c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -18,7 +18,8 @@
  */
 package org.apache.rat.analysis;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -33,8 +34,9 @@
 import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 import org.apache.rat.test.utils.Resources;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 
 public class AnalyserFactoryTest {
 
@@ -50,7 +52,7 @@ public class AnalyserFactoryTest {
     private SimpleXmlClaimReporter reporter;
     private IDocumentAnalyser analyser;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         out = new StringWriter();
         final XmlWriter writer = new XmlWriter(out);
@@ -64,7 +66,7 @@ public void standardTypeAnalyser() throws Exception {
                 Resources.getResourceFile("/elements/Text.txt"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open standard element", //
+        assertEquals( //
                 "<resource name='src/test/resources/elements/Text.txt'><header-sample>/*\n"
                         + " * Licensed to the Apache Software Foundation (ASF) under one\n"
                         + " * or more contributor license agreements.  See the NOTICE file\n"
@@ -81,7 +83,7 @@ public void standardTypeAnalyser() throws Exception {
                         + " * specific language governing permissions and limitations\n" + " * under the License.    \n"
                         + " */\n" + "\n" + "            \n"
                         + "</header-sample><header-type name='?????'/><license-family name='Unknown license'/><type name='standard'/>",
-                out.toString());
+                out.toString(), "Open standard element");
     }
 
     @Test
@@ -90,8 +92,8 @@ public void noteTypeAnalyser() throws Exception {
                 Resources.getResourceFile("/elements/LICENSE"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open note element", "<resource name='src/test/resources/elements/LICENSE'><type name='notice'/>",
-                out.toString());
+        assertEquals("<resource name='src/test/resources/elements/LICENSE'><type name='notice'/>",
+                out.toString(), "Open note element");
     }
 
     @Test
@@ -100,8 +102,9 @@ public void binaryTypeAnalyser() throws Exception {
                 Resources.getResourceFile("/elements/Image.png"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open binary element",
-                "<resource name='src/test/resources/elements/Image.png'><type name='binary'/>", out.toString());
+        assertEquals(
+                "<resource name='src/test/resources/elements/Image.png'><type name='binary'/>", 
+                out.toString(), "Open binary element");
     }
 
     @Test
@@ -110,8 +113,8 @@ public void archiveTypeAnalyser() throws Exception {
                 Resources.getResourceFile("/elements/dummy.jar"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open archive element",
-                "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString());
+        assertEquals(
+                "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString(), "Open archive element");
     }
 
     @Test
@@ -120,7 +123,7 @@ public void archiveTypeAnalyserIntelliJ() throws Exception {
                 Resources.getResourceFile("/elements/dummy.jar"));
         analyser.analyse(document);
         reporter.report(document);
-        assertEquals("Open archive element",
-                "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString());
+        assertEquals(
+                "<resource name='src/test/resources/elements/dummy.jar'><type name='archive'/>", out.toString(), "Open archive element");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
index 47ed4ebba..e231ad097 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/HeaderCheckWorkerTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.rat.analysis;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.StringReader;
 
@@ -28,7 +28,8 @@
 import org.apache.rat.license.ILicense;
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.TestingLocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class HeaderCheckWorkerTest {
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index bccfbd2db..3ef13de7e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -18,11 +18,12 @@
  */
 package org.apache.rat.analysis.license;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -41,8 +42,11 @@
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.testhelpers.TestingLicense;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 
 /**
  * Test to see if short form license information will be recognized correctly.
@@ -55,21 +59,12 @@ abstract public class AbstractLicenseTest {
     private Defaults defaults;
     protected MetaData data;
 
-    private final String id;
-    private final String family;
-    private final String name;
-    private final String notes;
-    private final String[][] targets;
-
-    protected AbstractLicenseTest(String id, String family, String name, String notes, String[][] targets) {
-        this.id = id;
-        this.family = ILicenseFamily.makeCategory(family);
-        this.name = name;
-        this.notes = notes;
-        this.targets = targets;
+    
+    protected AbstractLicenseTest() {
     }
+    
 
-    @Before
+    @BeforeEach
     public void setup() {
         data = new MetaData();
         defaults = Defaults.builder().build();
@@ -85,30 +80,31 @@ protected ILicense extractCategory(String id) {
         return result;
     }
 
-    @Test
-    public void testMatchProcessing() throws IOException {
+    @ParameterizedTest
+    @MethodSource("parameterProvider")
+    public void testMatchProcessing(String id, String familyPattern, String name, String notes, String[][] targets) throws IOException {
         ILicense license = extractCategory(id);
+        String family = ILicenseFamily.makeCategory(familyPattern);
             try {
                 for (String[] target : targets) {
                     if (processText(license, target[TEXT])) {
                         data.reportOnLicense(license);
-                        assertNotNull("No URL HEADER CATEGORY", data.get(MetaData.RAT_URL_HEADER_CATEGORY));
-                        assertEquals(license.toString(), family,
-                                data.get(MetaData.RAT_URL_HEADER_CATEGORY).getValue());
-                        assertNotNull("No URL LICENSE FAMILY CATEGORY",
-                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY));
-                        assertEquals(license.toString(), family,
-                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue());
+                        assertNotNull(data.get(MetaData.RAT_URL_HEADER_CATEGORY),"No URL HEADER CATEGORY");
+                        assertEquals(family,
+                                data.get(MetaData.RAT_URL_HEADER_CATEGORY).getValue(), license.toString());
+                        assertNotNull(data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY), "No URL LICENSE FAMILY CATEGORY");
+                        assertEquals(family,
+                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_CATEGORY).getValue(), license.toString());
                         if (StringUtils.isNotBlank(notes)) {
-                            assertNotNull("No URL HEADER SAMPLE", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
-                            assertEquals(license.toString(), FullTextMatcher.prune(notes),
-                                    FullTextMatcher.prune(data.get(MetaData.RAT_URL_HEADER_SAMPLE).getValue()));
+                            assertNotNull(data.get(MetaData.RAT_URL_HEADER_SAMPLE), "No URL HEADER SAMPLE");
+                            assertEquals(FullTextMatcher.prune(notes),
+                                    FullTextMatcher.prune(data.get(MetaData.RAT_URL_HEADER_SAMPLE).getValue()), license.toString());
                         } else {
-                            assertNull("URL HEADER SAMPLE was not null", data.get(MetaData.RAT_URL_HEADER_SAMPLE));
+                            assertNull(data.get(MetaData.RAT_URL_HEADER_SAMPLE), "URL HEADER SAMPLE was not null");
                         }
-                        assertNotNull("No URL LICENSE FAMILY NAME", data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME));
-                        assertEquals(license.toString(), name,
-                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue());
+                        assertNotNull(data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME), "No URL LICENSE FAMILY NAME");
+                        assertEquals(name,
+                                data.get(MetaData.RAT_URL_LICENSE_FAMILY_NAME).getValue(), license.toString());
                         data.clear();
                     } else {
                         fail(license + " was not matched by " + target[NAME]);
@@ -133,8 +129,9 @@ private boolean processText(ILicense license, String text) throws IOException {
         }
     }
 
-    @Test
-    public void testEmbeddedStrings() throws IOException {
+    @ParameterizedTest
+    @MethodSource("parameterProvider")
+    public void testEmbeddedStrings(String id, String family, String name, String notes, String[][] targets) throws IOException {
         String formats[] = { "%s", "now is not the time %s for copyright", "#%s", "##%s", "## %s", "##%s##", "## %s ##",
                 "/*%s*/", "/* %s */" };
 
@@ -144,8 +141,8 @@ public void testEmbeddedStrings() throws IOException {
                     for (String fmt : formats) {
                         boolean found = processText(license, String.format(fmt, target[TEXT]));
                         license.reset();
-                        assertTrue(String.format("%s %s did not match pattern '%s' for target string %s", id,
-                                name, fmt, target[NAME]), found);
+                        assertTrue(found, ()->String.format("%s %s did not match pattern '%s' for target string %s", id,
+                                name, fmt, target[NAME]));
                     }
                 }
             } finally {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
index 2cee9242e..93e395e23 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
@@ -18,6 +18,11 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.stream.Stream;
+
+import org.apache.rat.license.ILicenseFamily;
+import org.junit.jupiter.params.provider.Arguments;
+
 /**
  * Apache Software License detection tests.
  *
@@ -59,8 +64,8 @@ public class ApacheSoftwareLicenseTest extends AbstractLicenseTest {
 
     };
 
-    public ApacheSoftwareLicenseTest() {
-        super(id, id, name, null, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(Arguments.of(id, id, name, null, targets));
     }
 
 //
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
index 9f122f54c..7f2df2119 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicenseTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.provider.Arguments;
+
 public class AppliedApacheSoftwareLicenseTest extends AbstractLicenseTest {
 
     private static String ID = "ASL";
@@ -32,9 +36,10 @@ public class AppliedApacheSoftwareLicenseTest extends AbstractLicenseTest {
             + " *  See the License for the specific language governing permissions and\n"
             + " *  limitations under the License.\n" + " */\n" } };
 
-    public AppliedApacheSoftwareLicenseTest() {
-        super(ID, ApacheSoftwareLicenseTest.id, ApacheSoftwareLicenseTest.name, null, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(Arguments.of(ID, ApacheSoftwareLicenseTest.id, ApacheSoftwareLicenseTest.name, null, targets));
     }
+
     /*
       
     
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
index 4adc7638e..d0008085f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CDDL1LicenseTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.provider.Arguments;
+
 public class CDDL1LicenseTest extends AbstractLicenseTest {
     public static final String id = "CDDL1";
     public static final String name = "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
@@ -38,8 +42,8 @@ public class CDDL1LicenseTest extends AbstractLicenseTest {
             { "spdx-tab", "SPDX-License-Identifier:\tCDDL-1.0" },
             { "spdx-space", "SPDX-License-Identifier: CDDL-1.0" } };
 
-    public CDDL1LicenseTest() {
-        super(id, id, name, null, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(Arguments.of( id, id, name, null, targets));
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
index 498256513..57eb1b9a5 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/DirectoryScanner.java
@@ -18,7 +18,8 @@
 
 package org.apache.rat.analysis.license;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -27,7 +28,7 @@
 import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.license.ILicense;
 import org.apache.rat.test.utils.Resources;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 class DirectoryScanner {
 
@@ -40,10 +41,11 @@ class DirectoryScanner {
      * @param expected the expected result of the each scan
      * @throws Exception
      */
+    @Test
     public static void testFilesInDir(String directory, ILicense license, boolean expected) throws Exception {
         final File[] resourceFiles = Resources.getResourceFiles(directory);
         if (resourceFiles.length == 0) {
-            Assert.fail("No files found under " + directory);
+            fail("No files found under " + directory);
         }
         for (File f : resourceFiles) {
             BufferedReader br = null;
@@ -54,7 +56,7 @@ public static void testFilesInDir(String directory, ILicense license, boolean ex
                 while (!result && (line = br.readLine()) != null) {
                     result = license.matches(line) == State.t;
                 }
-                assertEquals(f.toString(), expected, result);
+                assertEquals(expected, result, f.toString());
             } finally {
                 license.reset();
                 IOUtils.closeQuietly(br);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
index 74b78df6a..93c9bb9c9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
@@ -20,26 +20,26 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.stream.Stream;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.provider.Arguments;
 
 /**
  * Tests GPL license occurrences within comments and other characters. Works for
  * GPL1 to GPL3.
  */
-@RunWith(Parameterized.class)
+
 public class GPLLicenseTest extends AbstractLicenseTest {
 
-    private static Object[] GPL1 = { "GPL1", "GNU General Public License, version 1", new String[][] {
+    private static Arguments GPL1 = Arguments.of( "GPL1", "GPL1", "GNU General Public License, version 1", null, 
+            new String[][] {
             { "fulltext", "This program is free software; you can redistribute it and/or modify\n "
                     + "it under the terms of the GNU General Public License as published by\n "
                     + "the Free Software Foundation; either version 1, or (at your option)\n " + "any later version." },
             { "spdx-tab", "SPDX-License-Identifier:\tGPL-1.0-only" },
-            { "spdx-space", "SPDX-License-Identifier: GPL-1.0-only" }, } };
+            { "spdx-space", "SPDX-License-Identifier: GPL-1.0-only" }, } );
 
-    private static Object[] GPL2 = { "GPL2", "GNU General Public License, version 2",
+    private static Arguments GPL2 = Arguments.of( "GPL2", "GPL2", "GNU General Public License, version 2", null,
             new String[][] {
                     { "fulltext",
                             "This program is free software; you can redistribute it and/or\n"
@@ -47,9 +47,9 @@ public class GPLLicenseTest extends AbstractLicenseTest {
                                     + "as published by the Free Software Foundation; either version 2\n"
                                     + "of the License, or (at your option) any later version." },
                     { "spdx-tab", "SPDX-License-Identifier:\tGPL-2.0-only" },
-                    { "spdx-space", "SPDX-License-Identifier: GPL-2.0-only" }, } };
+                    { "spdx-space", "SPDX-License-Identifier: GPL-2.0-only" }, } );
 
-    private static Object[] GPL3 = { "GPL3", "GNU General Public License, version 3",
+    private static Arguments GPL3 = Arguments.of( "GPL3", "GPL3", "GNU General Public License, version 3", null,
             new String[][] {
                     { "fulltext",
                             "This program is free software: you can redistribute it and/or modify\n"
@@ -57,14 +57,10 @@ public class GPLLicenseTest extends AbstractLicenseTest {
                                     + "    the Free Software Foundation, either version 3 of the License, or\n"
                                     + "    (at your option) any later version." },
                     { "spdx-tab", "SPDX-License-Identifier:\tGPL-3.0-only" },
-                    { "spdx-space", "SPDX-License-Identifier: GPL-3.0-only" }, } };
+                    { "spdx-space", "SPDX-License-Identifier: GPL-3.0-only" }, } );
 
-    @Parameters
-    public static Collection<Object[]> data() {
-        return Arrays.asList(GPL1, GPL2, GPL3);
-    }
 
-    public GPLLicenseTest(String id, String name, String[][] targets) {
-        super(id, id, name, null, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(GPL1, GPL2, GPL3);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
index a059ebdbd..12f431ac5 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
@@ -18,6 +18,11 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.stream.Stream;
+
+import org.apache.rat.license.ILicenseFamily;
+import org.junit.jupiter.params.provider.Arguments;
+
 public class GeneratedLicenseTest extends AbstractLicenseTest {
     private static String id = "GEN";
     private static String name = "Generated Files";
@@ -41,7 +46,7 @@ public class GeneratedLicenseTest extends AbstractLicenseTest {
             { "machine generated", "DO NOT EDIT THIS FILE - it is machine generated" },
             { "generated by", "This class was generated by" }, { "javadoc", "Generated by javadoc" } };
 
-    public GeneratedLicenseTest() {
-        super(id, id, name, notes, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(Arguments.of( id, id, name, notes, targets));
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
index 36abe5864..319979767 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/IllumosLicenseTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.provider.Arguments;
+
 public class IllumosLicenseTest extends AbstractLicenseTest {
     private static String id = "ILLUMOS";
     private static String note = "Modified CDDL1 license";
@@ -26,8 +30,7 @@ public class IllumosLicenseTest extends AbstractLicenseTest {
                     + "Common Development and Distribution License (the \"License\") "
                     + "You may not use this file except in compliance with the License. " } };
 
-    public IllumosLicenseTest() {
-        super(id, CDDL1LicenseTest.id, CDDL1LicenseTest.name, note, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(Arguments.of(id, CDDL1LicenseTest.id, CDDL1LicenseTest.name, note, targets));
     }
-
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
index 99d0a3550..be8c25477 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.provider.Arguments;
+
 public class MITLicenseTest extends AbstractLicenseTest {
     private static String id = "MIT";
     private static String name = "The MIT License";
@@ -25,7 +29,7 @@ public class MITLicenseTest extends AbstractLicenseTest {
             "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \\\"Software\\\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." },
             { "spdx-tab", "SPDX-License-Identifier:\tMIT" }, { "spdx-space", "SPDX-License-Identifier: MIT" }, };
 
-    public MITLicenseTest() {
-        super(id, id, name, null, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(Arguments.of(id, id, name, null, targets));
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
index 2089cf49a..a439827c2 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.rat.analysis.license;
 
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.provider.Arguments;
+
 public class OASISLicenseTest extends AbstractLicenseTest {
 
     private static String id = "OASIS";
@@ -29,8 +33,8 @@ public class OASISLicenseTest extends AbstractLicenseTest {
                     + "in its implementation may be prepared copied published and distributed"
                     + "\\nCopyright OASIS Open, 1999" }, };
 
-    public OASISLicenseTest() {
-        super(id, id, name, notes, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(Arguments.of(id, id, name, notes, targets));
     }
     /*
     @Test(timeout = 2000) // may need to be adjusted if many more files are added
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
index 00df88350..45eda5ea1 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
@@ -20,33 +20,27 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.provider.Arguments;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-@RunWith(Parameterized.class)
 public class W3CLicenseTest extends AbstractLicenseTest {
 
     private static String W3C_note = "Note that W3C requires a NOTICE.\n" + "All modifications require notes.\n"
             + "See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.";
-    private static Object[] W3C = { "W3C", "W3C Software Copyright", W3C_note,
+    private static Arguments W3C = Arguments.of( "W3C", "W3C", "W3C Software Copyright", W3C_note,
             new String[][] { { "fulltext", "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231" },
                     { "spdx-tab", "SPDX-License-Identifier:\tW3C" },
-                    { "spdx-space", "SPDX-License-Identifier: W3C" }, } };
+                    { "spdx-space", "SPDX-License-Identifier: W3C" }, } );
 
     private static String W3CD_note = "Note that W3CD does not allow modifications.\n"
             + "See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";
-    private static Object[] W3CD = { "W3CD", "W3C Document Copyright", W3CD_note, new String[][] {
-            { "fulltext", "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" }, } };
-
-    @Parameters(name = "{0}")
-    public static Collection<Object[]> data() {
-        return Arrays.asList(W3C, W3CD);
-    }
+    private static Arguments W3CD = Arguments.of("W3CD", "W3CD","W3C Document Copyright", W3CD_note, new String[][] {
+            { "fulltext", "http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" }, } );
 
-    public W3CLicenseTest(String id, String name, String note, String[][] targets) {
-        super(id, id, name, note, targets);
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of(W3C, W3CD);
     }
-
+    
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
index 5342d71d0..a8ac49994 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/AndMatcherTest.java
@@ -18,14 +18,15 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.testhelpers.TestingMatcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class AndMatcherTest {
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
index f303eb710..c03e4a160 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,14 +27,14 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import org.apache.rat.analysis.IHeaderMatcher.State;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public class CopyrightMatcherTest {
     private final static int NAME = 0;
     private final static int TEXT = 1;
@@ -53,91 +53,99 @@ public class CopyrightMatcherTest {
 
     private static final int TOTAL_TESTS = prefix.length * 9;
 
-    static Object[] startStopOwner = { "start-stop-owner", "1990", "1991", "an owner",
-            new String[][] { DO, OD, DOS, ODS }, new String[][] { D, S, O, OS, SO } };
-    static Object[] startOwner = { "start-owner", "1990", null, "an owner", new String[][] { OS, SO, OD, ODS },
-            new String[][] { D, DO, DOS, S, O } };
-    static Object[] start = { "start", "1990", null, null, new String[][] { D, DO, DOS, S, SO },
-            new String[][] { OD, ODS, O, OS } };
-    static Object[] owner = { "owner", null, null, "an owner", new String[][] { O, OD, ODS, OS },
-            new String[][] { DO, DOS, S, D, SO } };
-    static Object[] nada = { "nada", null, null, null, new String[][] { D, DO, DOS, S, SO },
-            new String[][] { OD, ODS, O, OS } };
-
-    private final CopyrightMatcher matcher;
-    private final String[][] pass;
-    private final String[][] fail;
-    private final String testName;
-
-    @Parameters(name = "{0}")
-    public static Collection<Object[]> data() {
-        return Arrays.asList(expandResults(startStopOwner), expandResults(startOwner), expandResults(start),
-                expandResults(owner), expandResults(nada));
+    static Arguments startStopOwner = Arguments.of("start-stop-owner", "1990", "1991", "an owner",
+            expandResults( DO, OD, DOS, ODS) , expandResults( D, S, O, OS, SO ));
+    static Arguments startOwner = Arguments.of( "start-owner", "1990", null, "an owner", 
+            expandResults( OS, SO, OD, ODS ), expandResults( D, DO, DOS, S, O ) );
+    static Arguments start = Arguments.of("start", "1990", null, null, expandResults(D, DO, DOS, S, SO ),
+            expandResults(OD, ODS, O, OS ) );
+    static Arguments owner = Arguments.of("owner", null, null, "an owner", expandResults( O, OD, ODS, OS ),
+expandResults( DO, DOS, S, D, SO ) );
+    static Arguments nada = Arguments.of("nada", null, null, null, expandResults( D, DO, DOS, S, SO ),
+            expandResults( OD, ODS, O, OS ) );
+
+    
+    
+    public static Stream<Arguments> parameterProvider() {
+        return Stream.of( startStopOwner, startOwner, start, owner, nada);
     }
 
-    private static Object[] expandResults(Object[] source) {
-        Object[] result = new Object[6];
-        result[0] = source[0];
-        result[1] = source[1];
-        result[2] = source[2];
-        result[3] = source[3];
-
+    private static String[][] expandResults( String[]...args) {
         List<String[]> arry = new ArrayList<>();
         for (String pfx : prefix) {
-            Arrays.stream((String[][]) source[4]).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
-                    .forEach(arry::add);
-        }
-        result[4] = arry.toArray(new String[arry.size()][2]);
-        arry.clear();
-
-        for (String pfx : prefix) {
-            Arrays.stream((String[][]) source[5]).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
-                    .forEach(arry::add);
+          Arrays.stream(args).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
+                  .forEach(arry::add);
         }
-        result[5] = arry.toArray(new String[arry.size()][2]);
-        return result;
+        return arry.toArray(new String[arry.size()][2]);
     }
 
+            
+//    private static Arguments expandResults(String name, String startDate, String endDate, String owner,
+//            String[][] passAry, String[][] failAry) {
+//
+//        List<String[]> arry = new ArrayList<>();
+//        for (String pfx : prefix) {
+//            Arrays.stream(passAry).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
+//                    .forEach(arry::add);
+//        }
+//        String[][] pass = arry.toArray(new String[arry.size()][2]);
+//        arry.clear();
+//
+//        for (String pfx : prefix) {
+//            Arrays.stream((String[][]) failAry).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
+//                    .forEach(arry::add);
+//        }
+//        String[][] fail = arry.toArray(new String[arry.size()][2]);
+//
+//        return Arguments.of(name, startDate, endDate, owner, pass, fail);
+//    }
+
     private static void verify(String testName, String[][] pass, String[][] fail) {
-        assertEquals("Wrong number of pass/fail tests", TOTAL_TESTS, pass.length + fail.length);
+        assertEquals(TOTAL_TESTS, pass.length + fail.length, "Wrong number of pass/fail tests");
         Set<String> passSet = new HashSet<String>();
         Arrays.stream(pass).forEach(s -> passSet.add(s[0]));
         Set<String> failSet = new HashSet<String>();
         Arrays.stream(fail).forEach(s -> failSet.add(s[0]));
         for (String s : passSet) {
-            assertFalse(String.format("%s is in both pass and fail sets for %s", s, testName), failSet.contains(s));
+            assertFalse(failSet.contains(s), ()->String.format("%s is in both pass and fail sets for %s", s, testName));
         }
     }
 
-    public CopyrightMatcherTest(String testName, String start, String stop, String owner, String[][] pass,
+//    public CopyrightMatcherTest(String testName, String start, String stop, String owner, String[][] pass,
+//            String[][] fail) {
+//        verify(testName, pass, fail);
+//        matcher = new CopyrightMatcher(start, stop, owner);
+//        this.pass = pass;
+//        this.fail = fail;
+//        this.testName = testName;
+//    }
+
+    @ParameterizedTest
+    @MethodSource("parameterProvider")
+    public void testPass(String testName, String start, String stop, String owner, String[][] pass,
             String[][] fail) {
         verify(testName, pass, fail);
-        matcher = new CopyrightMatcher(start, stop, owner);
-        this.pass = pass;
-        this.fail = fail;
-        this.testName = testName;
-    }
-
-    @Test
-    public void testPass() {
+        CopyrightMatcher matcher = new CopyrightMatcher(start, stop, owner);
         for (String[] target : pass) {
-            String errMsg = String.format("%s:%s failed", testName, target[NAME]);
-            assertEquals(errMsg, State.i, matcher.currentState());
-            assertEquals(errMsg, State.t, matcher.matches(target[TEXT]));
+            assertEquals(State.i, matcher.currentState(), ()->String.format("%s:%s failed", testName, target[NAME]));
+            assertEquals(State.t, matcher.matches(target[TEXT]), ()->String.format("%s:%s failed", testName, target[NAME]));
             matcher.reset();
-            assertEquals(errMsg, State.i, matcher.currentState());
+            assertEquals(State.i, matcher.currentState(),()->String.format("%s:%s failed", testName, target[NAME]));
         }
     }
 
-    @Test
-    public void testFail() {
+    @ParameterizedTest
+    @MethodSource("parameterProvider")
+    public void testFail(String testName, String start, String stop, String owner, String[][] pass,
+            String[][] fail) {
+        verify(testName, pass, fail);
+        CopyrightMatcher matcher = new CopyrightMatcher(start, stop, owner);
         for (String[] target : fail) {
-            String errMsg = String.format("%s:%s passed", testName, target[NAME]);
-            assertEquals(errMsg, State.i, matcher.currentState());
-            assertEquals(errMsg, State.i, matcher.matches(target[TEXT]));
-            assertEquals(errMsg, State.f, matcher.finalizeState());
+            assertEquals( State.i, matcher.currentState(), ()->String.format("%s:%s passed", testName, target[NAME]));
+            assertEquals( State.i, matcher.matches(target[TEXT]), ()->String.format("%s:%s passed", testName, target[NAME]));
+            assertEquals( State.f, matcher.finalizeState(), ()->String.format("%s:%s passed", testName, target[NAME]));
             matcher.reset();
-            assertEquals(errMsg, State.i, matcher.currentState());
+            assertEquals( State.i, matcher.currentState(), ()->String.format("%s:%s passed", testName, target[NAME]));
         }
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
index e2926e63f..03a3251c9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/FullTextMatcherTest.java
@@ -18,10 +18,11 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.rat.analysis.IHeaderMatcher.State;
 
@@ -29,7 +30,7 @@ public class FullTextMatcherTest {
 
     FullTextMatcher target = new FullTextMatcher("Hello world");
     
-    @Before
+    @BeforeEach
     public void setup() {
         target.reset();
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
index 843ef9afc..806b6573d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/NotMatcherTest.java
@@ -18,23 +18,23 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.testhelpers.TestingMatcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NotMatcherTest {
 
     private void assertValues(IHeaderMatcher target, State hello, State world, State finalize) {
         assertEquals(State.i, target.currentState());
-        assertEquals("hello match", hello, target.matches("hello"));
-        assertEquals("hello current", hello, target.currentState());
-        assertEquals("world match", world, target.matches("world"));
-        assertEquals("world current", world, target.currentState());
-        assertEquals("finalize", finalize, target.finalizeState());
-        assertEquals("finalize current", finalize, target.currentState());
+        assertEquals( hello, target.matches("hello"), "hello match");
+        assertEquals( hello, target.currentState(), "hello current");
+        assertEquals(world, target.matches("world"), "world match");
+        assertEquals( world, target.currentState(), "world current");
+        assertEquals(finalize, target.finalizeState(), "finalize match");
+        assertEquals(finalize, target.currentState(), "finalize current");
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java
index fac129d80..81478b37b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/OrMatcherTest.java
@@ -18,25 +18,25 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.State;
 import org.apache.rat.testhelpers.TestingMatcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class OrMatcherTest {
 
     private void assertValues(IHeaderMatcher target, State hello, State world, State finalize) {
         assertEquals(State.i, target.currentState());
-        assertEquals("hello match", hello, target.matches("hello"));
-        assertEquals("hello current", hello, target.currentState());
-        assertEquals("world match", world, target.matches("world"));
-        assertEquals("world current", world, target.currentState());
-        assertEquals("finalize", finalize, target.finalizeState());
-        assertEquals("finalize current", finalize, target.currentState());
+        assertEquals( hello, target.matches("hello"), "hello match");
+        assertEquals( hello, target.currentState(), "hello current");
+        assertEquals(world, target.matches("world"), "world match");
+        assertEquals( world, target.currentState(), "world current");
+        assertEquals(finalize, target.finalizeState(), "finalize match");
+        assertEquals(finalize, target.currentState(), "finalize current");
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
index 01a4e5351..f0d41e2e4 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
@@ -18,18 +18,18 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.rat.analysis.IHeaderMatcher;
 import org.apache.rat.analysis.IHeaderMatcher.State;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SPDXMatcherTest {
 
     IHeaderMatcher target = SPDXMatcherFactory.INSTANCE.create("hello");
 
-    @Before
+    @BeforeEach
     public void setup() {
         target.reset();
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
index 89efd28b7..b836f6470 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleCopyrightTests.java
@@ -18,10 +18,10 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.rat.analysis.IHeaderMatcher.State;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SimpleCopyrightTests {
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
index 160d5cf0b..53dee7607 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleRegexMatcherTest.java
@@ -18,10 +18,10 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.regex.Pattern;
 
@@ -31,7 +31,7 @@ public class SimpleRegexMatcherTest {
 
     SimpleRegexMatcher target = new SimpleRegexMatcher(Pattern.compile("hello\\sworld"));
     
-    @Before
+    @BeforeEach
     public void setup() {
         target.reset();
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
index 7d88bdd88..2ad73d6bf 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SimpleTextMatcherTest.java
@@ -18,17 +18,17 @@
  */
 package org.apache.rat.analysis.matchers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.rat.analysis.IHeaderMatcher.State;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SimpleTextMatcherTest {
 
     SimpleTextMatcher target;
 
-    @Before
+    @BeforeEach
     public void setup() {
         target = new SimpleTextMatcher("hello");
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
index c69cb6103..cf0c42ee3 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
@@ -18,11 +18,11 @@
  */
 package org.apache.rat.annotation;
 
-import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.rat.test.utils.Resources;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -30,13 +30,24 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
+import java.nio.file.Files;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class TestLicenseAppender {
-    @ClassRule
-    public static final TemporaryFolder baseTempFolder = new TemporaryFolder();
+    
+    private static File baseTempFolder;
+    
+    @BeforeAll
+    public static void setup() throws IOException {
+        baseTempFolder = Files.createTempDirectory("tla").toFile();
+    }
+    
+    @AfterAll
+    public static void teardown() throws IOException {
+        FileUtils.deleteDirectory(baseTempFolder);
+    }
 
     private static final String FIRST_LICENSE_LINE = " Licensed to the Apache Software Foundation (ASF) under one";
 
@@ -50,26 +61,16 @@ private interface NewFileReader {
 
     private static String getTemporaryFileWithName(String fileName) throws IOException {
         if (fileName != null) {
-            return baseTempFolder.newFile(fileName).getAbsolutePath();
-        } else {
-            return baseTempFolder.newFile().getAbsolutePath();
+            return new File(baseTempFolder,fileName).getAbsolutePath();
         }
+        return File.createTempFile("tla", null, baseTempFolder).getAbsolutePath();
     }
 
     private static void createTestFile(String fileName,
                                        FileCreator creator)
             throws IOException {
-        FileWriter w = null;
-        try {
-            creator.createFile(w = new FileWriter(fileName));
-        } finally {
-            IOUtils.closeQuietly(w);
-        }
-    }
-
-    private static void tryToDelete(File f) {
-        if (f != null && f.exists() && !f.delete()) {
-            f.deleteOnExit();
+        try (FileWriter w = new FileWriter(fileName)) {
+            creator.createFile(w);
         }
     }
 
@@ -78,59 +79,26 @@ private static void commonTestTemplate(String relativeName,
                                            NewFileReader reader)
             throws IOException {
         String name = getTemporaryFileWithName(relativeName);
-        try {
+  
             createTestFile(name, creator);
 
             ApacheV2LicenseAppender appender =
                     new ApacheV2LicenseAppender();
             appender.append(new File(name));
 
-            BufferedReader r = null;
-            try {
-                r = new BufferedReader(new FileReader(name + ".new"));
+            try (BufferedReader r = new BufferedReader(new FileReader(name + ".new"))){
                 reader.readFile(r);
-            } finally {
-                IOUtils.closeQuietly(r);
-            }
-        } finally {
-            tryToDelete(new File(name));
-            tryToDelete(new File(name + ".new"));
-        }
-    }
-
-    private static NewFileReader checkLines(final String firstLine,
-                                            final String secondLine) {
-        return new NewFileReader() {
-            public void readFile(BufferedReader r) throws IOException {
-                String line = r.readLine();
-                assertEquals("First line is incorrect",
-                        firstLine, line);
-                if (secondLine != null) {
-                    line = r.readLine();
-                    assertEquals("Second line is incorrect",
-                            secondLine, line);
-                }
             }
-        };
+          FileUtils.delete( new File(name+".new"));
+          FileUtils.delete( new File(name));
     }
 
-    private static NewFileReader checkLines(final String firstLine,
-                                            final String secondLine,
-                                            final String thirdLine) {
+    private static NewFileReader checkLines(final String ... lines) {
         return new NewFileReader() {
             public void readFile(BufferedReader r) throws IOException {
-                String line = r.readLine();
-                assertEquals("First line is incorrect",
-                        firstLine, line);
-                if (secondLine != null) {
-                    line = r.readLine();
-                    assertEquals("Second line is incorrect",
-                            secondLine, line);
-                }
-                if (thirdLine != null) {
-                    line = r.readLine();
-                    assertEquals("Third line is incorrect",
-                            thirdLine, line);
+                for (int i=0; i<lines.length; i++) {
+                    String line = r.readLine();
+                    assertEquals(lines[i], line, String.format("Line %s is incorrect",i));
                 }
             }
         };
@@ -154,8 +122,7 @@ public void createFile(Writer writer)
 
         File newFile = new File(filename + ".new");
         newFile.deleteOnExit();
-        assertFalse("No new file should have been written",
-                newFile.exists());
+        assertFalse(newFile.exists(), "No new file should have been written");
     }
 
     @Test
@@ -187,7 +154,7 @@ public void createFile(Writer writer)
                         writer.write("}\n");
                     }
                 },
-                checkLines(commentLine, null));
+                checkLines(commentLine));
     }
 
     @Test
@@ -238,7 +205,7 @@ public void createFile(Writer writer)
                         writer.write("</html>\n");
                     }
                 },
-                checkLines(commentLine, null));
+                checkLines(commentLine));
     }
 
     @Test
@@ -254,7 +221,7 @@ public void createFile(Writer writer)
                         writer.write("}\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -270,7 +237,7 @@ public void createFile(Writer writer)
                         writer.write("}\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -286,7 +253,7 @@ public void createFile(Writer writer)
                         writer.write(" of any importance\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -302,7 +269,7 @@ public void createFile(Writer writer)
                         writer.write("cool = true\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -324,16 +291,16 @@ public void createFile(Writer writer)
                     public void readFile(BufferedReader reader)
                             throws IOException {
                         String line = reader.readLine();
-                        assertEquals("First line is incorrect",
-                                newFirstLine, line);
+                        assertEquals(
+                                newFirstLine, line, "First line is incorrect");
                         while ((line = reader.readLine()) != null) {
                             if (line.length() == 0) {
                                 line = reader.readLine();
                                 break;
                             }
                         }
-                        assertEquals("Package line is incorrect",
-                                firstLine, line);
+                        assertEquals(
+                                firstLine, line, "Package line is incorrect");
                     }
                 });
     }
@@ -351,7 +318,7 @@ public void createFile(Writer writer)
                         writer.write("end\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -383,7 +350,7 @@ public void createFile(Writer writer)
                         writer.write("print \"Hello world\"\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -431,7 +398,7 @@ public void createFile(Writer writer)
                         writer.write("puts \"Hello world\"\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -482,7 +449,7 @@ public void createFile(Writer writer)
                         writer.write("}\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -498,7 +465,7 @@ public void createFile(Writer writer)
                         writer.write("    }\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -515,7 +482,7 @@ public void createFile(Writer writer)
                         writer.write("}\n");
                     }
                 },
-                checkLines(firstLine, null));
+                checkLines(firstLine));
     }
 
     @Test
@@ -542,28 +509,21 @@ public void createFile(Writer writer)
     @Test
     public void fileWithBOM() throws IOException {
         File f = Resources.getResourceFile("violations/FilterTest.cs");
-        try {
-            ApacheV2LicenseAppender appender =
-                    new ApacheV2LicenseAppender();
-            appender.append(f);
-
-            BufferedReader r = null;
-            try {
-                r = new BufferedReader(new FileReader(f.getAbsolutePath()
-                        + ".new"));
-                assertEquals("/*", r.readLine());
-                String line = null;
-                while ((line = r.readLine()) != null) {
-                    if (line.trim().length() == 0) {
-                        break;
-                    }
+       
+        ApacheV2LicenseAppender appender =
+                new ApacheV2LicenseAppender();
+        appender.append(f);
+
+        try (BufferedReader r =  new BufferedReader(new FileReader(f.getAbsolutePath()
+                    + ".new"))) {
+            assertEquals("/*", r.readLine());
+            String line = null;
+            while ((line = r.readLine()) != null) {
+                if (line.trim().length() == 0) {
+                    break;
                 }
-                assertEquals("#if NET_2_0", r.readLine());
-            } finally {
-                IOUtils.closeQuietly(r);
             }
-        } finally {
-            tryToDelete(new File(f.getAbsolutePath() + ".new"));
+            assertEquals("#if NET_2_0", r.readLine());
         }
     }
 
@@ -610,19 +570,8 @@ public void createFile(Writer writer)
                         writer.write("EndProject\n");
                     }
                 },
-                new NewFileReader() {
-                    public void readFile(BufferedReader r) throws IOException {
-                        String line = r.readLine();
-                        assertEquals("First line is incorrect",
-                                firstLine, line);
-                        line = r.readLine();
-                        assertEquals("Second line is incorrect",
-                                secondLine, line);
-                        line = r.readLine();
-                        assertEquals("Third line is incorrect",
-                                thirdLine, line);
-                    }
-                });
+                checkLines(firstLine, secondLine, thirdLine)
+                );
     }
 
     @Test
@@ -663,19 +612,8 @@ public void createFile(Writer writer)
                         writer.write("EndGlobal \n");
                     }
                 },
-                new NewFileReader() {
-                    public void readFile(BufferedReader r) throws IOException {
-                        String line = r.readLine();
-                        assertEquals("First line is incorrect",
-                                firstLine, line);
-                        line = r.readLine();
-                        assertEquals("Second line is incorrect",
-                                secondLine, line);
-                        line = r.readLine();
-                        assertEquals("Third line is incorrect",
-                                thirdLine, line);
-                    }
-                });
+                checkLines(firstLine, secondLine, thirdLine)
+                );
     }
 
     @Test
@@ -718,22 +656,8 @@ public void createFile(Writer writer)
                         writer.write("EndGlobal \n");
                     }
                 },
-                new NewFileReader() {
-                    public void readFile(BufferedReader r) throws IOException {
-                        String line = r.readLine();
-                        assertEquals("First line is incorrect",
-                                firstLine, line);
-                        line = r.readLine();
-                        assertEquals("Second line is incorrect",
-                                secondLine, line);
-                        line = r.readLine();
-                        assertEquals("Third line is incorrect",
-                                thirdLine, line);
-                        line = r.readLine();
-                        assertEquals("Forth line is incorrect",
-                                forthLine, line);
-                    }
-                });
+                checkLines(firstLine, secondLine, thirdLine, forthLine)
+               );
     }
     
     @Test
@@ -753,8 +677,8 @@ public void createFile(Writer writer)
                 new NewFileReader() {
                     public void readFile(BufferedReader r) throws IOException {
                         String line = r.readLine();
-                        assertEquals("First line is incorrect",
-                                "<!--", line);
+                        assertEquals(
+                                "<!--", line, "First line is incorrect");
                         line = r.readLine();
                     }
                 });
diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java
index 7b90c1850..1b6156f01 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java
@@ -17,15 +17,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class AddLicenseHeadersTest {
     @Test
     public void verifyHelpOptions() {
         String allOptions = AddLicenseHeaders.getValuesForHelp();
-        assertFalse(allOptions, allOptions.isEmpty());
-        assertFalse(allOptions, allOptions.endsWith("|"));
+        assertFalse(allOptions.isEmpty(), allOptions);
+        assertFalse(allOptions.endsWith("|"),allOptions);
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java
index ccb5612eb..0a29eaee8 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java
@@ -19,24 +19,24 @@
  * under the License.
  */
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ReportFormatTest {
     @Test
     public void isANullSafe() {
         for (String optionType : Arrays.asList(null, "")) {
-            assertFalse("Must not equal PLAIN, was " + optionType, ReportFormat.PLAIN.is(optionType));
+            assertFalse(ReportFormat.PLAIN.is(optionType), ()->"Must not equal PLAIN, was " + optionType);
         }
     }
     @Test
     public void isAConfigurationOption() {
         for (String optionType : Arrays.asList("PLAIN", "pLain", "plain", ReportFormat.PLAIN.name())) {
-            assertTrue("Must equal PLAIN, was " + optionType, ReportFormat.PLAIN.is(optionType));
+            assertTrue(ReportFormat.PLAIN.is(optionType), ()->"Must equal PLAIN, was " + optionType);
         }
         assertFalse(ReportFormat.PLAIN.is(ReportFormat.XML.name()));
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java
index 1b1edd27b..d8b9358d0 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java
@@ -17,17 +17,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import static org.junit.Assert.*;
+
 
 import static org.apache.rat.config.SourceCodeManagementSystems.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SourceCodeManagementSystemsTest {
 
     @Test
     public void testSubversionAndNumberOfSCMSystems() {
-        assertFalse("SVN does not have any external ignore files.", SUBVERSION.hasIgnoreFile());
+        assertFalse(SUBVERSION.hasIgnoreFile(), "SVN does not have any external ignore files.");
         
         int hasIgnore = 0;
         int hasNoIgnore = 0;
@@ -39,9 +41,9 @@ public void testSubversionAndNumberOfSCMSystems() {
             }
         }
         
-        assertEquals("Did you change the number of SCMs?", 4, hasIgnore);
-        assertEquals("Did you add a new SCM without ignoreFile?", 1, hasNoIgnore);
-        assertEquals("Amount of SCM has changed.", values().length, hasIgnore+hasNoIgnore);
+        assertEquals(4, hasIgnore, "Did you change the number of SCMs?");
+        assertEquals(1, hasNoIgnore, "Did you add a new SCM without ignoreFile?");
+        assertEquals(values().length, hasIgnore+hasNoIgnore, "Amount of SCM has changed.");
     }
     
     @Test
@@ -49,8 +51,8 @@ public void testPluginExcludeLists()  {
         assertEquals(1, SUBVERSION.getExclusions().size());
         assertEquals(2, GIT.getExclusions().size());
         
-        assertEquals("Did you change the number of SCM systems?", 9, getPluginExclusions().size());
-        assertEquals("Did you change the number of SCM systems?", 5, values().length);
+        assertEquals(9, getPluginExclusions().size(), "Did you change the number of SCM systems?");
+        assertEquals(5, values().length, "Did you change the number of SCM systems?");
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
index caaca7980..d1c3405f6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/ConfigurationReaderTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.rat.configuration;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URL;
 import java.util.Collection;
@@ -33,7 +33,7 @@
 import org.apache.rat.configuration.builders.RegexBuilder;
 import org.apache.rat.configuration.builders.SpdxBuilder;
 import org.apache.rat.configuration.builders.TextBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ConfigurationReaderTest {
 
@@ -79,7 +79,7 @@ public void LicenseFamiliesTest() {
     private void checkMatcher(String name, Class<? extends AbstractBuilder> clazz) {
         AbstractBuilder builder = MatcherBuilderTracker.getMatcherBuilder(name);
         assertNotNull(builder);
-        assertTrue(name + " is not an instanceof " + clazz.getName(), clazz.isAssignableFrom(builder.getClass()));
+        assertTrue(clazz.isAssignableFrom(builder.getClass()),()->name + " is not an instanceof " + clazz.getName() );
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
index 44621f5a0..30bb45c8b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/FormatTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.rat.configuration;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.net.MalformedURLException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FormatTest {
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
index 26dc6a90f..37e40a13b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
@@ -18,12 +18,12 @@
  */
 package org.apache.rat.document;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.rat.testhelpers.TestingLocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ToNameTransformerTest {
 
@@ -33,13 +33,13 @@ public class ToNameTransformerTest {
     public void transformLocation() {
         TestingLocation location = new TestingLocation();
         Object result = transformer.transform(location);
-        assertNotNull("Transform into name", result);
-        assertEquals("Transform into name", location.name, result);
+        assertNotNull(result, "Transform into name");
+        assertEquals(location.name, result, "Transform into name");
     }
 
     @Test
     public void transformNull() {
         Object result = transformer.transform(null);
-        assertNull("Null transforms to null", result);
+        assertNull(result, "Null transforms to null");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java
index b7ef80c00..b074e01c6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/impl/SingularFileDocumentTest.java
@@ -20,21 +20,21 @@
 
 import org.apache.rat.api.Document;
 import org.apache.rat.test.utils.Resources;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.Reader;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class SingularFileDocumentTest {
     private Document document;
     private File file;
     
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         file = Resources.getResourceFile("elements/Source.java");
         document = new MonolithicFileDocument(file);
@@ -43,15 +43,15 @@ public void setUp() throws Exception {
     @Test
     public void reader() throws Exception {
         Reader reader = document.reader();
-        assertNotNull("Reader should be returned", reader);
-        assertEquals("First file line expected", "package elements;", 
-                 new BufferedReader(reader).readLine());
+        assertNotNull(reader, "Reader should be returned");
+        assertEquals("package elements;", 
+                 new BufferedReader(reader).readLine(), "First file line expected");
     }
 
     @Test
     public void getName() {
         final String name = document.getName();
         assertNotNull("Name is set", name);
-        assertEquals("Name is filename", DocumentImplUtils.toName(file), name);
+        assertEquals(DocumentImplUtils.toName(file), name, "Name is filename");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java
index d54e7ed55..919a17a39 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/ArchiveGuesserTest.java
@@ -19,9 +19,9 @@
 package org.apache.rat.document.impl.guesser;
 
 import org.apache.rat.document.MockDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ArchiveGuesserTest {
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
index a88312947..43843f644 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
@@ -22,16 +22,16 @@
 import org.apache.rat.document.MockDocument;
 import org.apache.rat.document.impl.FileDocument;
 import org.apache.rat.test.utils.Resources;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BinaryGuesserTest {
 
@@ -63,7 +63,7 @@ public class BinaryGuesserTest {
     @Test
     public void testMatches() {
         for (String name : BINARY_FILES) {
-            assertTrue("'" + name + "' should be detected as a binary", BinaryGuesser.isBinary(new MockDocument(name)));
+            assertTrue(BinaryGuesser.isBinary(new MockDocument(name)), ()->"'" + name + "' should be detected as a binary");
         }
 
     }
@@ -71,7 +71,7 @@ public void testMatches() {
     @Test
     public void testIsBinary() {
         for (String name : BINARY_FILES) {
-            assertTrue("'" + name + "' should be detected as a binary", BinaryGuesser.isBinary(name));
+            assertTrue(BinaryGuesser.isBinary(name), ()->"'" + name + "' should be detected as a binary");
         }
     }
 
@@ -106,7 +106,7 @@ public void binaryWithMalformedInputRAT81() throws Exception {
                 throw e; // could not open the second file
             }
             r = null;
-            assertTrue("Expected binary for " + doc.getName(), BinaryGuesser.isBinary(doc));
+            assertTrue(BinaryGuesser.isBinary(doc), "Expected binary for " + doc.getName());
         } finally {
             IOUtils.closeQuietly(r);
         }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/GuessUtilsTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/GuessUtilsTest.java
index faf4a39a8..b41be538b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/GuessUtilsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/GuessUtilsTest.java
@@ -18,9 +18,9 @@
  */ 
 package org.apache.rat.document.impl.guesser;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GuessUtilsTest {
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/NoteGuesserTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/NoteGuesserTest.java
index 509782acf..82ca98c54 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/NoteGuesserTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/NoteGuesserTest.java
@@ -19,9 +19,9 @@
 package org.apache.rat.document.impl.guesser;
 
 import org.apache.rat.document.MockDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NoteGuesserTest {
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java b/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
index 0f0ea1bc0..1d4f9c66f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
@@ -21,10 +21,10 @@
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.MockDocument;
 import org.apache.rat.document.MockDocumentAnalyser;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DocumentAnalyserMultiplexerTest {
 
@@ -32,7 +32,7 @@ public class DocumentAnalyserMultiplexerTest {
     private IDocumentAnalyser[] analysers;
     private MockDocument document;
     
-    @Before
+    @BeforeEach
     public void setUp() {
         IDocumentAnalyser[] analysers = {
                 new MockDocumentAnalyser(), 
@@ -48,14 +48,14 @@ public void setUp() {
     public void testAnalyse() throws Exception {
         multiplexer.analyse(document);
         MockDocumentAnalyser analyser =  (MockDocumentAnalyser) (analysers[0]);
-        assertEquals("Call made to analyser", 1, analyser.matches.size());
-        assertEquals("Call made to analyser", document, analyser.matches.get(0));
+        assertEquals(1, analyser.matches.size(),"Call made to analyser");
+        assertEquals( document, analyser.matches.get(0), "Call made to analyser");
         analyser =  (MockDocumentAnalyser) (analysers[1]);
-        assertEquals("Call made to analyser", 1, analyser.matches.size());
-        assertEquals("Call made to analyser", document, analyser.matches.get(0));
+        assertEquals(1, analyser.matches.size(), "Call made to analyser");
+        assertEquals(document, analyser.matches.get(0), "Call made to analyser");
         analyser =  (MockDocumentAnalyser) (analysers[2]);
-        assertEquals("Call made to analyser", 1, analyser.matches.size());
-        assertEquals("Call made to analyser", document, analyser.matches.get(0));
+        assertEquals( 1, analyser.matches.size());
+        assertEquals( document, analyser.matches.get(0),"Call made to analyser");
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java b/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java
index adddf1a47..9fe800445 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java
@@ -18,18 +18,20 @@
  */ 
 package org.apache.rat.header;
 
-import org.junit.Before;
-import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
 
 public class ArrayCharFilterTest {
 
     private static final char[] filtered = {'d', 'o', 'a'};
     private ArrayCharFilter filter;
     
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         filter = new ArrayCharFilter(filtered);
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java
index c98db845c..6f3cd3d1f 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java
@@ -18,13 +18,13 @@
  */ 
 package org.apache.rat.header;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class FilteringSequenceFactoryTest {
 
@@ -32,7 +32,7 @@ public class FilteringSequenceFactoryTest {
     private FilteringSequenceFactory factory;
     private SimpleCharFilter filter;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         capacity = 50;
         filter = new SimpleCharFilter();
@@ -46,12 +46,12 @@ public void noFiltering() throws Exception {
         CharSequence result = factory.filter(reader);
         assertNotNull(result);
         String output = result.toString();
-        assertEquals("No filtering so input equals output.", INPUT, output);
+        assertEquals(INPUT, output, "No filtering so input equals output.");
         reader = new StringReader(INPUT);
         result = factory.filter(reader);
         assertNotNull(result);
         output = result.toString();
-        assertEquals("No filtering so input equals output. Independent of previous input", INPUT, output);
+        assertEquals(INPUT, output, "No filtering so input equals output. Independent of previous input");
     }
 
     @Test
@@ -61,12 +61,12 @@ public void filtering() throws Exception {
         CharSequence result = factory.filter(reader);
         assertNotNull(result);
         String output = result.toString();
-        assertEquals("No filtering so input equals output.", INPUT, output);
+        assertEquals(INPUT, output, "No filtering so input equals output.");
         filter.filterOut = true;
         reader = new StringReader(INPUT);
         result = factory.filter(reader);
         assertNotNull(result);
-        assertEquals("All filtered output is empty. Independent of previous input", 0, result.length());
+        assertEquals( 0, result.length(), "All filtered output is empty. Independent of previous input");
     }
     
     @Test
@@ -76,6 +76,6 @@ public void overCapacity() throws Exception {
         CharSequence result = factory.filter(reader);
         assertNotNull(result);
         String output = result.toString();
-        assertEquals("No filtering so input equals output.", INPUT.substring(0, capacity), output);
+        assertEquals(INPUT.substring(0, capacity), output, "No filtering so input equals output.");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java
index 721fa06ac..68cd01c6a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java
@@ -18,22 +18,23 @@
  */ 
 package org.apache.rat.header;
 
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class HeaderMatcherTest {
 
     private HeaderMatcher matcher;
     private SimpleCharFilter filter;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         filter = new SimpleCharFilter();
         matcher = new HeaderMatcher(filter, 20);
@@ -69,29 +70,29 @@ public void filteredMatches() throws Exception {
     public void noLines() throws Exception {
         StringReader reader = new StringReader("None");
         matcher.read(reader);
-        assertEquals("No lines read", 0, matcher.lines());
+        assertEquals(0, matcher.lines(), "No lines read");
     }
     
     @Test
     public void lines() throws Exception {
         StringReader reader = new StringReader("One\n");
         matcher.read(reader);
-        assertEquals("One line read", 1, matcher.lines());
+        assertEquals(1, matcher.lines(), "One line read");
         reader = new StringReader("One\nTwo");
         matcher.read(reader);
-        assertEquals("One line read", 1, matcher.lines());
+        assertEquals( 1, matcher.lines(), "One line read");
         reader = new StringReader("One\nTwo\nThree");
         matcher.read(reader);
-        assertEquals("Two lines read", 2, matcher.lines());
+        assertEquals( 2, matcher.lines(), "Two lines read");
         reader = new StringReader("One\nTwo\nThree\n");
         matcher.read(reader);
-        assertEquals("Three lines read", 3, matcher.lines());
+        assertEquals( 3, matcher.lines(), "Three lines read");
     }
     
     @Test
     public void tooManyLines() throws Exception {
         StringReader reader = new StringReader("WhateverWhateverWhateverWhateverWhateverWhateverWhateverWhatever");
         matcher.read(reader);
-        assertEquals("Too many lines read", -1, matcher.lines());
+        assertEquals( -1, matcher.lines(), "Too many lines read");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java b/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java
index d41b95a6e..b6c82037c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java
@@ -19,14 +19,15 @@
  */ 
 package org.apache.rat.header;
 
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class HeaderMatcherWithBeansTest {
 
@@ -34,7 +35,7 @@ public class HeaderMatcherWithBeansTest {
     private SimpleCharFilter filter;
     private HeaderBean[] beans;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         HeaderBean[] beans = {
                 new HeaderBean(),
@@ -53,15 +54,15 @@ public void nulls() throws Exception {
         beans[2].setMatch(false);
         StringReader reader = new StringReader("Whatever");
         matcher.read(reader);   
-        assertFalse("State preserved", beans[0].isMatch());
-        assertTrue("State preserved", beans[1].isMatch());
-        assertFalse("State preserved", beans[2].isMatch());
+        assertFalse(beans[0].isMatch(),"State preserved");
+        assertTrue( beans[1].isMatch(),"State preserved");
+        assertFalse(beans[2].isMatch(), "State preserved");
         beans[0].setMatch(true);
         beans[1].setMatch(false);
         beans[2].setMatch(true);
-        assertTrue("State preserved", beans[0].isMatch());
-        assertFalse("State preserved", beans[1].isMatch());
-        assertTrue("State preserved", beans[2].isMatch());
+        assertTrue(beans[0].isMatch(), "State preserved");
+        assertFalse(beans[1].isMatch(), "State preserved");
+        assertTrue(beans[2].isMatch(), "State preserved");
     }
 
     @Test
@@ -71,8 +72,8 @@ public void matches() throws Exception {
         beans[2].setHeaderPattern(Pattern.compile("What"));
         StringReader reader = new StringReader("Whatever");
         matcher.read(reader);   
-        assertTrue("Match header pattern", beans[0].isMatch());
-        assertTrue("Match header pattern", beans[1].isMatch());
-        assertFalse("Match header pattern", beans[2].isMatch());
+        assertTrue(beans[0].isMatch(), "Match header pattern");
+        assertTrue(beans[1].isMatch(), "Match header pattern");
+        assertFalse(beans[2].isMatch(), "Match header pattern");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
index 2757713be..8bb86e0e0 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
@@ -18,9 +18,9 @@
  */
 package org.apache.rat.policy;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Collections;
 import java.util.SortedSet;
@@ -34,8 +34,8 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.TestingLocation;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the Default policy imlementatin.
@@ -65,7 +65,7 @@ public class DefaultPolicyTest {
     private Defaults defaults;
 
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         defaults = Defaults.builder().build();
         policy = new DefaultPolicy(defaults.getLicenseFamilies(LicenseFilter.approved));
@@ -94,7 +94,7 @@ public void testCount() {
     @Test
     public void testApprovedLicenses() {
         
-        assertEquals("Approved license count mismatch", NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, APPROVED_FAMILIES.length);
+        assertEquals(NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, APPROVED_FAMILIES.length, "Approved license count mismatch");
         for (ILicenseFamily family : APPROVED_FAMILIES) {
             setMetadata(family);
             policy.analyse(document);
@@ -109,7 +109,7 @@ public void testUnApprovedLicenses() {
         unapproved.addAll(all);
         unapproved.removeAll(defaults.getLicenseFamilies(LicenseFilter.approved));
 
-        assertEquals("Unapproved license count mismatch", all.size()-NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, unapproved.size());
+        assertEquals(all.size()-NUMBER_OF_DEFAULT_ACCEPTED_LICENSES, unapproved.size(), "Unapproved license count mismatch");
         for (ILicenseFamily family : unapproved) {
             setMetadata(family);
             policy.analyse(document);
@@ -133,8 +133,7 @@ public void testAddNewApprovedLicenseAndDefaults() {
         assertApproval(false);
 
         policy.add(testingFamily);
-        assertNotNull("Did not properly add ILicenseFamily",
-                LicenseFamilySetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
+        assertNotNull(LicenseFamilySetFactory.search(testingFamily, policy.getApprovedLicenseNames()), "Did not properly add ILicenseFamily");
         policy.analyse(document);
         assertApproval(true);
     }
@@ -150,8 +149,7 @@ public void testAddNewApprovedLicenseNoDefaults() {
 
         policy.add(testingFamily);
         assertEquals(1, policy.getApprovedLicenseNames().size());
-        assertNotNull("Did not properly add ILicenseFamily",
-                LicenseFamilySetFactory.search(testingFamily, policy.getApprovedLicenseNames()));
+        assertNotNull(LicenseFamilySetFactory.search(testingFamily, policy.getApprovedLicenseNames()), "Did not properly add ILicenseFamily");
         policy.analyse(document);
         assertApproval(true);
     }
@@ -168,7 +166,7 @@ public void testNonStandardDocumentsDoNotFailLicenseTests() {
             document = new TestingLocation("subject");
             document.getMetaData().set(d);
             policy.analyse(document);
-            assertNull( "failed on "+d.getValue(), document.getMetaData().get(MetaData.RAT_URL_APPROVED_LICENSE) );
+            assertNull( document.getMetaData().get(MetaData.RAT_URL_APPROVED_LICENSE), "failed on "+d.getValue());
         }
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index 2e060a0f5..c3d1b4494 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -18,9 +18,10 @@
  */
 package org.apache.rat.report.xml;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -46,8 +47,8 @@
 import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.walker.DirectoryWalker;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class XmlReportFactoryTest {
 
@@ -58,7 +59,7 @@ public class XmlReportFactoryTest {
     private StringWriter out;
     private IXmlWriter writer;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         out = new StringWriter();
         writer = new XmlWriter(out);
@@ -88,18 +89,18 @@ public void standardReport() throws Exception {
         report.endReport();
         writer.closeDocument();
         final String output = out.toString();
-        assertTrue("Preamble and document element are OK",
-                output.startsWith("<?xml version='1.0'?>" + "<rat-report timestamp="));
-
-        assertTrue("Is well formed", XmlUtils.isWellFormedXml(output));
-        assertEquals("Binary files", Integer.valueOf(2),
-                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_BINARY));
-        assertEquals("Notice files", Integer.valueOf(2),
-                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_NOTICE));
-        assertEquals("Standard files", Integer.valueOf(6),
-                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_STANDARD));
-        assertEquals("Archives", Integer.valueOf(1),
-                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_ARCHIVE));
+        assertTrue(
+                output.startsWith("<?xml version='1.0'?>" + "<rat-report timestamp="), "Preamble and document element are OK");
+
+        assertTrue( XmlUtils.isWellFormedXml(output), "Is well formed");
+        assertEquals(Integer.valueOf(2),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_BINARY), "Binary files");
+        assertEquals(Integer.valueOf(2),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_NOTICE), "Notice files");
+        assertEquals(Integer.valueOf(6),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_STANDARD), "Standard files");
+        assertEquals(Integer.valueOf(1),
+                statistic.getDocumentCategoryMap().get(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_ARCHIVE), "Archives");
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index 8f5ad0875..991628105 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.rat.report.xml;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -51,8 +51,8 @@
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.walker.DirectoryWalker;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
 public class XmlReportTest {
@@ -62,7 +62,7 @@ public class XmlReportTest {
     private IXmlWriter writer;
     private RatReport report;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         out = new ByteArrayOutputStream();
         writer = new XmlWriter(new BufferedWriter(new OutputStreamWriter(out)));
@@ -95,9 +95,8 @@ public void baseReport() throws Exception {
         report.endReport();
         writer.closeDocument();
         final String output = out.toString();
-        assertTrue("Preamble and document element are OK",
-                output.startsWith("<?xml version='1.0'?>" + "<rat-report timestamp="));
-        assertTrue("Is well formed", XmlUtils.isWellFormedXml(output));
+        assertTrue(output.startsWith("<?xml version='1.0'?>" + "<rat-report timestamp="), "Preamble and document element are OK");
+        assertTrue(XmlUtils.isWellFormedXml(output),"Is well formed");
 
         XPath xPath = XPathFactory.newInstance().newXPath();
         Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
index f45ed7d29..cc454bf47 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
@@ -20,19 +20,19 @@
 
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 import org.apache.rat.testhelpers.XmlUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class XmlWriterUtilsTest {
 
     private StringWriter out;
     private IXmlWriter writer;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         out = new StringWriter();
         writer = new XmlWriter(out);
@@ -42,12 +42,12 @@ public void setUp() throws Exception {
     @Test
     public void writeTrue() throws Exception {
         XmlUtils.writeAttribute(writer, "name", true);
-        assertEquals("Attribute written as True", "<alpha name='true'", out.toString());
+        assertEquals("<alpha name='true'", out.toString(), "Attribute written as True");
     }
 
     @Test
     public void writeFalse() throws Exception {
         XmlUtils.writeAttribute(writer, "name", false);
-        assertEquals("Attribute written as False", "<alpha name='false'", out.toString());
+        assertEquals("<alpha name='false'", out.toString(), "Attribute written as False");
     }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java
index 6c861187f..aee72f990 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java
@@ -20,15 +20,16 @@
 
 import org.apache.rat.report.xml.writer.InvalidXmlException;
 import org.apache.rat.report.xml.writer.OperationNotAllowedException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 public class XmlWriterTest {
 
@@ -37,7 +38,7 @@ public class XmlWriterTest {
     private XmlWriter writer;
     private StringWriter out;
     
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         out = new StringWriter();
         writer = new XmlWriter(out);
@@ -45,48 +46,48 @@ public void setUp() throws Exception {
 
     @Test
     public void returnValues() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("beta", "b"));
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content("gamma"));
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
+        assertEquals( 
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+        assertEquals(
+                writer, writer.attribute("beta", "b"), "XmlWriters should always return themselves");
+        assertEquals(
+                writer, writer.content("gamma"), "XmlWriters should always return themselves");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
     }
 
     @Test
     public void openElement() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Alpha element tag closed and beta started", "<alpha><beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Beta tag ended", "<alpha><beta/>", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("gamma"));
-        assertEquals("Gamma tag started", "<alpha><beta/><gamma", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta", out.toString(), "Alpha element tag closed and beta started");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta/>", out.toString(), "Beta tag ended");
+        assertEquals(
+                writer, writer.openElement("gamma"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta/><gamma", out.toString(), "Gamma tag started");
     }
     
     @Test
     public void invalidElementName() throws Exception {
-        assertTrue("All strings ok", isValidElementName("alpha"));
-        assertTrue("Strings and digits ok", isValidElementName("alpha77"));
-        assertFalse("Must no start with digit", isValidElementName("5alpha77"));
-        assertFalse("Greater than not ok", isValidElementName("alph<a77"));
-        assertFalse("Less than not ok", isValidElementName("alph<a77"));
-        assertFalse("Quote not ok", isValidElementName("alph'a77"));
-        assertTrue("Dash ok", isValidElementName("alph-a77"));
-        assertTrue("Underscore ok", isValidElementName("alph_a77"));
-        assertTrue("Dot ok", isValidElementName("alph.a77"));
-        assertTrue("Colon ok", isValidElementName("alpha:77"));
-        assertFalse("Start with dash not ok", isValidElementName("-a77"));
-        assertTrue("Start with underscore ok", isValidElementName("_a77"));
-        assertFalse("Start with dot not ok", isValidElementName(".a77"));
-        assertTrue("Start with colon ok", isValidElementName(":a77"));
+        assertTrue( isValidElementName("alpha"), "All strings ok");
+        assertTrue(isValidElementName("alpha77"), "Strings and digits ok");
+        assertFalse(isValidElementName("5alpha77"), "Must no start with digit");
+        assertFalse(isValidElementName("alph<a77"), "Greater than not ok");
+        assertFalse(isValidElementName("alph<a77"), "Less than not ok");
+        assertFalse(isValidElementName("alph'a77"), "Quote not ok");
+        assertTrue(isValidElementName("alph-a77"), "Dash ok");
+        assertTrue(isValidElementName("alph_a77"), "Underscore ok");
+        assertTrue(isValidElementName("alph.a77"), "Dot ok");
+        assertTrue(isValidElementName("alpha:77"), "Colon ok");
+        assertFalse(isValidElementName("-a77"), "Start with dash not ok");
+        assertTrue(isValidElementName("_a77"), "Start with underscore ok");
+        assertFalse(isValidElementName(".a77"), "Start with dot not ok");
+        assertTrue(isValidElementName(":a77"), "Start with colon ok");
     }
     
     private boolean isValidElementName(String elementName) throws Exception {
@@ -101,12 +102,12 @@ private boolean isValidElementName(String elementName) throws Exception {
 
     @Test
     public void callOpenElementAfterLastElementClosed() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element alpha is closed", "<alpha/>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha/>", out.toString(), "Element alpha is closed");
         try {
             writer.openElement("delta");
             fail("Cannot open new elements once the first element has been closed");
@@ -117,12 +118,12 @@ public void callOpenElementAfterLastElementClosed() throws Exception {
 
     @Test
     public void callCloseElementAfterLastElementClosed() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element alpha is closed", "<alpha/>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha/>", out.toString(), "Element alpha is closed");
         try {
             writer.closeElement();
             fail("Cannot close elements once the first element has been closed");
@@ -133,28 +134,28 @@ public void callCloseElementAfterLastElementClosed() throws Exception {
 
     @Test
     public void closeFirstElement() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element alpha is closed", "<alpha/>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+        assertEquals("<alpha", out.toString(), "Alpha element started");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha/>", out.toString(), "Element alpha is closed");
     }
     
     @Test
     public void closeElementWithContent() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Beta element started", "<alpha><beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element beta is closed", "<alpha><beta/>", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element beta is closed", "<alpha><beta/></alpha>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+        assertEquals("<alpha", out.toString(), "Alpha element started");
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta/>", out.toString(), "Element beta is closed");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta/></alpha>", out.toString(), "Element beta is closed");
         try {
             writer.closeElement();
             fail("Cannot close elements once the first element has been closed");
@@ -175,24 +176,24 @@ public void closeElementBeforeFirstElement() throws Exception {
     
     @Test
     public void contentAfterElement() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content("foo bar"));
-        assertEquals("Alpha tag closed. Content written", "<alpha>foo bar", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content(" and more foo bar"));
-        assertEquals("Alpha tag closed. Content written", "<alpha>foo bar and more foo bar", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Beta element started", "<alpha>foo bar and more foo bar<beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element beta is closed", "<alpha>foo bar and more foo bar<beta/>", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element beta is closed", "<alpha>foo bar and more foo bar<beta/></alpha>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.content("foo bar"), "XmlWriters should always return themselves");
+        assertEquals("<alpha>foo bar", out.toString(), "Alpha tag closed. Content written");
+        assertEquals(
+                writer, writer.content(" and more foo bar"), "XmlWriters should always return themselves");
+        assertEquals("<alpha>foo bar and more foo bar", out.toString(), "Alpha tag closed. Content written");
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha>foo bar and more foo bar<beta", out.toString());
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha>foo bar and more foo bar<beta/>", out.toString(), "Element beta is closed");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha>foo bar and more foo bar<beta/></alpha>", out.toString(), "Element beta is closed");
         try {
             writer.content("A Sentence Too far");
             fail("Cannot write content once the first element has been closed");
@@ -203,12 +204,12 @@ public void contentAfterElement() throws Exception {
 
     @Test
     public void contentAfterLastElement() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element beta is closed", "<alpha/>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha/>", out.toString(), "Element alpha is closed");
         try {
             writer.content("A Sentence Too far");
             fail("Cannot write content once the first element has been closed");
@@ -229,29 +230,29 @@ public void writeContentBeforeFirstElement() throws Exception {
     
     @Test
     public void contentEscaping() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content("this&that"));
-        assertEquals("Amphersands must be escaped", "<alpha>this&amp;that", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content("small<large"));
-        assertEquals("Left angle brackets must be escaped", "<alpha>this&amp;thatsmall&lt;large", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content("12>1"));
-        assertEquals("Choose to escape right angle brackets", "<alpha>this&amp;thatsmall&lt;large12&gt;1", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.content("this&that"), "XmlWriters should always return themselves");
+        assertEquals("<alpha>this&amp;that", out.toString(), "Amphersands must be escaped");
+        assertEquals(
+                writer, writer.content("small<large"), "XmlWriters should always return themselves");
+        assertEquals("<alpha>this&amp;thatsmall&lt;large", out.toString(), "Left angle brackets must be escaped");
+        assertEquals(
+                writer, writer.content("12>1"), "XmlWriters should always return themselves");
+        assertEquals("<alpha>this&amp;thatsmall&lt;large12&gt;1", out.toString(), "Choose to escape right angle brackets");
 
     }
 
     @Test
     public void attributeAfterLastElement() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Element beta is closed", "<alpha/>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha/>", out.toString(), "Element alpha is closed");
         try {
             writer.attribute("foo", "bar");
             fail("Cannot write content once the first element has been closed");
@@ -273,13 +274,13 @@ public void attributeContentBeforeFirstElement() throws Exception {
     @Test
     public void invalidAttributeName() throws Exception {
         writer.openElement("alpha");
-        assertTrue("All strings ok", isValidAttributeName("alpha"));
-        assertTrue("Strings and digits ok", isValidAttributeName("alpha77"));
-        assertFalse("Must not start with digit", isValidAttributeName("5alpha77"));
-        assertTrue("Colon ok", isValidAttributeName("alpha:77"));
-        assertFalse("Greater than not ok", isValidAttributeName("alph<a77"));
-        assertFalse("Less than not ok", isValidAttributeName("alph<a77"));
-        assertFalse("Quote not ok", isValidAttributeName("alph'a77"));
+        assertTrue(isValidAttributeName("alpha"), "All string ok");
+        assertTrue(isValidAttributeName("alpha77"), "Strings and digits ok");
+        assertFalse(isValidAttributeName("5alpha77"), "Must not start with digit");
+        assertTrue(isValidAttributeName("alpha:77"), "Colon ok");
+        assertFalse(isValidAttributeName("alph<a77"),"Greater than not ok");
+        assertFalse(isValidAttributeName("alph<a77"), "Less than not ok");
+        assertFalse(isValidAttributeName("alph'a77"), "Quote not ok");
     }
     
     private boolean isValidAttributeName(String name) throws Exception {
@@ -294,34 +295,34 @@ private boolean isValidAttributeName(String name) throws Exception {
     
     @Test
     public void escapeAttributeContent() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("one", "this&that"));
-        assertEquals("Amphersands must be escaped", "<alpha one='this&amp;that'", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("two", "small<large"));
-        assertEquals("Left angle brackets must be escaped", "<alpha one='this&amp;that' two='small&lt;large'", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("three", "12>1"));
-        assertEquals("Choose to escape right angle brackets", "<alpha one='this&amp;that' two='small&lt;large' three='12&gt;1'", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("four", "'quote'"));
-        assertEquals("Apostrophes must be escape", "<alpha one='this&amp;that' two='small&lt;large' three='12&gt;1' four='&apos;quote&apos;'", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("five", "\"quote\""));
-        assertEquals("Double quotes must be escape", "<alpha one='this&amp;that' two='small&lt;large' three='12&gt;1' four='&apos;quote&apos;' five='&quot;quote&quot;'", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.attribute("one", "this&that"), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='this&amp;that'", out.toString(), "Amphersands must be escaped");
+        assertEquals(
+                writer, writer.attribute("two", "small<large"), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='this&amp;that' two='small&lt;large'", out.toString(), "Left angle brackets must be escaped");
+        assertEquals(
+                writer, writer.attribute("three", "12>1"), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='this&amp;that' two='small&lt;large' three='12&gt;1'", out.toString(), "Choose to escape right angle brackets");
+        assertEquals(
+                writer, writer.attribute("four", "'quote'"), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='this&amp;that' two='small&lt;large' three='12&gt;1' four='&apos;quote&apos;'", out.toString(), "Apostrophes must be escape");
+        assertEquals(
+                writer, writer.attribute("five", "\"quote\""), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='this&amp;that' two='small&lt;large' three='12&gt;1' four='&apos;quote&apos;' five='&quot;quote&quot;'", out.toString(), "Double quotes must be escape");
 
     }
     
     @Test
     public void attributeInContent() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content("foo bar"));
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.content("foo bar"), "XmlWriters should always return themselves");
         try {
             writer.attribute("name", "value");
             fail("attributes after body content are not allowed");
@@ -332,26 +333,26 @@ public void attributeInContent() throws Exception {
   
     @Test
     public void outOfRangeCharacter() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.content(new String(ZERO_CHAR)));
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.content(new String(ZERO_CHAR)), "XmlWriters should always return themselves");
         String out = this.out.toString();
-        assertEquals("Replace illegal characters with question marks", "<alpha>?", out);
+        assertEquals("<alpha>?", out, "Replace illegal characters with question marks");
     }
     
     @Test
     public void attributeAfterElementClosed() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Beta element started", "<alpha><beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Beta element closed", "<alpha><beta/>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta/>", out.toString(), "Beta element closed");
         try {
             writer.attribute("name", "value");
             fail("attributes after closed element are not allowed");
@@ -372,12 +373,12 @@ public void closeDocumentBeforeOpen() throws Exception {
     
     @Test
     public void closeDocumentAfterRootElementClosed() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Beta element started", "<alpha/>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha/>", out.toString());
         try {
             writer.closeDocument();
         } catch (OperationNotAllowedException e) {
@@ -387,57 +388,57 @@ public void closeDocumentAfterRootElementClosed() throws Exception {
     
     @Test
     public void closeSimpleDocument() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Beta element started", "<alpha><beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeDocument());
-        assertEquals("Beta element started", "<alpha><beta/></alpha>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.closeDocument(), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta/></alpha>", out.toString(), "Beta element started");
     }
     
     @Test
     public void closeComplexDocument() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Beta element started", "<alpha><beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("name", "value"));
-        assertEquals("Beta element started", "<alpha><beta name='value'", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeElement());
-        assertEquals("Beta element started", "<alpha><beta name='value'/>", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Beta element started", "<alpha><beta name='value'/><beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("name", "value"));
-        assertEquals("Beta element started", "<alpha><beta name='value'/><beta name='value'", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("gamma"));
-        assertEquals("Beta element started", "<alpha><beta name='value'/><beta name='value'><gamma", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.closeDocument());
-        assertEquals("Beta element started", "<alpha><beta name='value'/><beta name='value'><gamma/></beta></alpha>", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.attribute("name", "value"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta name='value'", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.closeElement(), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta name='value'/>", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta name='value'/><beta", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.attribute("name", "value"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta name='value'/><beta name='value'", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.openElement("gamma"), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta name='value'/><beta name='value'><gamma", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.closeDocument(), "XmlWriters should always return themselves");
+        assertEquals("<alpha><beta name='value'/><beta name='value'><gamma/></beta></alpha>", out.toString(), "Beta element started");
     }
     
     @Test
     public void writeProlog() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.startDocument());
-        assertEquals("Prolog written", "<?xml version='1.0'?>", out.toString());
+        assertEquals(
+                writer, writer.startDocument(), "XmlWriters should always return themselves");
+        assertEquals("<?xml version='1.0'?>", out.toString(), "Prolog written");
     }
     
     @Test
     public void writeAfterElement() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
         try {
             writer.startDocument();
             fail("Operation not allowed once an element has been written");
@@ -448,9 +449,9 @@ public void writeAfterElement() throws Exception {
     
     @Test
     public void writePrologTwo() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.startDocument());
-        assertEquals("Prolog written", "<?xml version='1.0'?>", out.toString());
+        assertEquals(
+                writer, writer.startDocument(), "XmlWriters should always return themselves");
+        assertEquals("<?xml version='1.0'?>", out.toString(), "Prolog written");
         try {
             writer.startDocument();
             fail("Operation not allow once a prolog has been written");
@@ -461,18 +462,18 @@ public void writePrologTwo() throws Exception {
     
     @Test
     public void duplicateAttributes() throws Exception {
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("alpha"));
-        assertEquals("Alpha element started", "<alpha", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("one", "1"));
-        assertEquals("Attribute written", "<alpha one='1'", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.openElement("beta"));
-        assertEquals("Beta element started", "<alpha one='1'><beta", out.toString());
-        assertEquals("XmlWriters should always return themselves", 
-                writer, writer.attribute("one", "1"));
-        assertEquals("Beta element started", "<alpha one='1'><beta one='1'", out.toString());
+        assertEquals(
+                writer, writer.openElement("alpha"), "XmlWriters should always return themselves");
+         assertEquals("<alpha", out.toString(), "Alpha element started");;
+        assertEquals(
+                writer, writer.attribute("one", "1"), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='1'", out.toString(), "Attribute written");
+        assertEquals(
+                writer, writer.openElement("beta"), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='1'><beta", out.toString(), "Beta element started");
+        assertEquals(
+                writer, writer.attribute("one", "1"), "XmlWriters should always return themselves");
+        assertEquals("<alpha one='1'><beta one='1'", out.toString(), "Beta element started");
         try {
             writer.attribute("one", "2");
             fail("Each attribute may only be written once");
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
index d806981ee..bb75d232a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TextUtils.java
@@ -18,21 +18,23 @@
  */
 package org.apache.rat.testhelpers;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.regex.Pattern;
 
-import org.junit.Assert;
 
 public class TextUtils {
     public static final String[] EMPTY = {};
     
     public static void assertPatternInOutput(String pPattern, String out) {
-        Assert.assertTrue("Output does not match string: " + pPattern+"\n"+out,
-                isMatching(pPattern, out));
+        assertTrue(
+                isMatching(pPattern, out), ()->"Output does not match string: " + pPattern+"\n"+out);
     }
     
     public static void assertPatternNotInOutput(String pPattern, String out) {
-        Assert.assertFalse("Output matches the pattern: " + pPattern+"\n"+out,
-                isMatching(pPattern, out));
+        assertFalse(
+                isMatching(pPattern, out), ()->"Output matches the pattern: " + pPattern+"\n"+out);
     }
 
    public static boolean isMatching(final String pPattern, final String pValue) {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
index 6e130aeb2..230a965a1 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/XmlUtils.java
@@ -18,7 +18,7 @@
  */
 package org.apache.rat.testhelpers;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -116,7 +116,7 @@ public static Node checkNode(Document doc, XPath xpath, String resource, String
 
     public static Node getNode(Object source, XPath xPath, String xpath) throws XPathExpressionException {
         NodeList nodeList = (NodeList) xPath.compile(xpath).evaluate(source, XPathConstants.NODESET);
-        assertEquals("Could not find " + xpath, 1, nodeList.getLength());
+        assertEquals(1, nodeList.getLength(), "Could not find " + xpath);
         return nodeList.item(0);
     }
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
index 151df3468..1e8e53198 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
@@ -25,28 +25,41 @@
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
 import org.apache.rat.report.RatReport;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.apache.commons.io.FileUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.attribute.DosFileAttributeView;
 import java.nio.file.attribute.DosFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
 
 public class DirectoryWalkerTest {
+    
+    private File toWalk;
+    
+    @BeforeEach
+    public void setup() throws IOException {
+        toWalk = Files.createTempDirectory("dwt").toFile();
+    }
+    
+    @AfterEach
+    public void teardown() throws IOException {
+        FileUtils.deleteDirectory(toWalk);
+    }
 
-    @Rule
-    public TemporaryFolder folder = new TemporaryFolder();
 
     @Test
     public void walk() throws IOException, RatException {
-        File toWalk = folder.newFolder("test");
         File regular = new File(toWalk, "regular");
         regular.mkdir();
         File regularFile = new File(regular, "test");
@@ -68,13 +81,13 @@ public void walk() throws IOException, RatException {
         List<String> scanned = new ArrayList<>();
         walker.run(new TestRatReport(scanned));
 
-        Assert.assertEquals(1, scanned.size());
+        assertEquals(1, scanned.size());
 
         walker = new DirectoryWalker(toWalk, FalseFileFilter.FALSE);
         scanned = new ArrayList<>();
         walker.run(new TestRatReport(scanned));
 
-        Assert.assertEquals(2, scanned.size());
+        assertEquals(2, scanned.size());
     }
 
     class TestRatReport implements RatReport {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/walker/FileNameComparatorTest.java b/apache-rat-core/src/test/java/org/apache/rat/walker/FileNameComparatorTest.java
index 5ac932dc8..dd1e9340b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/walker/FileNameComparatorTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/walker/FileNameComparatorTest.java
@@ -19,12 +19,12 @@
 package org.apache.rat.walker;
 
 import org.apache.rat.test.utils.Resources;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FileNameComparatorTest {
 
@@ -33,6 +33,6 @@ public void compare() throws IOException {
         FileNameComparator comparator = new FileNameComparator();
         assertNotNull(comparator);
         final int compare = comparator.compare(Resources.getResourceFile("elements/LICENSE"), Resources.getResourceFile("elements/NOTICE"));
-        assertTrue("LICENSE is before NOTICE", compare < 0);
+        assertTrue(compare < 0, "LICENSE is before NOTICE");
     }
 }
diff --git a/apache-rat-core/src/test/resources/violations/FilterTest.cs.new b/apache-rat-core/src/test/resources/violations/FilterTest.cs.new
new file mode 100644
index 000000000..6a92efac0
--- /dev/null
+++ b/apache-rat-core/src/test/resources/violations/FilterTest.cs.new
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#if NET_2_0
+using System;
+using System.Collections.Generic;
+using System.Xml;
+using log4net.Appender;
+using log4net.Config;
+using log4net.Core;
+using log4net.Filter;
+using log4net.Repository;
+using NUnit.Framework;
+
+namespace log4net.Tests.Filter
+{
+    [TestFixture]
+    public class FilterTest
+    {
+        [Test]
+        public void FilterConfigurationTest()
+        {
+            XmlDocument log4netConfig = new XmlDocument();
+            #region Load log4netConfig
+            log4netConfig.LoadXml(@"
+            <log4net>
+            <appender name=""MemoryAppender"" type=""log4net.Appender.MemoryAppender, log4net"">
+                <filter type=""log4net.Tests.Filter.MultiplePropertyFilter, log4net.Tests"">
+                    <condition>
+                        <key value=""ABC"" />
+                        <stringToMatch value=""123"" />
+                    </condition>
+                    <condition>
+                        <key value=""DEF"" />
+                        <stringToMatch value=""456"" />
+                    </condition>
+                </filter>
+            </appender>
+            <root>
+                <level value=""ALL"" />
+                <appender-ref ref=""MemoryAppender"" />
+            </root>
+            </log4net>");
+            #endregion
+
+            ILoggerRepository rep = LogManager.CreateRepository(Guid.NewGuid().ToString());
+            XmlConfigurator.Configure(rep, log4netConfig["log4net"]);
+
+            IAppender[] appenders = LogManager.GetRepository(rep.Name).GetAppenders();
+            Assert.IsTrue(appenders.Length == 1);
+
+            IAppender appender = Array.Find(appenders, a => a.Name == "MemoryAppender");
+            Assert.IsNotNull(appender);
+
+            MultiplePropertyFilter multiplePropertyFilter = 
+                ((AppenderSkeleton)appender).FilterHead as MultiplePropertyFilter;
+
+            var conditions = multiplePropertyFilter.GetConditions();
+            Assert.AreEqual(2, conditions.Length);
+            Assert.AreEqual("ABC", conditions[0].Key);
+            Assert.AreEqual("123", conditions[0].StringToMatch);
+            Assert.AreEqual("DEF", conditions[1].Key);
+            Assert.AreEqual("456", conditions[1].StringToMatch);
+        }
+    }
+
+    public class MultiplePropertyFilter : FilterSkeleton
+    {
+        private readonly List<Condition> _conditions = new List<Condition>();
+
+        public override FilterDecision Decide(LoggingEvent loggingEvent)
+        {
+            return FilterDecision.Accept;
+        }
+
+        public Condition[] GetConditions()
+        {
+            return _conditions.ToArray();
+        }
+
+        public void AddCondition(Condition condition)
+        {
+            _conditions.Add(condition);
+        }
+        
+        public class Condition
+        {
+            public string Key { get; set; }
+            public string StringToMatch { get; set; }
+        }
+    }
+}
+#endif
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index c2c629168..048af99dc 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -164,13 +164,20 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>text</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>text</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
index 1af2b9aef..2ea61c600 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
@@ -19,10 +19,9 @@
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.rat.config.SourceCodeManagementSystems;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.Mockito;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -34,23 +33,23 @@
 import static org.apache.rat.mp.util.ExclusionHelper.addIdeaDefaults;
 import static org.apache.rat.mp.util.ExclusionHelper.addMavenDefaults;
 import static org.apache.rat.mp.util.ExclusionHelper.addPlexusAndScmDefaults;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
-@RunWith(MockitoJUnitRunner.class)
 public class ExclusionHelperTest {
 
-    @Mock
-    private Log log;
+    
+    private Log log = Mockito.mock(Log.class);
 
     @Test
     public void testNumberOfExclusions() {
-        assertEquals("Did you change the number of eclipse excludes?", 5,
-                ECLIPSE_DEFAULT_EXCLUDES.size());
-        assertEquals("Did you change the number of idea excludes?", 4,
-                IDEA_DEFAULT_EXCLUDES.size());
-        assertEquals("Did you change the number of mvn excludes?", 8,
-                MAVEN_DEFAULT_EXCLUDES.size());
+        assertEquals(5,
+                ECLIPSE_DEFAULT_EXCLUDES.size(),"Did you change the number of eclipse excludes?");
+        assertEquals(4,
+                IDEA_DEFAULT_EXCLUDES.size(), "Did you change the number of idea excludes?");
+        assertEquals(8,
+                MAVEN_DEFAULT_EXCLUDES.size(), "Did you change the number of mvn excludes?");
     }
 
     @Test
@@ -95,14 +94,15 @@ public void testAddingPlexusAndScmExclusion() {
         assertTrue(exclusion.isEmpty());
         exclusion.addAll(addPlexusAndScmDefaults(log, true));
         assertEquals(
-                "Did you upgrade plexus to get more default excludes?",//
                 expectedSizeMergedFromPlexusDefaultsAndScm,//
-                exclusion.size());
+                exclusion.size(), //
+                "Did you upgrade plexus to get more default excludes?");
         exclusion.addAll(addPlexusAndScmDefaults(log, true));
         assertEquals(
-                "Did you upgrade plexus to get more default excludes?",//
                 expectedSizeMergedFromPlexusDefaultsAndScm,//
-                exclusion.size());
+                exclusion.size(), //
+                "Did you upgrade plexus to get more default excludes?"
+                );
     }
 
 }
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
index 342380dc6..0a2e95fe4 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
@@ -18,33 +18,31 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.shared.utils.io.FileUtils;
 import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.List;
 
 import static org.apache.rat.mp.util.ScmIgnoreParser.getExclusionsFromSCM;
 import static org.apache.rat.mp.util.ignore.GlobIgnoreMatcher.isComment;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
-@RunWith(MockitoJUnitRunner.class)
-public class ScmIgnoreParserTest {
-    @Rule
-    public final TemporaryFolder testFolder = new TemporaryFolder();
 
-    @Mock
-    private Log log;
+public class ScmIgnoreParserTest {
+     
+    private Log log = Mockito.mock(Log.class);
 
     private static final String IGNORE_EXAMPLE = "**/*.java\r\n## Justus commentos\r\nignoredDirectory";
 
@@ -86,13 +84,19 @@ public void parseFromTargetDirectoryHopefullyWithoutSCMIgnores() {
 
     @Test
     public void parseFromEmptyIgnoreFile() throws IOException {
-        File ignore = testFolder.newFile();
-        assertTrue(ignore.exists());
-        writeToFile(IGNORE_EXAMPLE, ignore);
+        File ignore = null;
+        try {
+            ignore = Files.createTempFile("sip", null).toFile();
+            assertTrue(ignore.exists());
+            writeToFile(IGNORE_EXAMPLE, ignore);
+        
+            final List<String> excludes = getExcludesFromFile(log, ignore);
+            assertFalse(excludes.isEmpty());
+            assertEquals(2, excludes.size());
+        } finally {
+            ignore.delete();
+        }
 
-        final List<String> excludes = getExcludesFromFile(log, ignore);
-        assertFalse(excludes.isEmpty());
-        assertEquals(2, excludes.size());
     }
 
     private static void writeToFile(String contents, File file) throws IOException {
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 6a323388e..4099b6ced 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -57,8 +57,12 @@
       <artifactId>ant-antunit</artifactId>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
diff --git a/apache-rat-tools/pom.xml.new b/apache-rat-tools/pom.xml.new
new file mode 100644
index 000000000..73496c267
--- /dev/null
+++ b/apache-rat-tools/pom.xml.new
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.rat.test</groupId>
+  <artifactId>it2</artifactId>
+  <version>1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>@pom.version@</version>
+        <configuration>
+						<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
+						<licenses>
+							<license><family>MIT</family> <!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense" -->
+								<!-- <licenseFamilyCategory>MIT</licenseFamilyCategory>
+								<licenseFamilyName>MIT</licenseFamilyName> -->
+								<notes></notes>
+								<!-- <patterns>
+									<pattern>Licensed MIT</pattern>
+									<pattern>Licensed under MIT</pattern>
+									<pattern>Licensed under the MIT license</pattern>
+									<pattern>MIT/GPL2 Licensed</pattern>
+									<pattern>licensed under the MIT and GPL</pattern>
+									<pattern>MIT license</pattern> 
+								</patterns> -->
+								<any>
+									<text>Licensed MIT</text>
+									<text>Licensed under MIT</text>
+									<text>Licensed under the MIT license</text>
+									<text>MIT/GPL2 Licensed</text>
+									<text>licensed under the MIT and GPL</text>
+									<text>MIT license</text>
+								</any>
+							</license>
+							<license><family>BSD</family><!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">--> 
+								<!-- <licenseFamilyCategory>BSD</licenseFamilyCategory>
+								<licenseFamilyName>BSD</licenseFamilyName> -->
+								<notes></notes>
+<!--								<patterns>-->
+<!--									<pattern>BSD-style license</pattern>-->
+<!--								</patterns>-->
+<text>BSD-style license</text>
+							</license>
+							<license><family>CC BY</family> <!-- implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> -->
+								<!-- <licenseFamilyCategory>Creative Commons Attribution</licenseFamilyCategory> -->
+								<!-- <licenseFamilyName>CC BY</licenseFamilyName> -->
+								<notes></notes>
+								<!-- <patterns>
+									<pattern>creativecommons.org/licenses/by/4.0</pattern>
+								</patterns> -->
+								<text>creativecommons.org/licenses/by/4.0</text>
+							</license>
+						</licenses>
+						<families>
+								<family><id>MIT</id><name>MIT</name></family>
+								<family><id>BSD</id><name>BSD</name></family>
+								<family><id>CC BY</id><name>CC BY</name></family>
+						</families>
+						<!-- <licenseFamilies> 
+							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+								<familyName>MIT</familyName>
+							</licenseFamily>
+							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+								<familyName>BSD</familyName>
+							</licenseFamily>
+							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+								<familyName>CC BY</familyName>
+							</licenseFamily>
+						</licenseFamilies> --> 
+						<excludes>
+							<exclude>**/*.mp3</exclude>
+							<exclude>**/localhost.jks</exclude>
+							<exclude>**/node_modules/**</exclude>
+							<exclude>**/package-lock.json</exclude>
+							<exclude>**/target/**</exclude>
+							<exclude>**/.project</exclude>
+							<exclude>**/.classpath</exclude>
+							<exclude>**/.settings/**</exclude>
+							<exclude>.gitattributes</exclude>
+						</excludes>
+
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/pom.xml b/pom.xml
index ba6db540a..2ef75beb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,8 @@ agnostic home for software distribution comprehension and audit tools.
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
     <previousRatVersion>0.16.1</previousRatVersion>
     <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
+    <junit.version>5.10.0</junit.version>
+    <junit.platform.version>1.8.1</junit.platform.version>
   </properties>
   <distributionManagement>
     <site>
@@ -118,9 +120,39 @@ agnostic home for software distribution comprehension and audit tools.
         <version>1.25.0</version>
       </dependency>
       <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.2</version>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-migrationsupport</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-engine</artifactId>
+          <version>${junit.version}</version>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-runner</artifactId>
+        <version>${junit.platform.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -412,8 +444,8 @@ agnostic home for software distribution comprehension and audit tools.
                   <pluginExecutionFilter>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>
-        							apache-rat-plugin
-        						</artifactId>
+                      apache-rat-plugin
+                    </artifactId>
                     <versionRange>[0.16,)</versionRange>
                     <goals>
                       <goal>check</goal>

From d01009d83f29ddffdf4ba8d07ac1618945513243 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 13 Jan 2024 17:30:44 +0100
Subject: [PATCH 244/299] removed API module

---
 apache-rat-api/.gitignore                     |  19 --
 apache-rat-api/pom.xml                        |  42 ----
 .../apache/rat/api/domain/LicenseFamily.java  | 100 --------
 .../rat/api/domain/LicenseFamilyBuilder.java  |  97 --------
 .../rat/api/domain/RatLicenseFamily.java      | 171 -------------
 apache-rat-api/src/site/apt/index.apt.vm      |  26 --
 apache-rat-api/src/site/site.xml              |  29 ---
 .../api/domain/LicenseFamilyBuilderTest.java  |  63 -----
 .../rat/api/domain/RatLicenseFamilyTest.java  | 226 ------------------
 apache-rat-core/pom.xml                       |   4 -
 apache-rat-plugin/pom.xml                     |   4 +-
 pom.xml                                       |   6 -
 12 files changed, 2 insertions(+), 785 deletions(-)
 delete mode 100644 apache-rat-api/.gitignore
 delete mode 100644 apache-rat-api/pom.xml
 delete mode 100644 apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java
 delete mode 100644 apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java
 delete mode 100644 apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
 delete mode 100644 apache-rat-api/src/site/apt/index.apt.vm
 delete mode 100644 apache-rat-api/src/site/site.xml
 delete mode 100644 apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java
 delete mode 100644 apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java

diff --git a/apache-rat-api/.gitignore b/apache-rat-api/.gitignore
deleted file mode 100644
index 22e11310c..000000000
--- a/apache-rat-api/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.ipr
-*.iws
-/target/*
-**/target/*
-.svn
-**/.svn
-.project
-*/.project
-.classpath
-*/.classpath
-.settings
-*/.settings
-*.iml
-*/*.iml
-*/*.ipr
-*/*.iws
-.idea/*
-*/.idea
-/target/
diff --git a/apache-rat-api/pom.xml b/apache-rat-api/pom.xml
deleted file mode 100644
index 2a5c798e3..000000000
--- a/apache-rat-api/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.rat</groupId>
-    <artifactId>apache-rat-project</artifactId>
-    <version>0.16.1-SNAPSHOT</version>
-  </parent>
-  <packaging>jar</packaging>
-  <artifactId>apache-rat-api</artifactId>
-  <name>Apache Creadur Rat::API</name>
-  <description>Shared beans and services.</description>
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java
deleted file mode 100644
index c216d6a5b..000000000
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamily.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.api.domain;
-
-/**
- * Licenses are grouped into families. Each family has similar legal semantics,
- * though some small details may differ.
- * <p>
- * For example, the <a href='https://opensource.org/licenses/BSD-3-Clause'>3
- * clause BSD license</a> is in a family where members differ by &lt;OWNER&gt;,
- * &lt;ORGANIZATION&gt; and &lt;YEAR&gt; parameters.
- * 
- */
-@Deprecated
-public final class LicenseFamily {
-
-    /**
-     * Further information associated with the license family. Human readable.
-     * Possibly null.
-     */
-    private final String notes;
-    /**
-     * Names of the category containing this license family. Choosing a suitable
-     * URI is recommended. Possibly null;
-     */
-    private final String category;
-    /**
-     * Uniquely identifies this family. Choosing a suitable URI is recommended.
-     * Not null.
-     */
-    private final String name;
-
-    /**
-     * Constructs an immutable license family.
-     * 
-     * @param name
-     *            the name uniquely identifying this family. Recommended that
-     *            this be an URI. Not null.
-     * @param category
-     *            the name of the category containing this license family.
-     *            Recommended that this be an URI. Possibly null.
-     * @param notes
-     *            further information associated with the license family. Human
-     *            readable. Possibly null.
-     */
-    public LicenseFamily(final String name, final String category,
-            final String notes) {
-        super();
-        this.notes = notes;
-        this.category = category;
-        this.name = name;
-    }
-
-    /**
-     * Gets further information associated with the license family. Human
-     * readable.
-     * 
-     * @return possibly null
-     */
-    public String getNotes() {
-        return this.notes;
-    }
-
-    /**
-     * Gets the name of the category containing this license family. Recommended
-     * that this be an URI.
-     * 
-     * @return possibly null
-     */
-    public String getCategory() {
-        return this.category;
-    }
-
-    /**
-     * Gets the name uniquely identifying this family. Recommended that this be
-     * an URI.
-     * 
-     * @return not null
-     */
-    public String getName() {
-        return this.name;
-    }
-
-}
diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java
deleted file mode 100644
index 38099e317..000000000
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/LicenseFamilyBuilder.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.api.domain;
-
-/**
- * Builds {@link LicenseFamily} instances.
- */
-@Deprecated
-public final class LicenseFamilyBuilder {
-
-    /**
-     * Begins to build a license family.
-     * 
-     * @return a builder for a license family, not null
-     */
-    public static LicenseFamilyBuilder aLicenseFamily() {
-        return new LicenseFamilyBuilder();
-    }
-
-    /** Further information associated with the license family. Human readable. */
-    private String notes;
-    /**
-     * Names of the category containing this license family. Recommended that
-     * this be an URI.
-     */
-    private String category;
-    /** Uniquely identifies this family. Choosing a suitable URI is recommended */
-    private String name;
-
-    /** Use {@link #aLicenseFamily()  */
-    private LicenseFamilyBuilder() {
-    }
-
-    /**
-     * Builds a family.
-     * 
-     * @return not null
-     */
-    public LicenseFamily build() {
-        return new LicenseFamily(this.name, this.category, this.notes);
-    }
-
-    /**
-     * Builds family with further information associated with the license
-     * family. Human readable.
-     * 
-     * @param notes
-     *            possibly null
-     * @return this instance, not null
-     */
-    public LicenseFamilyBuilder withNotes(final String notes) {
-        this.notes = notes;
-        return this;
-    }
-
-    /**
-     * Builds family with category containing this license family. Choosing a
-     * suitable URI is recommended
-     * 
-     * @param category
-     *            possible null
-     * @return this instance, not null
-     */
-    public LicenseFamilyBuilder withCategory(final String category) {
-        this.category = category;
-        return this;
-    }
-
-    /**
-     * 
-     * Uniquely identifies this family. Choosing a suitable URI is recommended.
-     * 
-     * @param name
-     *            not null
-     * @return this instance, not null
-     */
-    public LicenseFamilyBuilder withName(final String name) {
-        this.name = name;
-        return this;
-    }
-}
diff --git a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java b/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
deleted file mode 100644
index a596f8ee8..000000000
--- a/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rat.api.domain;
-
-import static org.apache.rat.api.domain.LicenseFamilyBuilder.aLicenseFamily;
-
-/**
- * Enumerates standard license families known to Rat.
- */
-@Deprecated
-public enum RatLicenseFamily {
-
-	/**
-	 * Apache License Version 2.0
-	 */
-	APACHE(
-			"Apache License Version 2.0",
-			"AL   ",
-			"Note that APACHE requires a NOTICE. All modifications require notes. See http://www.apache.org/licenses/LICENSE-2.0."),
-	/**
-	 * GNU General Public License, version 1
-	 */
-	GPL1(
-			"GNU General Public License, version 1",
-			"GPL1 ",
-			"Note that GPL1 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-1.0.html."),
-	/**
-	 * GNU General Public License, version 2
-	 */
-	GPL2(
-			"GNU General Public License, version 2",
-			"GPL2 ",
-			"Note that GPL2 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-2.0.html."),
-	/**
-	 * GNU General Public License, version 3
-	 */
-	GPL3(
-			"GNU General Public License, version 3",
-			"GPL3 ",
-			"Note that GPL3 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-3.0.html."),
-	/**
-	 * The MIT License
-	 */
-	MIT(
-			"The MIT License",
-			"MIT  ",
-			"Note that MIT requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/MIT."),
-
-	/**
-	 * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
-	 */
-	CDDL1(
-			"COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0",
-			"CDDL1",
-			"Note that CDDL1 requires a NOTICE. All modifications require notes. See https://oss.oracle.com/licenses/CDDL."),
-	/**
-	 * OASIS Open License
-	 */
-	OASIS(
-			"OASIS Open License",
-			"OASIS",
-			"Note that OASIS requires a NOTICE. All modifications require notes. See https://www.oasis-open.org/policies-guidelines/ipr."),
-	/**
-	 * Modified BSD License
-	 */
-	TMF854(
-			"Modified BSD License",
-			"TMF  ",
-			"Note that TMF854 requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/BSD-3-Clause."),
-	/**
-	 * Modified BSD License
- 	 */
-	DOJO(
-			"Modified BSD License",
-			"DOJO ",
-			"Note that DOJO requires a NOTICE. All modifications require notes. See http://dojotoolkit.org/community/licensing.shtml."),
-	/**
-	 * W3C Software Copyright
-	 */
-	W3C(
-            "W3C Software Copyright",
-            "W3C  ",
-            "Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231."),
-	/**
-	 * W3C Document Copyright
-	 */
-    W3C_DOCUMENTATION(
-            "W3C Document Copyright",
-            "W3CD ",
-            "Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.");
-
-    /** @see LicenseFamily#getName() */
-    private final String name;
-    /** @see LicenseFamily#getCategory() */
-    private final String category;
-    /** @see LicenseFamily#getNotes() */
-    private final String notes;
-    /** Constructed from other data */
-    private final LicenseFamily licenseFamily;
-
-    /**
-     * Constructs an instance.
-     * 
-     * @param name
-     *            not null
-     * @param category
-     *            not null
-     * @param notes
-     *            not null
-     */
-	RatLicenseFamily(final String name, final String category,
-					 final String notes) {
-        this.name = name;
-        this.category = category;
-        this.notes = notes;
-        this.licenseFamily = aLicenseFamily().withCategory(getCategory())
-                .withName(getName()).withNotes(getNotes()).build();
-    }
-
-    /**
-     * @see LicenseFamily#getName()
-     * 
-     * @return not null
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * @see LicenseFamily#getCategory()
-     * 
-     * @return possibly null
-     */
-    public String getCategory() {
-        return this.category;
-    }
-
-    /**
-     * @see LicenseFamily#getNotes()
-     * 
-     * @return possibly null
-     */
-    public String getNotes() {
-        return this.notes;
-    }
-
-    /**
-     * Gets a {@link LicenseFamily} representing this data.
-     * 
-     * @return not null
-     */
-    public LicenseFamily licenseFamily() {
-        return this.licenseFamily;
-    }
-}
diff --git a/apache-rat-api/src/site/apt/index.apt.vm b/apache-rat-api/src/site/apt/index.apt.vm
deleted file mode 100644
index 482070358..000000000
--- a/apache-rat-api/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~~   Licensed to the Apache Software Foundation (ASF) under one or more
-~~   contributor license agreements.  See the NOTICE file distributed with
-~~   this work for additional information regarding copyright ownership.
-~~   The ASF licenses this file to You under the Apache License, Version 2.0
-~~   (the "License"); you may not use this file except in compliance with
-~~   the License.  You may obtain a copy of the License at
-~~
-~~       http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~   Unless required by applicable law or agreed to in writing, software
-~~   distributed under the License is distributed on an "AS IS" BASIS,
-~~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~   See the License for the specific language governing permissions and
-~~   limitations under the License.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-                   --------------------------
-                   API Module
-                   --------------------------
-
-About Apache Rat API
-
-
-  The Rat API module provides the public interface, which license developers should adhere to.
-
diff --git a/apache-rat-api/src/site/site.xml b/apache-rat-api/src/site/site.xml
deleted file mode 100644
index cb413e4fd..000000000
--- a/apache-rat-api/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"
-         name="Apache Rat&trade; API">
-  <body>   
-    <head>
-      <![CDATA[<link href="https://fonts.googleapis.com/css?family=Mate+SC" type="text/css" rel="stylesheet" />]]>
-    </head>
-   
-    <menu ref="parent"/>
-    <menu ref="reports"/>
-  </body>
-</project>
diff --git a/apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java b/apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java
deleted file mode 100644
index a86d7712b..000000000
--- a/apache-rat-api/src/test/java/org/apache/rat/api/domain/LicenseFamilyBuilderTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements.  See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership.  The ASF licenses this file
-// *  to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// *  with the License.  You may obtain a copy of the License at
-// *
-// *   http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied.  See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// */
-//package org.apache.rat.api.domain;
-//
-//import static org.hamcrest.CoreMatchers.is;
-//import static org.hamcrest.MatcherAssert.assertThat;
-//import static org.junit.Assert.assertNotNull;
-//
-//import org.junit.Test;
-//
-//public class LicenseFamilyBuilderTest {
-//
-//    @Test
-//    public void testBuilderBuilds() {
-//        final LicenseFamily family =
-//                LicenseFamilyBuilder.aLicenseFamily().build();
-//        assertNotNull("Builder should build", family);
-//    }
-//
-//    @Test
-//    public void testWithNotes() {
-//        final String someNotes = "Some notes";
-//        final LicenseFamily family =
-//                LicenseFamilyBuilder.aLicenseFamily().withNotes(someNotes)
-//                        .build();
-//        assertThat(family.getNotes(), is(someNotes));
-//    }
-//
-//    @Test
-//    public void testWithCategory() {
-//        final String someCategory = "Some license category";
-//        final LicenseFamily family =
-//                LicenseFamilyBuilder.aLicenseFamily()
-//                        .withCategory(someCategory).build();
-//        assertThat(family.getCategory(), is(someCategory));
-//    }
-//
-//    @Test
-//    public void testWithName() {
-//        final String someName = "A name for a license";
-//        final LicenseFamily family =
-//                LicenseFamilyBuilder.aLicenseFamily().withName(someName)
-//                        .build();
-//        assertThat(family.getName(), is(someName));
-//
-//    }
-//}
diff --git a/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java b/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
deleted file mode 100644
index cee8b0f6a..000000000
--- a/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements.  See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership.  The ASF licenses this file
-// *  to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// *  with the License.  You may obtain a copy of the License at
-// *
-// *   http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied.  See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// */
-//package org.apache.rat.api.domain;
-//
-//import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
-//import static org.apache.rat.api.domain.RatLicenseFamily.CDDL1;
-//import static org.apache.rat.api.domain.RatLicenseFamily.DOJO;
-//import static org.apache.rat.api.domain.RatLicenseFamily.GPL1;
-//import static org.apache.rat.api.domain.RatLicenseFamily.GPL2;
-//import static org.apache.rat.api.domain.RatLicenseFamily.GPL3;
-//import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
-//import static org.apache.rat.api.domain.RatLicenseFamily.OASIS;
-//import static org.apache.rat.api.domain.RatLicenseFamily.TMF854;
-//import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
-//import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
-//import static org.hamcrest.CoreMatchers.is;
-//import static org.hamcrest.MatcherAssert.assertThat;
-//
-//import org.junit.Test;
-//
-//public class RatLicenseFamilyTest {
-//
-//    @Test
-//    public void testW3CLicenseFamilyCategory() {
-//        assertThat(W3C.getCategory(), is("W3C  "));
-//    }
-//
-//    @Test
-//    public void testW3CLicenseFamilyName() {
-//        assertThat(W3C.getName(), is("W3C Software Copyright"));
-//    }
-//
-//    @Test
-//    public void testW3CLicenseFamilyNotes() {
-//        assertThat(
-//                W3C.getNotes(),
-//                is("Note that W3C requires a NOTICE. All modifications require notes. See http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231."));
-//    }
-//
-//    @Test
-//    public void testW3CDocLicenseFamilyCategory() {
-//        assertThat(W3C_DOCUMENTATION.getCategory(), is("W3CD "));
-//    }
-//
-//    @Test
-//    public void testW3CDocLicenseFamilyName() {
-//        assertThat(W3C_DOCUMENTATION.getName(), is("W3C Document Copyright"));
-//    }
-//
-//    @Test
-//    public void testW3CDocLicenseFamilyNotes() {
-//        assertThat(
-//                W3C_DOCUMENTATION.getNotes(),
-//                is("Note that W3CD does not allow modifications. See http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231."));
-//    }
-//
-//	@Test
-//	public void testAPACHELicenseFamilyCategory() {
-//		assertThat(APACHE.getCategory(), is("AL   "));
-//	}
-//
-//	@Test
-//	public void testAPACHELicenseFamilyName() {
-//		assertThat(APACHE.getName(), is("Apache License Version 2.0"));
-//	}
-//
-//	@Test
-//	public void testAPACHELicenseFamilyNotes() {
-//		assertThat(
-//				APACHE.getNotes(),
-//				is("Note that APACHE requires a NOTICE. All modifications require notes. See http://www.apache.org/licenses/LICENSE-2.0."));
-//	}
-//
-//	@Test
-//	public void testGPL1LicenseFamilyCategory() {
-//		assertThat(GPL1.getCategory(), is("GPL1 "));
-//	}
-//
-//	@Test
-//	public void testGPL1LicenseFamilyName() {
-//		assertThat(GPL1.getName(), is("GNU General Public License, version 1"));
-//	}
-//
-//	@Test
-//	public void testGPL1LicenseFamilyNotes() {
-//		assertThat(
-//				GPL1.getNotes(),
-//				is("Note that GPL1 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-1.0.html."));
-//	}
-//
-//	@Test
-//	public void testGPL2LicenseFamilyCategory() {
-//		assertThat(GPL2.getCategory(), is("GPL2 "));
-//	}
-//
-//	@Test
-//	public void testGPL2LicenseFamilyName() {
-//		assertThat(GPL2.getName(), is("GNU General Public License, version 2"));
-//	}
-//
-//	@Test
-//	public void testGPL2LicenseFamilyNotes() {
-//		assertThat(
-//				GPL2.getNotes(),
-//				is("Note that GPL2 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-2.0.html."));
-//	}
-//
-//	@Test
-//	public void testGPL3LicenseFamilyCategory() {
-//		assertThat(GPL3.getCategory(), is("GPL3 "));
-//	}
-//
-//	@Test
-//	public void testGPL3LicenseFamilyName() {
-//		assertThat(GPL3.getName(), is("GNU General Public License, version 3"));
-//	}
-//
-//	@Test
-//	public void testGPL3LicenseFamilyNotes() {
-//		assertThat(
-//				GPL3.getNotes(),
-//				is("Note that GPL3 requires a NOTICE. All modifications require notes. See http://www.gnu.org/licenses/gpl-3.0.html."));
-//	}
-//
-//	@Test
-//	public void testMITLicenseFamilyCategory() {
-//		assertThat(MIT.getCategory(), is("MIT  "));
-//	}
-//
-//	@Test
-//	public void testMITLicenseFamilyName() {
-//		assertThat(MIT.getName(), is("The MIT License"));
-//	}
-//
-//	@Test
-//	public void testMITLicenseFamilyNotes() {
-//		assertThat(
-//				MIT.getNotes(),
-//				is("Note that MIT requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/MIT."));
-//	}
-//
-//	@Test
-//	public void testCDDL1LicenseFamilyCategory() {
-//		assertThat(CDDL1.getCategory(), is("CDDL1"));
-//	}
-//
-//	@Test
-//	public void testCDDL1LicenseFamilyName() {
-//		assertThat(CDDL1.getName(),
-//				is("COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0"));
-//	}
-//
-//	@Test
-//	public void testCDDL1LicenseFamilyNotes() {
-//		assertThat(
-//				CDDL1.getNotes(),
-//				is("Note that CDDL1 requires a NOTICE. All modifications require notes. See https://oss.oracle.com/licenses/CDDL."));
-//	}
-//
-//	@Test
-//	public void testOASISLicenseFamilyCategory() {
-//		assertThat(OASIS.getCategory(), is("OASIS"));
-//	}
-//
-//	@Test
-//	public void testOASISLicenseFamilyName() {
-//		assertThat(OASIS.getName(), is("OASIS Open License"));
-//	}
-//
-//	@Test
-//	public void testOASISLicenseFamilyNotes() {
-//		assertThat(
-//				OASIS.getNotes(),
-//				is("Note that OASIS requires a NOTICE. All modifications require notes. See https://www.oasis-open.org/policies-guidelines/ipr."));
-//	}
-//	
-//	@Test
-//	public void testTMF854LicenseFamilyCategory() {
-//		assertThat(TMF854.getCategory(), is("TMF  "));
-//	}
-//
-//	@Test
-//	public void testTMF854LicenseFamilyName() {
-//		assertThat(TMF854.getName(), is("Modified BSD License"));
-//	}
-//
-//	@Test
-//	public void testTMF854LicenseFamilyNotes() {
-//		assertThat(
-//				TMF854.getNotes(),
-//				is("Note that TMF854 requires a NOTICE. All modifications require notes. See http://opensource.org/licenses/BSD-3-Clause."));
-//	}
-//	
-//	@Test
-//	public void testDOJOLicenseFamilyCategory() {
-//		assertThat(DOJO.getCategory(), is("DOJO "));
-//	}
-//
-//	@Test
-//	public void testDOJOLicenseFamilyName() {
-//		assertThat(DOJO.getName(), is("Modified BSD License"));
-//	}
-//
-//	@Test
-//	public void testDOJOLicenseFamilyNotes() {
-//		assertThat(
-//				DOJO.getNotes(),
-//				is("Note that DOJO requires a NOTICE. All modifications require notes. See http://dojotoolkit.org/community/licensing.shtml."));
-//	}
-//}
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index e5637a66e..3ea99ec71 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -85,10 +85,6 @@
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.rat</groupId>
-      <artifactId>apache-rat-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 048af99dc..ce3b3ea55 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -172,12 +172,12 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <scope>text</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <scope>text</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/pom.xml b/pom.xml
index 2ef75beb6..4dbb53e8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,11 +74,6 @@ agnostic home for software distribution comprehension and audit tools.
   </distributionManagement>
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-core</artifactId>
@@ -683,7 +678,6 @@ agnostic home for software distribution comprehension and audit tools.
     <tag>HEAD</tag>
   </scm>
   <modules>
-    <module>apache-rat-api</module>
     <module>apache-rat-core</module>
     <module>apache-rat-plugin</module>
     <module>apache-rat-tasks</module>

From c97365277e7da663b8c1997600937b9342fe2c44 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sat, 13 Jan 2024 18:01:48 +0100
Subject: [PATCH 245/299] fixed javadoc error

---
 .../src/main/java/org/apache/rat/utils/ReportingSet.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
index 6cf738a35..fa506a328 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/ReportingSet.java
@@ -60,9 +60,9 @@ public ReportingSet(SortedSet<T> delegate) {
     }
 
     /**
-     * Set the message format used to format display.
-     * @param msgFormat a format string taking the Class name and string representation of the 
-     * @return
+     * Sets the function to generate the log message.
+     * @param msgFmt A function to return the string to be displayed when a collision occurs.
+     * @return This for chaining.
      */
     public ReportingSet<T> setMsgFormat(Function<T,String> msgFmt) {
         duplicateFmt = msgFmt;

From 94072ccc600025022a3f573e3ae35493eecb55ce Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 00:19:29 +0100
Subject: [PATCH 246/299] RAT-343: Add integration test to allow enhanced
 testing of custom licenses

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 76f575ef3..4c2ab8053 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -78,6 +78,9 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
       <action issue="RAT-343" type="fix" dev="pottlinger" due-to="Claude Warren">
         Reimplement old configuration elements for custom licenses in Maven plugin configurations (and updates to the webpage).
       </action>
+      <action issue="RAT-343" type="fix" dev="pottlinger" due-to="Niels Basjes">
+        Add integration test to allow enhanced testing of custom licenses.
+      </action>
       <action issue="RAT-348" type="add" dev="pottlinger" due-to="Niels Basjes">
         Update gitignore-reader library to 1.3.0 to get latest changes in gitignore parsing.
       </action>

From d244e735b13b28b809cfe3177c8b5aa679089dd0 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 00:26:08 +0100
Subject: [PATCH 247/299] RAT-349: Fallback to default stylesheet if none was
 set to avoid NPE

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4c2ab8053..094ebe3a9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -84,6 +84,9 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
       <action issue="RAT-348" type="add" dev="pottlinger" due-to="Niels Basjes">
         Update gitignore-reader library to 1.3.0 to get latest changes in gitignore parsing.
       </action>
+      <action issue="RAT-349" type="fix" dev="pottlinger" due-to="Niels Basjes">
+        Fix NPE by falling back to default stylesheet if none was configured before.
+      </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.16.1
       </action>

From 875a04823fd95bea118d5cb0f8bef57bbd0648f9 Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Sun, 14 Jan 2024 13:33:15 +0100
Subject: [PATCH 248/299] RAT-349: Fail the build if integration tests fail

---
 apache-rat-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 021db248a..ac4ba5da6 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -145,7 +145,7 @@
             <id>integration-test</id>
             <goals>
               <goal>install</goal>
-              <goal>integration-test</goal>
+              <goal>run</goal>
             </goals>
           </execution>
         </executions>

From 7948434f4446e43f1ad6d2f76d6d811dd73011c2 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 13:59:00 +0100
Subject: [PATCH 249/299] RAT-343, RAT-349: Reformat poms and fix encoding
 warning in build

---
 apache-rat-plugin/pom.xml                     |   2 +-
 .../src/test/resources/unit/RAT-343/pom.xml   | 115 +++++++++---------
 apache-rat-tasks/pom.xml                      |  22 ++--
 apache-rat/pom.xml                            |   2 +-
 pom.xml                                       |   7 +-
 5 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index ac4ba5da6..9cc7c3ec9 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -120,7 +120,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
index 2d47e68de..aa4b20c34 100644
--- a/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
@@ -27,64 +27,63 @@
         <artifactId>apache-rat-plugin</artifactId>
         <version>@pom.version@</version>
         <configuration>
-						<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
-						<licenses>
-							<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-							<licenseFamilyCategory>MIT</licenseFamilyCategory>
-								<licenseFamilyName>MIT</licenseFamilyName> 
-								<notes></notes>
-								<patterns>
-									<pattern>Licensed MIT</pattern>
-									<pattern>Licensed under MIT</pattern>
-									<pattern>Licensed under the MIT license</pattern>
-									<pattern>MIT/GPL2 Licensed</pattern>
-									<pattern>licensed under the MIT and GPL</pattern>
-									<pattern>MIT license</pattern> 
-								</patterns> 
-
-							</license>
-							<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-								<licenseFamilyCategory>BSD</licenseFamilyCategory>
-								<licenseFamilyName>BSD</licenseFamilyName>
-								<notes></notes>
-								<patterns>
-									<pattern>BSD-style license</pattern>
-								</patterns>
-							</license>
-							<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> 
-								 <licenseFamilyCategory>CC BY</licenseFamilyCategory> 
-								 <licenseFamilyName>Creative Commons Attribution</licenseFamilyName> 
-								<notes></notes>
-								 <patterns>
-									<pattern>creativecommons.org/licenses/by/4.0</pattern>
-								</patterns> 
-							</license>
-						</licenses>
-						 <licenseFamilies> 
-							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-								<familyName>MIT</familyName>
-							</licenseFamily>
-							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-								<familyName>BSD</familyName>
-							</licenseFamily>
-							<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-								<familyName>CC BY</familyName>
-							</licenseFamily>
-						</licenseFamilies>  
-						<approvedLicenses>
-							<id>BSD</id>
-						</approvedLicenses>
-						<excludes>
-							<exclude>**/*.mp3</exclude>
-							<exclude>**/localhost.jks</exclude>
-							<exclude>**/node_modules/**</exclude>
-							<exclude>**/package-lock.json</exclude>
-							<exclude>**/target/**</exclude>
-							<exclude>**/.project</exclude>
-							<exclude>**/.classpath</exclude>
-							<exclude>**/.settings/**</exclude>
-							<exclude>.gitattributes</exclude>
-						</excludes>
+          <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
+          <licenses>
+            <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+              <licenseFamilyCategory>MIT</licenseFamilyCategory>
+              <licenseFamilyName>MIT</licenseFamilyName>
+              <notes/>
+              <patterns>
+                <pattern>Licensed MIT</pattern>
+                <pattern>Licensed under MIT</pattern>
+                <pattern>Licensed under the MIT license</pattern>
+                <pattern>MIT/GPL2 Licensed</pattern>
+                <pattern>licensed under the MIT and GPL</pattern>
+                <pattern>MIT license</pattern>
+              </patterns>
+            </license>
+            <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+              <licenseFamilyCategory>BSD</licenseFamilyCategory>
+              <licenseFamilyName>BSD</licenseFamilyName>
+              <notes/>
+              <patterns>
+                <pattern>BSD-style license</pattern>
+              </patterns>
+            </license>
+            <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+              <licenseFamilyCategory>CC BY</licenseFamilyCategory>
+              <licenseFamilyName>Creative Commons Attribution</licenseFamilyName>
+              <notes/>
+              <patterns>
+                <pattern>creativecommons.org/licenses/by/4.0</pattern>
+              </patterns>
+            </license>
+          </licenses>
+          <licenseFamilies>
+            <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+              <familyName>MIT</familyName>
+            </licenseFamily>
+            <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+              <familyName>BSD</familyName>
+            </licenseFamily>
+            <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+              <familyName>CC BY</familyName>
+            </licenseFamily>
+          </licenseFamilies>
+          <approvedLicenses>
+            <id>BSD</id>
+          </approvedLicenses>
+          <excludes>
+            <exclude>**/*.mp3</exclude>
+            <exclude>**/localhost.jks</exclude>
+            <exclude>**/node_modules/**</exclude>
+            <exclude>**/package-lock.json</exclude>
+            <exclude>**/target/**</exclude>
+            <exclude>**/.project</exclude>
+            <exclude>**/.classpath</exclude>
+            <exclude>**/.settings/**</exclude>
+            <exclude>.gitattributes</exclude>
+          </excludes>
         </configuration>
       </plugin>
     </plugins>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 6a323388e..4f6d4bffc 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -113,18 +113,18 @@
             <configuration>
               <target>
                 <ant antfile="src/test/resources/antunit/report-bad-configurations.xml" inheritAll="false" inheritRefs="false">
-                  <property name="jar.name" location="${project.build.outputDirectory}" />
-                  <property name="base.dir" location="${basedir}" />
-                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar" />
-                  <property name="test.skipped" value="${maven.test.skip}" />
-                  <property name="test.classpath" refid="maven.test.classpath" />
+                  <property name="jar.name" location="${project.build.outputDirectory}"/>
+                  <property name="base.dir" location="${basedir}"/>
+                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+                  <property name="test.skipped" value="${maven.test.skip}"/>
+                  <property name="test.classpath" refid="maven.test.classpath"/>
                 </ant>
                 <ant antfile="src/test/resources/antunit/report-normal-operation.xml" inheritAll="false" inheritRefs="false">
-                  <property name="jar.name" location="${project.build.outputDirectory}" />
-                  <property name="base.dir" location="${basedir}" />
-                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar" />
-                  <property name="test.skipped" value="${maven.test.skip}" />
-                  <property name="test.classpath" refid="maven.test.classpath" />
+                  <property name="jar.name" location="${project.build.outputDirectory}"/>
+                  <property name="base.dir" location="${basedir}"/>
+                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+                  <property name="test.skipped" value="${maven.test.skip}"/>
+                  <property name="test.classpath" refid="maven.test.classpath"/>
                 </ant>
               </target>
             </configuration>
@@ -162,7 +162,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index 67325de18..0aee0489c 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -149,7 +149,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/pom.xml b/pom.xml
index ba6db540a..5e6a511cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,6 +390,9 @@ agnostic home for software distribution comprehension and audit tools.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
           <version>3.3.1</version>
+          <configuration>
+            <propertiesEncoding>ISO-8859-1</propertiesEncoding>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -420,7 +423,7 @@ agnostic home for software distribution comprehension and audit tools.
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -442,7 +445,7 @@ agnostic home for software distribution comprehension and audit tools.
             </goals>
             <configuration>
               <target>
-                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false" />
+                <copy file="RELEASE_NOTES.txt" todir="${project.build.directory}/site/" failonerror="false"/>
               </target>
             </configuration>
           </execution>

From bdee6685a0c6ab364a53478b443da6a19f9f23ae Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 14:17:29 +0100
Subject: [PATCH 250/299] RAT-346: Harmonize text messages in CLI

---
 .../src/main/java/org/apache/rat/Report.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 6eda20647..fbb69f2d7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -210,7 +210,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
             if (cl.hasOption(STYLESHEET_CLI)) {
                 String[] style = cl.getOptionValues(STYLESHEET_CLI);
                 if (style.length != 1) {
-                    System.err.println("please specify a single stylesheet");
+                    System.err.println("Please specify a single stylesheet");
                     System.exit(1);
                 }
                 configuration.setStyleSheet(() -> Files.newInputStream(Paths.get(style[0])));
@@ -271,18 +271,18 @@ static Options buildOptions() {
         
         .addOption(
                 Option.builder().hasArg(true).longOpt(LIST_FAMILIES)
-                .desc("List the defined license families Valid options are: "+licFilterValues+". Default=none")
+                .desc("List the defined license families (default is none). Valid options are: "+licFilterValues+".")
                 .build())
         .addOption(
                 Option.builder().hasArg(true).longOpt(LIST_LICENSES)
-                .desc("List the defined licenses Valid options are: "+licFilterValues+". Default=none")
+                .desc("List the defined licenses (default is none). Valid options are: "+licFilterValues+".")
                 .build())
 
-        .addOption(new Option(HELP, "help", false, "Print help for the RAT command line interface and exit"));
+        .addOption(new Option(HELP, "help", false, "Print help for the RAT command line interface and exit."));
         
 
         Option out = new Option("o", "out", true,
-                "Define the output file where to write report (default is System.out)");
+                "Define the output file where to write a report to (default is System.out).");
         opts.addOption(out);
 
         String defaultHandlingText = " By default all approved default licenses are used";
@@ -306,7 +306,7 @@ static Options buildOptions() {
         opts.addOptionGroup(addLicenseGroup);
 
         Option write = new Option(FORCE, "force", false,
-                "Forces any changes in files to be written directly to the source files (i.e. new files are not created)");
+                "Forces any changes in files to be written directly to the source files (i.e. new files are not created).");
         opts.addOption(write);
 
         Option copyright = new Option(COPYRIGHT, "copyright", true,

From e2645711f4a8be5f8c10e5023e43e96474d35f5c Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 14:47:58 +0100
Subject: [PATCH 251/299] RAT-346: Fix build warnings - remove obsolete stuff
 in pom

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4dbb53e8e..c0f293d6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,7 +478,6 @@ agnostic home for software distribution comprehension and audit tools.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.4.1</version>
         <executions>
           <execution>
             <!-- This checks the bytecode version of the dependencies transitively -->

From e8c3dad4d7e07bc78909bbdc7c1e7462da3dcb74 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 14:52:57 +0100
Subject: [PATCH 252/299] RAT-346: Fix build warning about duplicate version
 definition

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index c0f293d6b..481ff4c58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,12 +138,6 @@ agnostic home for software distribution comprehension and audit tools.
         <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-          <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter-engine</artifactId>
-          <version>${junit.version}</version>
-          <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-runner</artifactId>

From 94aa76f0371519e45bcb165912131c976bb0be53 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 14:59:31 +0100
Subject: [PATCH 253/299] RAT-346: Make release-relevant properties more
 explicit

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 481ff4c58..5ec66a122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,10 @@ agnostic home for software distribution comprehension and audit tools.
     <mavenJavadocPluginVersion>3.6.3</mavenJavadocPluginVersion>
     <mavenPmdPluginVersion>3.21.2</mavenPmdPluginVersion>
     <!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
+    <!-- START - adapat manually before doing a release -->
     <previousRatVersion>0.16.1</previousRatVersion>
     <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
+    <!-- END - adapat manually before doing a release -->
     <junit.version>5.10.0</junit.version>
     <junit.platform.version>1.8.1</junit.platform.version>
   </properties>

From fce1602741931605e32901f18a09b9c3efa042bf Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 15:03:27 +0100
Subject: [PATCH 254/299] RAT-346: Remove commented-out code

---
 .../matchers/CopyrightMatcherTest.java        | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
index c03e4a160..ee0f5dc3a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
@@ -79,27 +79,6 @@ private static String[][] expandResults( String[]...args) {
         return arry.toArray(new String[arry.size()][2]);
     }
 
-            
-//    private static Arguments expandResults(String name, String startDate, String endDate, String owner,
-//            String[][] passAry, String[][] failAry) {
-//
-//        List<String[]> arry = new ArrayList<>();
-//        for (String pfx : prefix) {
-//            Arrays.stream(passAry).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
-//                    .forEach(arry::add);
-//        }
-//        String[][] pass = arry.toArray(new String[arry.size()][2]);
-//        arry.clear();
-//
-//        for (String pfx : prefix) {
-//            Arrays.stream((String[][]) failAry).map(origin -> new String[] { pfx + origin[0], pfx + origin[1] })
-//                    .forEach(arry::add);
-//        }
-//        String[][] fail = arry.toArray(new String[arry.size()][2]);
-//
-//        return Arguments.of(name, startDate, endDate, owner, pass, fail);
-//    }
-
     private static void verify(String testName, String[][] pass, String[][] fail) {
         assertEquals(TOTAL_TESTS, pass.length + fail.length, "Wrong number of pass/fail tests");
         Set<String> passSet = new HashSet<String>();
@@ -111,15 +90,6 @@ private static void verify(String testName, String[][] pass, String[][] fail) {
         }
     }
 
-//    public CopyrightMatcherTest(String testName, String start, String stop, String owner, String[][] pass,
-//            String[][] fail) {
-//        verify(testName, pass, fail);
-//        matcher = new CopyrightMatcher(start, stop, owner);
-//        this.pass = pass;
-//        this.fail = fail;
-//        this.testName = testName;
-//    }
-
     @ParameterizedTest
     @MethodSource("parameterProvider")
     public void testPass(String testName, String start, String stop, String owner, String[][] pass,

From 199837eb2c0a97113614d1ea22cfd5966703dbe9 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 15:16:08 +0100
Subject: [PATCH 255/299] RAT-346: Switch to TempDir from JUnit5

---
 .../rat/annotation/TestLicenseAppender.java   | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
index cf0c42ee3..f1b9759f6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -37,17 +38,9 @@
 
 public class TestLicenseAppender {
     
-    private static File baseTempFolder;
-    
-    @BeforeAll
-    public static void setup() throws IOException {
-        baseTempFolder = Files.createTempDirectory("tla").toFile();
-    }
-    
-    @AfterAll
-    public static void teardown() throws IOException {
-        FileUtils.deleteDirectory(baseTempFolder);
-    }
+	@TempDir
+    private File baseTempFolder;
+  
 
     private static final String FIRST_LICENSE_LINE = " Licensed to the Apache Software Foundation (ASF) under one";
 
@@ -59,7 +52,7 @@ private interface NewFileReader {
         void readFile(BufferedReader r) throws IOException;
     }
 
-    private static String getTemporaryFileWithName(String fileName) throws IOException {
+    private String getTemporaryFileWithName(String fileName) throws IOException {
         if (fileName != null) {
             return new File(baseTempFolder,fileName).getAbsolutePath();
         }
@@ -74,7 +67,7 @@ private static void createTestFile(String fileName,
         }
     }
 
-    private static void commonTestTemplate(String relativeName,
+    private void commonTestTemplate(String relativeName,
                                            FileCreator creator,
                                            NewFileReader reader)
             throws IOException {

From 37844d277a13cd3b5050c8d4a90ec99066ae5c9c Mon Sep 17 00:00:00 2001
From: Niels Basjes <niels@basjes.nl>
Date: Sun, 14 Jan 2024 15:53:45 +0100
Subject: [PATCH 256/299] RAT-348: Update GitIgnore reader to version 1.3.1

---
 apache-rat-plugin/pom.xml | 2 +-
 src/changes/changes.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 9cc7c3ec9..12dc1d5b4 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -307,7 +307,7 @@
     <dependency>
       <groupId>nl.basjes.gitignore</groupId>
       <artifactId>gitignore-reader</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1</version>
     </dependency>
   </dependencies>
   <reporting>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 094ebe3a9..db054e799 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -82,7 +82,7 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
         Add integration test to allow enhanced testing of custom licenses.
       </action>
       <action issue="RAT-348" type="add" dev="pottlinger" due-to="Niels Basjes">
-        Update gitignore-reader library to 1.3.0 to get latest changes in gitignore parsing.
+        Update gitignore-reader library to 1.3.1 to get latest changes in gitignore parsing.
       </action>
       <action issue="RAT-349" type="fix" dev="pottlinger" due-to="Niels Basjes">
         Fix NPE by falling back to default stylesheet if none was configured before.

From fa455a38c20f9c1055f04b32e8f1300877246a56 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:10:17 +0100
Subject: [PATCH 257/299] RAT-342: Add maven wrapper to documentation

---
 BUILD.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/BUILD.txt b/BUILD.txt
index 562bb7a9e..6ca6dc3d7 100644
--- a/BUILD.txt
+++ b/BUILD.txt
@@ -5,14 +5,17 @@ There is a maven default goal configured that builds and installs a fresh artifa
 or
 Normal development:
 
-    mvn install
+    mvn install OR 
+    ./mvnw install 
 
 Normal development without running tests:
 
-    mvn -Dmaven.test.skip=true install
+    mvn -Dmaven.test.skip=true install OR
+    ./mvnw -Dmaven.test.skip=true install
 
 Build apache release
 
-    mvn clean install -Papache-release
+    mvn clean install -Papache-release OR
+    ./mvnw clean install -Papache-release
 
 RAT uses the previos release version during the build to verify it complies its own rules.

From 4c5dab50422d1bb2df5bc79d94118d4d727c1e96 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:11:08 +0100
Subject: [PATCH 258/299] Add URL to webpage to NOTICE

---
 NOTICE | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NOTICE b/NOTICE
index 67d6aa00a..c6b887455 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,6 @@
 Apache Creadur Rat
 Copyright 2006-2024 The Apache Software Foundation
+https://creadur.apache.org
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).

From ab04907a34ad38e71c67e465e753551e11fd28da Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:23:47 +0100
Subject: [PATCH 259/299] RAT-346: Switch to TempDir from JUnit5

---
 .../rat/walker/DirectoryWalkerTest.java       | 38 +++++--------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java b/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
index 1e8e53198..daef24bcd 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/walker/DirectoryWalkerTest.java
@@ -18,46 +18,26 @@
  */
 package org.apache.rat.walker;
 
-import org.apache.commons.io.filefilter.FalseFileFilter;
-import org.apache.commons.io.filefilter.HiddenFileFilter;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.RatException;
-import org.apache.rat.report.RatReport;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.apache.commons.io.FileUtils;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.DosFileAttributeView;
-import java.nio.file.attribute.DosFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.io.filefilter.FalseFileFilter;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.RatException;
+import org.apache.rat.report.RatReport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
 public class DirectoryWalkerTest {
     
-    private File toWalk;
+    @TempDir
+	private File toWalk;
     
-    @BeforeEach
-    public void setup() throws IOException {
-        toWalk = Files.createTempDirectory("dwt").toFile();
-    }
-    
-    @AfterEach
-    public void teardown() throws IOException {
-        FileUtils.deleteDirectory(toWalk);
-    }
-
-
     @Test
     public void walk() throws IOException, RatException {
         File regular = new File(toWalk, "regular");

From f2ee6df08d8c4d47d541406952508122fc55abd5 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:26:23 +0100
Subject: [PATCH 260/299] RAT-346: Organise imports and fix possible resource
 leak in tests

---
 .../apache/rat/ReportConfigurationTest.java   | 26 ++++++++++---------
 .../rat/annotation/TestLicenseAppender.java   | 15 +++++------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 8cdd62312..325a1f35d 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -18,7 +18,8 @@
  */
 package org.apache.rat;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -370,17 +371,18 @@ public void testValidate() {
     @Test
     public void testSetOut() throws IOException {
         ReportConfiguration config = new ReportConfiguration(log);
-        OutputStreamIntercepter osi = new OutputStreamIntercepter();
-        config.setOut(() -> osi);
-        assertThat(osi.closeCount).isEqualTo(0);
-        try (OutputStream os = config.getOutput().get()) {
-            assertThat(osi.closeCount).isEqualTo(0);
-        }
-        assertThat(osi.closeCount).isEqualTo(1);
-        try (OutputStream os = config.getOutput().get()) {
-            assertThat(osi.closeCount).isEqualTo(1);
-        }
-        assertThat(osi.closeCount).isEqualTo(2);
+        try (OutputStreamIntercepter osi = new OutputStreamIntercepter()) {
+			config.setOut(() -> osi);
+			assertThat(osi.closeCount).isEqualTo(0);
+			try (OutputStream os = config.getOutput().get()) {
+			    assertThat(osi.closeCount).isEqualTo(0);
+			}
+			assertThat(osi.closeCount).isEqualTo(1);
+			try (OutputStream os = config.getOutput().get()) {
+			    assertThat(osi.closeCount).isEqualTo(1);
+			}
+			assertThat(osi.closeCount).isEqualTo(2);
+		}
     }
     
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
index f1b9759f6..c4b263fd7 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
@@ -18,12 +18,8 @@
  */
 package org.apache.rat.annotation;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.rat.test.utils.Resources;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -31,10 +27,11 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.nio.file.Files;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.apache.commons.io.FileUtils;
+import org.apache.rat.test.utils.Resources;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestLicenseAppender {
     

From 6575f2facb9e8c1458945a0e80af30b05f3fa157 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:36:07 +0100
Subject: [PATCH 261/299] RAT-346: Add missing switch case for no logging

---
 .../src/main/java/org/apache/rat/utils/DefaultLog.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
index 8cc6794ff..74e0f9f5c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
@@ -42,6 +42,10 @@ public void log(Level level, String msg) {
         case ERROR:
             System.err.format("%s: %s%n", level, msg);
             break;
+		case OFF:
+			break;
+		default:
+			break;
         }
     }
 }
\ No newline at end of file

From 59094c0630728c4818bcca0356bff5fb2fd2ce7c Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:36:39 +0100
Subject: [PATCH 262/299] RAT-346: Fix warnings and optimize imports

---
 .../src/main/java/org/apache/rat/Reporter.java        |  5 -----
 .../org/apache/rat/analysis/license/BaseLicense.java  |  2 --
 .../rat/analysis/license/FullTextMatchingLicense.java | 10 ----------
 .../analysis/license/SimplePatternBasedLicense.java   |  5 -----
 .../apache/rat/document/impl/DocumentImplUtils.java   |  1 -
 .../java/org/apache/rat/walker/DirectoryWalker.java   | 11 +++++------
 .../apache/rat/walker/NameBasedHiddenFileFilter.java  |  3 ++-
 7 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index 09754437e..0f99472e1 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -20,17 +20,12 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.PipedReader;
 import java.io.PipedWriter;
-import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Writer;
-import java.util.SortedSet;
 
 import org.apache.rat.api.RatException;
-import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.RatReport;
 import org.apache.rat.report.claim.ClaimStatistic;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 90809d3ab..3149c0c0b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -18,8 +18,6 @@
  */ 
 package org.apache.rat.analysis.license;
 
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
 import org.apache.rat.license.ILicenseFamily;
 
 @Deprecated // remove in v1.0
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index a05d85fc4..6ce7ef7b3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -18,16 +18,6 @@
  */ 
 package org.apache.rat.analysis.license;
 
-import java.util.Arrays;
-import java.util.Locale;
-
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.analysis.matchers.FullTextMatcher;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData.Datum;
-import org.apache.rat.configuration.builders.AbstractBuilder;
-import org.apache.rat.configuration.builders.AnyBuilder;
 import org.apache.rat.configuration.builders.TextBuilder;
 import org.apache.rat.license.ILicense;
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
index 094d25760..36363e698 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -20,15 +20,10 @@
 
 import java.util.Arrays;
 
-import org.apache.rat.analysis.IHeaderMatcher;
-import org.apache.rat.analysis.RatHeaderAnalysisException;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData.Datum;
 import org.apache.rat.configuration.builders.AbstractBuilder;
 import org.apache.rat.configuration.builders.AnyBuilder;
 import org.apache.rat.configuration.builders.TextBuilder;
 import org.apache.rat.license.ILicense;
-import org.apache.rat.license.ILicenseFamily;
 
 
 /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
index f72160f75..5522e6705 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
@@ -22,7 +22,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
 
 import org.apache.commons.io.IOUtils;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
index 74b2b878e..ab75cd3f2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
@@ -19,7 +19,11 @@
 
 package org.apache.rat.walker;
 
-import org.apache.commons.io.filefilter.HiddenFileFilter;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.rat.api.Document;
 import org.apache.rat.api.RatException;
@@ -27,11 +31,6 @@
 import org.apache.rat.report.IReportable;
 import org.apache.rat.report.RatReport;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
 /**
  * Walks directories.
  */
diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java b/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
index 7d3f39353..19a54ebb9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/NameBasedHiddenFileFilter.java
@@ -59,7 +59,8 @@
  */
 public class NameBasedHiddenFileFilter extends AbstractFileFilter implements Serializable {
 
-    /**
+    private static final long serialVersionUID = -5951069871734926741L;
+	/**
      * Singleton instance of <i>hidden</i> filter.
      */
     public static final IOFileFilter HIDDEN = new NameBasedHiddenFileFilter();

From 2d9e0903aabd262ece6f0cc5bda8626b4be4ba43 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:39:20 +0100
Subject: [PATCH 263/299] RAT-346: LHF optimize imports

---
 .../org/apache/rat/analysis/license/AbstractLicenseTest.java  | 4 ----
 .../rat/analysis/license/ApacheSoftwareLicenseTest.java       | 1 -
 .../java/org/apache/rat/analysis/license/GPLLicenseTest.java  | 2 --
 .../org/apache/rat/analysis/license/GeneratedLicenseTest.java | 1 -
 .../java/org/apache/rat/analysis/license/W3CLicenseTest.java  | 2 --
 .../apache/rat/analysis/matchers/CopyrightMatcherTest.java    | 2 --
 6 files changed, 12 deletions(-)

diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
index 3ef13de7e..ad17c909b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AbstractLicenseTest.java
@@ -28,9 +28,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rat.Defaults;
@@ -43,7 +40,6 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.testhelpers.TestingLicense;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
index 93e395e23..e1c00e522 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicenseTest.java
@@ -20,7 +20,6 @@
 
 import java.util.stream.Stream;
 
-import org.apache.rat.license.ILicenseFamily;
 import org.junit.jupiter.params.provider.Arguments;
 
 /**
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
index 93c9bb9c9..7d0a51eae 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GPLLicenseTest.java
@@ -18,8 +18,6 @@
  */
 package org.apache.rat.analysis.license;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
index 12f431ac5..b8232440a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/GeneratedLicenseTest.java
@@ -20,7 +20,6 @@
 
 import java.util.stream.Stream;
 
-import org.apache.rat.license.ILicenseFamily;
 import org.junit.jupiter.params.provider.Arguments;
 
 public class GeneratedLicenseTest extends AbstractLicenseTest {
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
index 45eda5ea1..2fde04c0c 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
@@ -18,8 +18,6 @@
  */
 package org.apache.rat.analysis.license;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
index ee0f5dc3a..32f6820ee 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/CopyrightMatcherTest.java
@@ -23,14 +23,12 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
 
 import org.apache.rat.analysis.IHeaderMatcher.State;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;

From f7feef283af370bf8d3c5a40335e46d9ea6d32a7 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:49:06 +0100
Subject: [PATCH 264/299] RAT-346: Organize imports and simplify IO test
 operations

---
 .../java/org/apache/rat/mp/RatReportMojo.java |  3 ++-
 .../org/apache/rat/mp/RatCheckMojoTest.java   |  3 ---
 .../org/apache/rat/mp/RatTestHelpers.java     | 12 +++------
 .../rat/mp/util/ExclusionHelperTest.java      | 27 +++++++++----------
 .../rat/mp/util/ScmIgnoreParserTest.java      | 25 +++++++----------
 5 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 069312d16..7ea35af56 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -25,13 +25,14 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
-import java.nio.charset.StandardCharsets;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.doxia.sink.Sink;
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
index 0a8dc549d..b35982bb3 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
@@ -25,9 +25,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.rat.ReportConfiguration;
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
index 5cb95380f..e12bafa53 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatTestHelpers.java
@@ -10,6 +10,8 @@
 import java.lang.reflect.Proxy;
 import java.util.List;
 
+import org.apache.commons.io.FileUtils;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -58,15 +60,7 @@ public static void remove(File pDir) throws IOException {
                 throw new IOException("Unable to delete file: " + pDir);
             }
         } else if (pDir.isDirectory()) {
-            final File[] files = pDir.listFiles();
-            if (files != null) {
-                for (File file : files) {
-                    remove(file);
-                }
-            }
-            if (!pDir.delete()) {
-                throw new IOException("Unable to delete directory: " + pDir);
-            }
+        	FileUtils.deleteDirectory(pDir);
         } else if (pDir.exists()) {
             throw new IOException("Unable to delete unknown object " + pDir);
         }
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
index 2ea61c600..c6dcb46d4 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ExclusionHelperTest.java
@@ -1,5 +1,18 @@
 package org.apache.rat.mp.util;
 
+import static org.apache.rat.mp.util.ExclusionHelper.ECLIPSE_DEFAULT_EXCLUDES;
+import static org.apache.rat.mp.util.ExclusionHelper.IDEA_DEFAULT_EXCLUDES;
+import static org.apache.rat.mp.util.ExclusionHelper.MAVEN_DEFAULT_EXCLUDES;
+import static org.apache.rat.mp.util.ExclusionHelper.addEclipseDefaults;
+import static org.apache.rat.mp.util.ExclusionHelper.addIdeaDefaults;
+import static org.apache.rat.mp.util.ExclusionHelper.addMavenDefaults;
+import static org.apache.rat.mp.util.ExclusionHelper.addPlexusAndScmDefaults;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashSet;
+import java.util.Set;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,22 +33,8 @@
 import org.apache.maven.plugin.logging.Log;
 import org.apache.rat.config.SourceCodeManagementSystems;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.apache.rat.mp.util.ExclusionHelper.ECLIPSE_DEFAULT_EXCLUDES;
-import static org.apache.rat.mp.util.ExclusionHelper.IDEA_DEFAULT_EXCLUDES;
-import static org.apache.rat.mp.util.ExclusionHelper.MAVEN_DEFAULT_EXCLUDES;
-import static org.apache.rat.mp.util.ExclusionHelper.addEclipseDefaults;
-import static org.apache.rat.mp.util.ExclusionHelper.addIdeaDefaults;
-import static org.apache.rat.mp.util.ExclusionHelper.addMavenDefaults;
-import static org.apache.rat.mp.util.ExclusionHelper.addPlexusAndScmDefaults;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 
 public class ExclusionHelperTest {
 
diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
index 0a2e95fe4..3f7c14b00 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
@@ -16,14 +16,11 @@
  * limitations under the License.
  */
 
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import static org.apache.rat.mp.util.ScmIgnoreParser.getExclusionsFromSCM;
+import static org.apache.rat.mp.util.ignore.GlobIgnoreMatcher.isComment;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -32,13 +29,11 @@
 import java.nio.file.Files;
 import java.util.List;
 
-import static org.apache.rat.mp.util.ScmIgnoreParser.getExclusionsFromSCM;
-import static org.apache.rat.mp.util.ignore.GlobIgnoreMatcher.isComment;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 public class ScmIgnoreParserTest {
      

From e6450380d079964a5bc1e1a952138d0eeb76cb1b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 16:51:57 +0100
Subject: [PATCH 265/299] RAT-346: Add missing switch cases for logger

---
 .../src/main/java/org/apache/rat/anttasks/Report.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
index c5b4670bd..691d9d6a3 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
@@ -317,6 +317,10 @@ public void log(Level level, String msg) {
             case ERROR:
                 write(Project.MSG_ERR, msg);
                 break;
+			case OFF:
+				break;
+			default:
+				break;
             }
         }
         

From 8328f35e9e5631473483aea3645ea0f54a59be6a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 17:22:22 +0100
Subject: [PATCH 266/299] RAT-346: Use tempDir instead of manually managed file
 in test

---
 .../rat/mp/util/ScmIgnoreParserTest.java      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
index 3f7c14b00..59f14f0f0 100644
--- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
+++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/util/ScmIgnoreParserTest.java
@@ -33,11 +33,15 @@
 import org.apache.maven.plugin.logging.Log;
 import org.apache.rat.mp.util.ignore.GlobIgnoreMatcher;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
 public class ScmIgnoreParserTest {
      
-    private Log log = Mockito.mock(Log.class);
+	@TempDir
+	private File tempDir;
+	
+	private Log log = Mockito.mock(Log.class);
 
     private static final String IGNORE_EXAMPLE = "**/*.java\r\n## Justus commentos\r\nignoredDirectory";
 
@@ -79,19 +83,14 @@ public void parseFromTargetDirectoryHopefullyWithoutSCMIgnores() {
 
     @Test
     public void parseFromEmptyIgnoreFile() throws IOException {
-        File ignore = null;
-        try {
-            ignore = Files.createTempFile("sip", null).toFile();
-            assertTrue(ignore.exists());
-            writeToFile(IGNORE_EXAMPLE, ignore);
-        
-            final List<String> excludes = getExcludesFromFile(log, ignore);
-            assertFalse(excludes.isEmpty());
-            assertEquals(2, excludes.size());
-        } finally {
-            ignore.delete();
-        }
+    	File ignore  = Files.createTempFile(tempDir.getName(), "sip").toFile();
+
+    	assertTrue(ignore.exists());
+    	writeToFile(IGNORE_EXAMPLE, ignore);
 
+    	final List<String> excludes = getExcludesFromFile(log, ignore);
+    	assertFalse(excludes.isEmpty());
+    	assertEquals(2, excludes.size());
     }
 
     private static void writeToFile(String contents, File file) throws IOException {

From 2d81efb8148fbaa6f6ef98521ee792d821c161e6 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 19:50:20 +0100
Subject: [PATCH 267/299] RAT-346: Fix code warning

---
 .../src/main/java/org/apache/rat/walker/ArchiveWalker.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
index f6b64701b..e2196f81d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/walker/ArchiveWalker.java
@@ -20,7 +20,6 @@
 package org.apache.rat.walker;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
 import java.io.IOException;
@@ -64,7 +63,7 @@ public ArchiveWalker(File file, final FilenameFilter filter) throws FileNotFound
     public void run(final RatReport report) throws RatException {
 
         try {
-            ArchiveInputStream input;
+            ArchiveInputStream<? extends ArchiveEntry> input;
 
             /* I am really sad that classes aren't first-class objects in
                Java :'( */

From 850da0d016a31e93e3e914a57334c4c879718fe6 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 19:54:24 +0100
Subject: [PATCH 268/299] RAT-346: Add changelog about changes in RAT

---
 src/changes/changes.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 76f575ef3..cf759ce6d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -81,6 +81,15 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
       <action issue="RAT-348" type="add" dev="pottlinger" due-to="Niels Basjes">
         Update gitignore-reader library to 1.3.0 to get latest changes in gitignore parsing.
       </action>
+      <action issue="RAT-346" type="add" dev="pottlinger" due-to="Claude Warren">
+        Issue a warning if a user defined License family has the same name as an existing one.
+      </action>
+      <action issue="RAT-346" type="add" dev="pottlinger" due-to="Claude Warren">
+        Migrate to JUnit5 and fix minor issues in tests.
+      </action>
+      <action issue="RAT-346" type="remove" dev="pottlinger" due-to="Claude Warren">
+        Remove apache-rat-api module that contains misleading license-related classes.
+      </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.16.1
       </action>

From 7b212728f6113a37237c56a157b0daf50ac2f408 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 20:00:05 +0100
Subject: [PATCH 269/299] RAT-346: Fix javadoc errors

---
 .../src/main/java/org/apache/rat/api/Document.java           | 2 +-
 .../src/main/java/org/apache/rat/report/RatReport.java       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/Document.java b/apache-rat-core/src/main/java/org/apache/rat/api/Document.java
index b0818d08b..dbd589770 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/Document.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/Document.java
@@ -29,7 +29,7 @@ public interface Document {
     String getName();
     
     /**
-     * Reads the content of this document.
+     * Reads the contents of this document.
      * @return <code>Reader</code> not null
      * @throws IOException if this document cannot be read
      * @throws CompositeDocumentException if this document can only be read as
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java b/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
index e32357b61..6208f571e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/RatReport.java
@@ -35,6 +35,11 @@ public interface RatReport {
      */
     void startReport() throws RatException;
     
+    /**
+     * Performs the actual reporting on the given document.
+     * @param document write any reporting results into this document upon analysis.
+     * @throws RatException on error.
+     */
     void report(Document document) throws RatException;
     
     /**

From 9a54e7907eb101698036257cf411d54ae760e771 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 20:20:31 +0100
Subject: [PATCH 270/299] RAT-346: Fix minor javadoc errors

---
 apache-rat-core/src/main/java/org/apache/rat/Defaults.java      | 2 +-
 .../src/main/java/org/apache/rat/license/LicenseSetFactory.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 686823189..08b0a76d9 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -111,7 +111,7 @@ private static LicenseSetFactory readConfigFiles(Collection<URL> urls) {
     }
 
     /**
-     * Gets a supplier for the "plain" text styleseet.
+     * Gets a supplier for the "plain" text stylesheet.
      * @return an IOSupplier for the plain text stylesheet.
      */
     public static IOSupplier<InputStream> getPlainStyleSheet() {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
index 4d805ec1b..afdf95394 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -117,7 +117,7 @@ public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
     }
     
     /**
-     * Gets the categories fof LicenseFamily objects based on the filter.
+     * Gets the categories of LicenseFamily objects based on the filter.
      * @param filter the types of LicenseFamily objects to return.
      * @return a SortedSet of ILicenseFamily categories.
      */

From 9912876d67b890fa0df11b6234e9e4ec924643f2 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 20:26:15 +0100
Subject: [PATCH 271/299] RAT-346: Fix more javadoc warnings

---
 .../src/main/java/org/apache/rat/api/Document.java   |  5 ++++-
 .../apache/rat/license/LicenseFamilySetFactory.java  | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/Document.java b/apache-rat-core/src/main/java/org/apache/rat/api/Document.java
index dbd589770..9cf8d1413 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/Document.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/Document.java
@@ -26,7 +26,10 @@
 
 public interface Document {
 
-    String getName();
+    /**
+     * @return the name of the current document.
+     */
+	String getName();
     
     /**
      * Reads the contents of this document.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
index c58d4c14f..464987933 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseFamilySetFactory.java
@@ -25,7 +25,7 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 
 /**
- * Class to take a set of ILicenses and collecton of approved license categories and extract Subsets.
+ * Class to take a set of ILicenses and collection of approved license categories and extract Subsets.
  */
 public class LicenseFamilySetFactory {
 
@@ -73,7 +73,7 @@ public SortedSet<ILicenseFamily> getFamilies(LicenseFilter filter) {
     
     
     /**
-     * Gets the categories fof LicenseFamily objects based on the filter.
+     * Gets the categories of LicenseFamily objects based on the filter.
      * @param filter the types of LicenseFamily objects to return.
      * @return a SortedSet of ILicenseFamily categories.
      */
@@ -97,9 +97,9 @@ public SortedSet<String> getFamilyIds(LicenseFilter filter) {
     
     /**
      * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
-     * @param target The instance to serch  for.
+     * @param target The instance to search for.
      * @param licenseFamilies the license families to search
-     * @return
+     * @return the matching instance of the target given.
      */
     public static ILicenseFamily search(String target, SortedSet<ILicenseFamily> licenseFamilies) {
         ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory(target).setLicenseFamilyName("Searching family")
@@ -109,9 +109,9 @@ public static ILicenseFamily search(String target, SortedSet<ILicenseFamily> lic
 
     /**
      * Search a SortedSet of ILicenseFamily instances looking for a matching instance.
-     * @param target The instance to serch  for.
+     * @param target The instance to search for.
      * @param licenseFamilies the license families to search
-     * @return
+     * @return the matching instance of the target given.
      */
     public static ILicenseFamily search(ILicenseFamily target, SortedSet<ILicenseFamily> licenseFamilies) {
         SortedSet<ILicenseFamily> part = licenseFamilies.tailSet(target);

From c053a017da8112f60c2fc2c4c5f7e779bcc93408 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 20:34:27 +0100
Subject: [PATCH 272/299] RAT-346: Fix more javadoc warnings

---
 .../main/java/org/apache/rat/Reporter.java    |  2 +-
 .../apache/rat/license/LicenseSetFactory.java |  5 ++++
 .../xml/writer/InvalidXmlException.java       | 11 +++++---
 .../main/java/org/apache/rat/utils/Log.java   | 26 ++++++++++++++++---
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
index 0f99472e1..7a5feb038 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Reporter.java
@@ -34,7 +34,7 @@
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 
 /**
- * Class the executes the report as defined in a ReportConfiguration.
+ * Class that executes the report as defined in a ReportConfiguration.
  */
 public class Reporter {
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
index afdf95394..40bbe20ee 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/license/LicenseSetFactory.java
@@ -38,6 +38,11 @@ public enum LicenseFilter {
         /** No licenses are returned */
         none;
         
+    	/**
+    	 * Converts from a String to an enum value. 
+    	 * @param s String representation.
+    	 * @return given licenseFilter for the given String representation.
+    	 */
         static public LicenseFilter fromText(String s) {
             return LicenseFilter.valueOf(s.toLowerCase());
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/InvalidXmlException.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/InvalidXmlException.java
index e01226fd7..ed0a0905e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/InvalidXmlException.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/InvalidXmlException.java
@@ -21,15 +21,18 @@
 import java.io.IOException;
 
 /**
- * Indicates that the requested document would not be well formed.
- *
+ * Indicates that the requested document is not well formed.
  */
 public class InvalidXmlException extends IOException {
 
     private static final long serialVersionUID = 1L;
 
-    public InvalidXmlException(String s) {
-        super(s);
+    /**
+     * Instantiate exception with given message.
+     * @param message more context when this exception happens.  
+     */
+    public InvalidXmlException(String message) {
+        super(message);
     }
 
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
index f70521bb5..63db7f1d5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
@@ -26,12 +26,32 @@ public interface Log {
     /**
      * The log levels supported by logging.
      */
-    public enum Level {OFF, DEBUG, INFO, WARN, ERROR };
+    public enum Level {
+    	/**
+    	 * Log nothing.
+    	 */
+    	OFF, 
+    	/**
+    	 * Log debug only.
+    	 */
+    	DEBUG, 
+    	/**
+    	 * Log info only.
+    	 */
+    	INFO, 
+    	/**
+    	 * Log warn only.
+    	 */
+    	WARN, 
+    	/**
+    	 * Log error only.
+    	 */
+    	ERROR };
 
     /**
      * Writes a message at a specific log level.
      * @param level The log level to write at.
-     * @param msg the Message to write.
+     * @param message the Message to write.
      */
-    void log(Level level, String msg);
+    void log(Level level, String message);
 }

From c704273074812442faa333e716249bb4a8cad4bc Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 20:55:06 +0100
Subject: [PATCH 273/299] RAT-346: Fix more javadoc warnings

---
 .../main/java/org/apache/rat/Defaults.java    | 24 +++++++++++++++----
 .../org/apache/rat/configuration/Format.java  |  1 +
 .../rat/configuration/LicenseReader.java      |  4 ++--
 .../rat/configuration/MatcherReader.java      |  2 +-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
index 08b0a76d9..c5aff0748 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
@@ -38,7 +38,7 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 
 /**
- * A class that holds the list of licenses and approved licences from one or more Configuration file.
+ * A class that holds the list of licenses and approved licenses from one or more configuration files.
  */
 public class Defaults {
 
@@ -84,7 +84,7 @@ public static Builder builder() {
 
     /**
      * Reads the configuration files.
-     * @param urls the URLS to read.
+     * @param urls the URLs to read.
      */
     private static LicenseSetFactory readConfigFiles(Collection<URL> urls) {
 
@@ -126,17 +126,28 @@ public static IOSupplier<InputStream> getUnapprovedLicensesStyleSheet() {
         return () -> Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
     }
 
+    /**
+     * Gets the sorted set of approved licenses for a given filter condition.
+     * @param filter define which type of licenses to return.
+     * @return sorted set of licenses.
+     */
     public SortedSet<ILicense> getLicenses(LicenseFilter filter) {
         return setFactory.getLicenses(filter);
     }
     
+    /**
+     * Gets the sorted set of approved licenses for a given filter condition.
+     * @param filter define which type of licenses to return.
+     * @return sorted set of license families.
+     */
     public SortedSet<ILicenseFamily> getLicenseFamilies(LicenseFilter filter) {
         return setFactory.getLicenseFamilies(filter);
     }
 
     /**
-     * Gets the sorted set of approved license ids.
-     * If not licenses have been explicitly listed as approved all licenses are assumed to be approved.
+     * Gets the sorted set of approved license ids for a given filter condition.
+     * If no licenses have been explicitly listed as approved, all licenses are assumed to be approved.
+     * @param filter define which type of licenses to return.
      * @return The sorted set of approved licenseIds.
      */
     public SortedSet<String> getLicenseIds(LicenseFilter filter) {
@@ -169,6 +180,7 @@ public Builder add(URL url) {
          * 
          * @param fileName the name of the file to add.
          * @return this Builder for chaining
+         * @throws MalformedURLException in case the fileName cannot be found.
          */
         public Builder add(String fileName) throws MalformedURLException {
             return add(new File(fileName));
@@ -179,6 +191,7 @@ public Builder add(String fileName) throws MalformedURLException {
          * 
          * @param file the File to add.
          * @return this Builder for chaining
+         * @throws MalformedURLException in case the file cannot be found.
          */
         public Builder add(File file) throws MalformedURLException {
             return add(file.toURI().toURL());
@@ -200,6 +213,7 @@ public Builder remove(URL url) {
          * 
          * @param fileName the fileName of the file to remove.
          * @return this Builder for chaining
+         * @throws MalformedURLException in case the fileName cannot be found.
          */
         public Builder remove(String fileName) throws MalformedURLException {
             return remove(new File(fileName));
@@ -210,6 +224,7 @@ public Builder remove(String fileName) throws MalformedURLException {
          * 
          * @param file the File of the file to remove.
          * @return this Builder for chaining
+         * @throws MalformedURLException in case the file cannot be found.
          */
         public Builder remove(File file) throws MalformedURLException {
             return remove(file.toURI().toURL());
@@ -226,6 +241,7 @@ public Builder noDefault() {
 
         /**
          * Builds the defaults object.
+         * @return the current defaults object.
          */
         public Defaults build() {
             return new Defaults(fileNames);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
index a25797efd..f995773ca 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/Format.java
@@ -112,6 +112,7 @@ public static Format fromURL(URL url) {
     * Determine the {@code Format} from a File.
     * @param file the File to check.
     * @return the Format
+    * @throws MalformedURLException in case the file cannot be found.
     */
    public static Format fromFile(File file) throws MalformedURLException {
         return Format.fromURL(file.toURI().toURL());
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
index 0fd6eb5f0..428137072 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/LicenseReader.java
@@ -45,7 +45,7 @@ public interface LicenseReader {
     /**
      * Reads the configuration and extracts instances of ILicenseFamily.
      * 
-     * @return A collection of ILicensFamily.
+     * @return A collection of ILicenseFamily.
      */
     SortedSet<ILicenseFamily> readFamilies();
 
@@ -53,7 +53,7 @@ public interface LicenseReader {
      * Reads the configuration and extracts the list of approved licenses.
      * 
      * @return The list of approved licenses specified in the configuration or an
-     * empty list if non specified.
+     * empty list if none specified.
      */
     SortedSet<String> approvedLicenseId();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
index bb8d2b530..d6e42253d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/MatcherReader.java
@@ -32,7 +32,7 @@ public interface MatcherReader {
     void addMatchers(URL url);
 
     /**
-     * Reads the configuration and MatcherBuilder classes and adds them to Readers..
+     * Reads the configuration and MatcherBuilder classes and adds them to Readers.
      */
     void readMatcherBuilders();
 }

From 26e9a5d8aa7aec733e53dbdeb33a28358bf7d936 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 20:59:49 +0100
Subject: [PATCH 274/299] RAT-346: Fix more javadoc warnings

---
 .../org/apache/rat/analysis/license/DeprecatedConfig.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
index 90db1e0c3..1bca1f70f 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
@@ -22,10 +22,14 @@
 import org.apache.rat.license.ILicenseFamily;
 
 /**
- * A temoprary interface for deprecated configuration options.
+ * A temporary interface for deprecated configuration options.
  */
 @Deprecated // remove in v1.0
 public interface DeprecatedConfig {
+	
+	/**
+	 * @return the license definition.
+	 */
     ILicense.Builder getLicense();
     ILicenseFamily getLicenseFamily();
 }

From 385ad2ed4313e64e5f1cd48b2b84a1bfb834446b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 21:04:11 +0100
Subject: [PATCH 275/299] RAT-346: Fix more javadoc warnings

---
 .../org/apache/rat/analysis/license/DeprecatedConfig.java   | 6 ++++--
 .../src/main/java/org/apache/rat/policy/DefaultPolicy.java  | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
index 1bca1f70f..fc8de831c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/DeprecatedConfig.java
@@ -26,10 +26,12 @@
  */
 @Deprecated // remove in v1.0
 public interface DeprecatedConfig {
-	
-	/**
+    /**
 	 * @return the license definition.
 	 */
     ILicense.Builder getLicense();
+    /**
+     * @return the license family definition.
+     */
     ILicenseFamily getLicenseFamily();
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
index 69c5fec09..bec67c468 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
@@ -45,7 +45,7 @@ public DefaultPolicy(final Collection<ILicenseFamily> approvedLicenseFamilies) {
 
     /**
      * adds an ILicenseFamily to the list of approved licenses.
-     * @param approvedLicense
+     * @param approvedLicense license to be approved.
      */
     public void add(ILicenseFamily approvedLicense) {
         this.approvedLicenseFamilies.add(approvedLicense);
@@ -78,8 +78,8 @@ public void reportLicenseApprovalClaim(final Document document, final boolean is
     }
 
     /**
-     * Gets and unmodifiable reference to the SortedSet of approved licenses that this policy is holding.
-     * @return
+     * Gets an unmodifiable reference to the SortedSet of approved licenses that this policy is holding.
+     * @return sorted set of license family definitions.
      */
     public SortedSet<ILicenseFamily> getApprovedLicenseNames() {
         return Collections.unmodifiableSortedSet(approvedLicenseFamilies);

From 62c6e3744512924456689fcf0d70d68955171282 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 21:09:16 +0100
Subject: [PATCH 276/299] RAT-346: Fix more javadoc warnings

---
 .../rat/configuration/builders/ChildContainerBuilder.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
index 6c41d5306..d67264b42 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/configuration/builders/ChildContainerBuilder.java
@@ -44,14 +44,17 @@ public abstract class ChildContainerBuilder extends AbstractBuilder {
      */
     protected final List<IHeaderMatcher.Builder> children = new ArrayList<>();
 
+    /**
+     * Empty default constructor.
+     */
     protected ChildContainerBuilder() {
     }
 
     /**
-     * Reads a text file. Each line becomes a text matcher in the resulting List.
+     * Reads a text file. Each line becomes a text matcher in the resulting list.
      * 
      * @param resourceName the name of the resource to read.
-     * @return a List of Matchers, one for each non empty line in the input file.
+     * @return a List of Matchers, one for each non-empty line in the input file.
      */
     public AbstractBuilder setResource(String resourceName) {
           URL url = this.getClass().getResource(resourceName);

From 3bc735753f8cee34b7e4ed4a41176f394c22c07e Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 21:14:47 +0100
Subject: [PATCH 277/299] RAT-346: Adapt changelog for javadoc changes

---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cf759ce6d..ea390bfa1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -85,7 +85,7 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
         Issue a warning if a user defined License family has the same name as an existing one.
       </action>
       <action issue="RAT-346" type="add" dev="pottlinger" due-to="Claude Warren">
-        Migrate to JUnit5 and fix minor issues in tests.
+        Migrate to JUnit5 and fix minor issues in tests and javadoc.
       </action>
       <action issue="RAT-346" type="remove" dev="pottlinger" due-to="Claude Warren">
         Remove apache-rat-api module that contains misleading license-related classes.

From cf66ca6081908c028ba8781f82f67dda8aef1d8d Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 21:33:40 +0100
Subject: [PATCH 278/299] RAT-343: Enhance documentation about new
 configuration options

---
 .../site/apt/examples/custom-license.apt.vm   | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index c81c85a3d..f6ed6b4a6 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -4,9 +4,9 @@
 ~~   The ASF licenses this file to You under the Apache License, Version 2.0
 ~~   (the "License"); you may not use this file except in compliance with
 ~~   the License.  You may obtain a copy of the License at
-~~  
+~~
 ~~        http://www.apache.org/licenses/LICENSE-2.0
-~~  
+~~
 ~~   Unless required by applicable law or agreed to in writing, software
 ~~   distributed under the License is distributed on an "AS IS" BASIS,
 ~~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,17 +20,16 @@
 Custom License Matchers
 
   Rat comes with a set of predefined license matchers, that can be used
-  some typical licenses. However, they will not always be sufficient.
-  In such cases, you may use a custom license matcher.
+  on typical licenses. However, they will not always be sufficient.
+  In such cases, you may configure a custom license matcher.
 
   The simplest way to create a license check is to create an XML file describing
   the new license and add it to the processing with the additionalLicenseFiles
-  option.  
-  
+  option.
+
   The second option is to define the custom license directly in the POM.
-  Unlike earlier version no custom implementations are required to define
+  Unlike earlier version (before 0.16) no custom implementations are required to define
   custom licenses.
- 
 
 ------------------------------------------------------------------
   /**
@@ -78,7 +77,7 @@ Custom License Matchers
 
 Approved License Families
 
-  By default all POM defined licenses are considered approved, this is a 
+  By default all POM defined licenses are considered approved, this is a
   change from pre 0.16 versons.  If there are families that are defined in
   the pom but that should not be considered approved then a list of approved
   license families must be provided.
@@ -117,6 +116,3 @@ Approved License Families
     </plugins>
   </build>
 ------------------------------------------------------------------
-
-
-

From 370d03c8743333e317519c0b6bb8aee3c5da001d Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 21:52:08 +0100
Subject: [PATCH 279/299] RAT-343: Add intro

---
 .../src/site/apt/examples/custom-license.apt.vm     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index f6ed6b4a6..a18038007 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -116,3 +116,16 @@ Approved License Families
     </plugins>
   </build>
 ------------------------------------------------------------------
+
+Overview of configuration options
+
+  When defining custom licenses, remember the following architecture constraints:
+
+  * Each license is associated with a family.  Multiple licenses can be associated with a family.
+
+  * Each license may have a notes element.
+
+  * Each license has one matcher.
+
+
+https://maven.apache.org/doxia/references/apt-format.html

From ea3a5d3f9c770607fbecda89ae416f28d91f75bf Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 21:56:22 +0100
Subject: [PATCH 280/299] RAT-343: Hide link to format howto

---
 apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index a18038007..ac9630e15 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -127,5 +127,4 @@ Overview of configuration options
 
   * Each license has one matcher.
 
-
-https://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html

From 0451bc136e100caa2abde25529327f6f32871043 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 14 Jan 2024 22:30:17 +0100
Subject: [PATCH 281/299] RAT-343: Update docs

---
 .../site/apt/examples/custom-license.apt.vm   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index ac9630e15..249ec9f0a 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -31,6 +31,8 @@ Custom License Matchers
   Unlike earlier version (before 0.16) no custom implementations are required to define
   custom licenses.
 
+  There is a file that defines all of the standard licenses: {{{https://github.com/apache/creadur-rat/blob/master/apache-rat-core/src/main/resources/org/apache/rat/default.xml}default.xml}}
+
 ------------------------------------------------------------------
   /**
    * Yet Another Software License, 1.0
@@ -127,4 +129,30 @@ Overview of configuration options
 
   * Each license has one matcher.
 
+* Matcher details
+
+    <<all>> - A collection of matchers in which all enclosed matchers have to be true for the matcher to report true.
+
+    <<any>> - A collection of matchers that will report true if any enclosed matcher is true.
+
+    <<copyright>> - A matcher that matches Copyright text.
+    This uses regular expressions and so should only be used when looking for copyrights with specific patterns that are not caught by a standard text matcher.
+    This matcher will match <<<"(C)">>>, <<<"copyright">>>, or <<<"©">>>. (text is not case sensitive).
+    It will also match things like <<<Copyright (c) joe 1995>>> as well as <<<Copyright (C) 1995 joe>>>.
+    Copyright has 3 child elements:
+
+      * <<start>> - the starting date of the copyright or the only date.
+
+      * <<end>> - the ending date of the copyright.  Only valid if the starting date is provided.
+
+      * <<owner>> - the copyright owner.
+
+    <<not>> - A matcher that wraps one matcher and negates its value.  Not matchers require that the entire header be read before it can report true or false.  This may significantly slow processing.
+
+    <<regex>> - A matcher that matches a regex string.
+
+    <<spdx>> - A matcher that matches SPDX tags.  SPDX tags have the form: <<<SPDX-License-Identifier: short-name>>>, where short-name matches the regex pattern <<<"[A-Za-z0-9\.\-]+".>>>  spdx takes the short name as an argument.
+
+  If you define families and do not define <<<approvedFamilies>>> in your pom all the families are assumed to be approved.
+
 ~~ https://maven.apache.org/doxia/references/apt-format.html

From 6790fe45b4ca6d8fecf6d39d0b1727dede24315f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 00:03:45 +0000
Subject: [PATCH 282/299] Bump org.junit.platform:junit-platform-runner from
 1.8.1 to 1.10.1

Bumps [org.junit.platform:junit-platform-runner](https://github.com/junit-team/junit5) from 1.8.1 to 1.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-runner
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2f003d1a4..022ad8345 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@ agnostic home for software distribution comprehension and audit tools.
     <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
     <!-- END - adapat manually before doing a release -->
     <junit.version>5.10.0</junit.version>
-    <junit.platform.version>1.8.1</junit.platform.version>
+    <junit.platform.version>1.10.1</junit.platform.version>
   </properties>
   <distributionManagement>
     <site>

From c69157d3a91140cffcf76bf4ff6b3e4ecd393e17 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Mon, 15 Jan 2024 07:40:42 +0100
Subject: [PATCH 283/299] Added gating if statements before regex in SPDX and
 Copyright matchers

---
 .../analysis/matchers/CopyrightMatcher.java   | 23 +++++++++++--------
 .../analysis/matchers/SPDXMatcherFactory.java |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
index 43e960e9c..a03798b4d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/CopyrightMatcher.java
@@ -106,16 +106,19 @@ public CopyrightMatcher(String id, String start, String stop, String owner) {
 
     @Override
     protected boolean doMatch(String line) {
-        Matcher matcher = COPYRIGHT_PATTERN.matcher(line);
-        if (matcher.find()) {
-            String buffer = line.substring(matcher.end());
-            matcher = dateOwnerPattern.matcher(buffer);
-            if (matcher.find() && matcher.start() == 0) {
-                return true;
-            }
-            if (ownerDatePattern != null) {
-                matcher = ownerDatePattern.matcher(buffer);
-                return matcher.find() && matcher.start() == 0;
+        String lowerLine = line.toLowerCase();
+        if (lowerLine.contains("copyright") || lowerLine.contains("(c)") || line.contains("©")) {
+            Matcher matcher = COPYRIGHT_PATTERN.matcher(line);
+            if (matcher.find()) {
+                String buffer = line.substring(matcher.end());
+                matcher = dateOwnerPattern.matcher(buffer);
+                if (matcher.find() && matcher.start() == 0) {
+                    return true;
+                }
+                if (ownerDatePattern != null) {
+                    matcher = ownerDatePattern.matcher(buffer);
+                    return matcher.find() && matcher.start() == 0;
+                }
             }
         }
         return false;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index 8ba5fadc2..e1adbeabc 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -96,7 +96,7 @@ private boolean check(String line, Match caller) {
         // if the line has not been seen yet see if we can extract the SPDX id from the line.
         // if so then see if that name has been registered.  If so then we have a match and set 
         // lastMatch.
-        if (lastLine == null || !lastLine.equals(line)) {
+        if ((lastLine == null || !lastLine.equals(line)) && line.contains("SPDX-License-Identifier")) {
             Matcher matcher = groupSelector.matcher(line);
             if (matcher.find()) {
                 lastMatch = matchers.get(matcher.group(1));

From 796ebb6e2c34f6b8214d57ebd3462c9879a57ad1 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Mon, 15 Jan 2024 12:08:39 +0100
Subject: [PATCH 284/299] updated examples

---
 .../site/apt/examples/custom-license.apt.vm   | 88 +++++++++++++++++--
 1 file changed, 83 insertions(+), 5 deletions(-)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index 249ec9f0a..ea51254b4 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -84,8 +84,8 @@ Approved License Families
   the pom but that should not be considered approved then a list of approved
   license families must be provided.
 
-  To continue the example, to be explicit that the YASL1 license is approved
-  add an approvedLicenses section listing the IDs for the approved licenses.
+  In the following exmaple, we define YASL1 and BAD1 and then indicate that 
+  BAD1 is bad by specifying that YASL1 is good.
 
 ------------------------------------------------------------------
   <build>
@@ -108,6 +108,10 @@ Approved License Families
                <id>YASL1</id>
                <name>Yet Another Software License</name>
              </family>
+             <family>
+               <id>BAD1</id>
+               <name>A Bad Sofware License</name>
+             </family>
           </families>
           <approvedLicenses>
             <id>YASL1</id>
@@ -132,13 +136,26 @@ Overview of configuration options
 * Matcher details
 
     <<all>> - A collection of matchers in which all enclosed matchers have to be true for the matcher to report true.
+------------------------------------------------------------------
+<all>
+   <text>This text is required</text>
+   <text>as is this text, both have to trigger before 'all' will be true</text>
+</all>
+------------------------------------------------------------------    
 
     <<any>> - A collection of matchers that will report true if any enclosed matcher is true.
+------------------------------------------------------------------
+<any>
+   <text>This text will trigger a match all by itself</text>
+   <text>So will this text.</text>
+</any>
+------------------------------------------------------------------    
+    
 
     <<copyright>> - A matcher that matches Copyright text.
     This uses regular expressions and so should only be used when looking for copyrights with specific patterns that are not caught by a standard text matcher.
     This matcher will match <<<"(C)">>>, <<<"copyright">>>, or <<<"©">>>. (text is not case sensitive).
-    It will also match things like <<<Copyright (c) joe 1995>>> as well as <<<Copyright (C) 1995 joe>>>.
+    It will also match things like <<<Copyright (c) joe 1995>>> as well as <<<Copyright (C) 1995 joe>>> and <<<Copyright (C) joe 1995e>>>.
     Copyright has 3 child elements:
 
       * <<start>> - the starting date of the copyright or the only date.
@@ -146,13 +163,74 @@ Overview of configuration options
       * <<end>> - the ending date of the copyright.  Only valid if the starting date is provided.
 
       * <<owner>> - the copyright owner.
+------------------------------------------------------------------
+<copyright> <!-- this will match (c) 1995-1996 joe, or (c) joe 1995-1996 -->
+   <start>1995</text>
+   <end>1996</end>
+   <owner>joe</owner>
+</copyright>
 
-    <<not>> - A matcher that wraps one matcher and negates its value.  Not matchers require that the entire header be read before it can report true or false.  This may significantly slow processing.
+<copyright> <!-- this will match (c) 1995 joe, or (c) joe 1995 -->
+   <start>1995</text>
+   <owner>joe</owner>
+</copyright>
 
+<copyright> <!-- this will match (c) nnnn joe, or (c) joe nnnn, where nnnn is a 4 digit year -->
+   <owner>joe</owner>
+</copyright>
+
+<copyright> <!-- this will match (c) nnnn, where nnnn is a 4 digit year -->
+</copyright>
+
+------------------------------------------------------------------          
+
+    <<not>> - A matcher that wraps one matcher and negates its value.  Not matchers require that the entire header be read before it can report true or false.  This may significantly slow processing.
+------------------------------------------------------------------
+<not>
+   <text>This text must not be present</text>
+</not>
+------------------------------------------------------------------    
     <<regex>> - A matcher that matches a regex string.
+------------------------------------------------------------------
+<regex>[H|h]ello\s[W|w]orld</regex>
+------------------------------------------------------------------    
+    
 
     <<spdx>> - A matcher that matches SPDX tags.  SPDX tags have the form: <<<SPDX-License-Identifier: short-name>>>, where short-name matches the regex pattern <<<"[A-Za-z0-9\.\-]+".>>>  spdx takes the short name as an argument.
+------------------------------------------------------------------
+<spdx>Apache-2.0</spdx>
+------------------------------------------------------------------    
+
+
+** Combining the examples together
+
+------------------------------------------------------------------
+<all>
+    <any> <!-- any of the enclosed matchers will cause a match. -->
+        <all>  <!-- must have both 'This text is required and a copyright statement -->
+           <text>This text is required</text>
+           <copyright />
+        </all>
+        <copyright> <!-- accept any file that has a copyright by joe -->
+           <owner>joe</owner>
+        </copyright>
+        <!-- accept any file with "Hello World" -->
+        <regex>[H|h]ello\s[W|w]orld</regex>
+        <!-- accept any file with Apache 2 SPDX tag -->
+        <spdx>Apache-2.0</spdx>
+    </any>
+    <!-- make sure the text we don't want is not present -->
+    <not>
+       <text>This text must not be present</text>
+    </not>
+</all>
+------------------------------------------------------------------
+
+
+  If you define families and do not define <<<approvedFamilies>>> in your pom all the families are assumed to be approved.  If you want to exclude some familes 
+  that are defined in the POM you must list the approved ones in an <<<approvedFamilies>>> as shown below. 
+  
+
 
-  If you define families and do not define <<<approvedFamilies>>> in your pom all the families are assumed to be approved.
 
 ~~ https://maven.apache.org/doxia/references/apt-format.html

From 12cd6cec71e8e0b4573decd8334b5ac3b5adf9ce Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Mon, 15 Jan 2024 12:14:30 +0100
Subject: [PATCH 285/299] cleaned up examples

---
 .../src/site/apt/examples/custom-license.apt.vm      | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index ea51254b4..12e3ae980 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -207,7 +207,7 @@ Overview of configuration options
 ------------------------------------------------------------------
 <all>
     <any> <!-- any of the enclosed matchers will cause a match. -->
-        <all>  <!-- must have both 'This text is required and a copyright statement -->
+        <all>  <!-- must have both 'This text is required' and a copyright statement -->
            <text>This text is required</text>
            <copyright />
         </all>
@@ -216,10 +216,10 @@ Overview of configuration options
         </copyright>
         <!-- accept any file with "Hello World" -->
         <regex>[H|h]ello\s[W|w]orld</regex>
-        <!-- accept any file with Apache 2 SPDX tag -->
+        <!-- accept any file with 'SPDX-License-Identifier: Apache-2.0' -->
         <spdx>Apache-2.0</spdx>
     </any>
-    <!-- make sure the text we don't want is not present -->
+    <!-- make sure the text 'This text must not be present' is not present -->
     <not>
        <text>This text must not be present</text>
     </not>
@@ -227,10 +227,4 @@ Overview of configuration options
 ------------------------------------------------------------------
 
 
-  If you define families and do not define <<<approvedFamilies>>> in your pom all the families are assumed to be approved.  If you want to exclude some familes 
-  that are defined in the POM you must list the approved ones in an <<<approvedFamilies>>> as shown below. 
-  
-
-
-
 ~~ https://maven.apache.org/doxia/references/apt-format.html

From c2ca76350bd64757fb91466c285183be674f72c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 11:49:58 +0000
Subject: [PATCH 286/299] Bump junit.version from 5.10.0 to 5.10.1

Bumps `junit.version` from 5.10.0 to 5.10.1.

Updates `org.junit.jupiter:junit-jupiter-api` from 5.10.0 to 5.10.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

Updates `org.junit.jupiter:junit-jupiter-engine` from 5.10.0 to 5.10.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

Updates `org.junit.jupiter:junit-jupiter-params` from 5.10.0 to 5.10.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

Updates `org.junit.jupiter:junit-jupiter-migrationsupport` from 5.10.0 to 5.10.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.junit.jupiter:junit-jupiter-migrationsupport
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 022ad8345..a894e36bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ agnostic home for software distribution comprehension and audit tools.
     <previousRatVersion>0.16.1</previousRatVersion>
     <currentSnapshotRatVersion>0.17-SNAPSHOT</currentSnapshotRatVersion>
     <!-- END - adapat manually before doing a release -->
-    <junit.version>5.10.0</junit.version>
+    <junit.version>5.10.1</junit.version>
     <junit.platform.version>1.10.1</junit.platform.version>
   </properties>
   <distributionManagement>

From 8c32c9a338e52ed899309397a377e24eb3167d7b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 15 Jan 2024 16:30:22 +0100
Subject: [PATCH 287/299] Cleanup examples

---
 .../site/apt/examples/custom-license.apt.vm   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index 12e3ae980..83ee8aea8 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -84,7 +84,7 @@ Approved License Families
   the pom but that should not be considered approved then a list of approved
   license families must be provided.
 
-  In the following exmaple, we define YASL1 and BAD1 and then indicate that 
+  In the following exmaple, we define YASL1 and BAD1 and then indicate that
   BAD1 is bad by specifying that YASL1 is good.
 
 ------------------------------------------------------------------
@@ -136,26 +136,27 @@ Overview of configuration options
 * Matcher details
 
     <<all>> - A collection of matchers in which all enclosed matchers have to be true for the matcher to report true.
+
 ------------------------------------------------------------------
 <all>
    <text>This text is required</text>
    <text>as is this text, both have to trigger before 'all' will be true</text>
 </all>
-------------------------------------------------------------------    
+------------------------------------------------------------------
 
     <<any>> - A collection of matchers that will report true if any enclosed matcher is true.
+
 ------------------------------------------------------------------
 <any>
    <text>This text will trigger a match all by itself</text>
    <text>So will this text.</text>
 </any>
-------------------------------------------------------------------    
-    
+------------------------------------------------------------------
 
     <<copyright>> - A matcher that matches Copyright text.
     This uses regular expressions and so should only be used when looking for copyrights with specific patterns that are not caught by a standard text matcher.
     This matcher will match <<<"(C)">>>, <<<"copyright">>>, or <<<"©">>>. (text is not case sensitive).
-    It will also match things like <<<Copyright (c) joe 1995>>> as well as <<<Copyright (C) 1995 joe>>> and <<<Copyright (C) joe 1995e>>>.
+    It will also match things like <<<Copyright (c) joe 1995>>> as well as <<<Copyright (C) 1995 joe>>> and <<<Copyright (C) joe 1995>>>.
     Copyright has 3 child elements:
 
       * <<start>> - the starting date of the copyright or the only date.
@@ -163,7 +164,9 @@ Overview of configuration options
       * <<end>> - the ending date of the copyright.  Only valid if the starting date is provided.
 
       * <<owner>> - the copyright owner.
+
 ------------------------------------------------------------------
+
 <copyright> <!-- this will match (c) 1995-1996 joe, or (c) joe 1995-1996 -->
    <start>1995</text>
    <end>1996</end>
@@ -182,31 +185,35 @@ Overview of configuration options
 <copyright> <!-- this will match (c) nnnn, where nnnn is a 4 digit year -->
 </copyright>
 
-------------------------------------------------------------------          
+------------------------------------------------------------------
 
     <<not>> - A matcher that wraps one matcher and negates its value.  Not matchers require that the entire header be read before it can report true or false.  This may significantly slow processing.
+
 ------------------------------------------------------------------
 <not>
    <text>This text must not be present</text>
 </not>
-------------------------------------------------------------------    
+------------------------------------------------------------------
+
     <<regex>> - A matcher that matches a regex string.
+
 ------------------------------------------------------------------
 <regex>[H|h]ello\s[W|w]orld</regex>
-------------------------------------------------------------------    
-    
+------------------------------------------------------------------
+
 
     <<spdx>> - A matcher that matches SPDX tags.  SPDX tags have the form: <<<SPDX-License-Identifier: short-name>>>, where short-name matches the regex pattern <<<"[A-Za-z0-9\.\-]+".>>>  spdx takes the short name as an argument.
+
 ------------------------------------------------------------------
 <spdx>Apache-2.0</spdx>
-------------------------------------------------------------------    
+------------------------------------------------------------------
 
 
 ** Combining the examples together
 
 ------------------------------------------------------------------
 <all>
-    <any> <!-- any of the enclosed matchers will cause a match. -->
+    <any> <!-- HINT: any of the enclosed matchers will cause a match -->
         <all>  <!-- must have both 'This text is required' and a copyright statement -->
            <text>This text is required</text>
            <copyright />
@@ -226,5 +233,4 @@ Overview of configuration options
 </all>
 ------------------------------------------------------------------
 
-
 ~~ https://maven.apache.org/doxia/references/apt-format.html

From 5d93657f4450d8697ac02caca28a4207a79aed4b Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 15 Jan 2024 17:19:44 +0100
Subject: [PATCH 288/299] RAT-343: Explicitly mention that custom licenses need
 to have unique names

---
 apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index 83ee8aea8..e6397de20 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -33,6 +33,8 @@ Custom License Matchers
 
   There is a file that defines all of the standard licenses: {{{https://github.com/apache/creadur-rat/blob/master/apache-rat-core/src/main/resources/org/apache/rat/default.xml}default.xml}}
 
+  Please be aware that custom licenses need to have <<unique names>>, otherwise a warning is issued and your custom definitions are ignored in favour of the standard license definitions.
+
 ------------------------------------------------------------------
   /**
    * Yet Another Software License, 1.0

From 7e31d4218de89f07b7dbd4427d44220803f6254a Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 15 Jan 2024 22:50:02 +0100
Subject: [PATCH 289/299] RAT-343: Fix typo

---
 apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
index e6397de20..44930de53 100644
--- a/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
+++ b/apache-rat-plugin/src/site/apt/examples/custom-license.apt.vm
@@ -82,11 +82,11 @@ Custom License Matchers
 Approved License Families
 
   By default all POM defined licenses are considered approved, this is a
-  change from pre 0.16 versons.  If there are families that are defined in
+  change from pre 0.16 versions.  If there are families that are defined in
   the pom but that should not be considered approved then a list of approved
   license families must be provided.
 
-  In the following exmaple, we define YASL1 and BAD1 and then indicate that
+  In the following example, we define YASL1 and BAD1 and then indicate that
   BAD1 is bad by specifying that YASL1 is good.
 
 ------------------------------------------------------------------

From 42a4f78bfbeba3195dc1bded1e5653b527e5d469 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Mon, 15 Jan 2024 23:22:43 +0100
Subject: [PATCH 290/299] RAT-348: Use try-with-resources when reading ignore
 files

---
 .../org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
index 4f5adccd2..de9061bd8 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ignore/GlobIgnoreMatcher.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.logging.Log;
 
 import java.io.BufferedReader;
@@ -77,9 +76,8 @@ public void addRules(final Collection<String> rules) {
     public void loadFile(final Log log, final File scmIgnore) {
         if (scmIgnore != null && scmIgnore.exists() && scmIgnore.isFile()) {
             log.debug("Parsing exclusions from " + scmIgnore);
-            BufferedReader reader = null;
-            try {
-                reader = new BufferedReader(new FileReader(scmIgnore));
+
+            try (BufferedReader reader = new BufferedReader(new FileReader(scmIgnore))) {
                 String line;
                 while ((line = reader.readLine()) != null) {
                     if (!isComment(line)) {
@@ -90,8 +88,6 @@ public void loadFile(final Log log, final File scmIgnore) {
             } catch (final IOException e) {
                 log.warn("Cannot parse " + scmIgnore + " for exclusions. Will skip this file.");
                 log.debug("Skip parsing " + scmIgnore + " due to " + e.getMessage());
-            } finally {
-                IOUtils.closeQuietly(reader);
             }
         }
     }

From 78e58eca8cd2a0295e9e80666f23bca83338740d Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Tue, 16 Jan 2024 17:02:01 +0100
Subject: [PATCH 291/299] Fixed RAT-325 and added some logging

---
 .../src/main/java/org/apache/rat/Report.java  | 13 ++++---
 .../org/apache/rat/ReportConfiguration.java   |  2 +-
 .../rat/analysis/DefaultAnalyserFactory.java  | 15 +++++---
 .../rat/analysis/DocumentHeaderAnalyser.java  | 10 ++++--
 .../rat/analysis/LicenseCollection.java       |  3 +-
 .../analysis/matchers/SPDXMatcherFactory.java |  7 ++++
 .../annotation/AbstractLicenseAppender.java   | 14 ++++++--
 .../annotation/ApacheV2LicenseAppender.java   | 10 +++---
 .../java/org/apache/rat/api/MetaData.java     |  1 +
 .../impl/xml/SimpleXmlClaimReporter.java      |  1 +
 .../claim/util/LicenseAddingReport.java       |  5 +--
 .../rat/report/xml/XmlReportFactory.java      |  4 +--
 .../java/org/apache/rat/utils/DefaultLog.java | 35 +++++++++++--------
 .../main/java/org/apache/rat/utils/Log.java   | 31 +++++++++++++---
 .../apache/rat/ReportConfigurationTest.java   |  1 -
 .../test/java/org/apache/rat/ReportTest.java  | 27 ++++++++------
 .../java/org/apache/rat/ReporterTest.java     |  6 +++-
 .../rat/analysis/AnalyserFactoryTest.java     |  3 +-
 .../analysis/matchers/SPDXMatcherTest.java    | 11 ++++++
 .../rat/annotation/TestLicenseAppender.java   |  7 ++--
 .../rat/report/xml/XmlReportFactoryTest.java  |  2 --
 .../apache/rat/report/xml/XmlReportTest.java  |  3 +-
 22 files changed, 146 insertions(+), 65 deletions(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index fbb69f2d7..73f516557 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -126,13 +126,12 @@ public class Report {
      */
     public static void main(String[] args) throws Exception {
         Options opts = buildOptions();
-
         CommandLine cl;
         try {
             cl = new DefaultParser().parse(opts, args);
         } catch (ParseException e) {
-            System.err.println(e.getMessage());
-            System.err.println("Please use the \"--help\" option to see a list of valid commands and options");
+            DefaultLog.INSTANCE.error(e.getMessage());
+            DefaultLog.INSTANCE.error("Please use the \"--help\" option to see a list of valid commands and options");
             System.exit(1);
             return; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE
                     // for "cl"
@@ -147,7 +146,7 @@ public static void main(String[] args) throws Exception {
             printUsage(opts);
         } else {
             ReportConfiguration configuration = createConfiguration(args[0], cl);
-            configuration.validate(System.err::println);
+            configuration.validate(DefaultLog.INSTANCE::error);
 
             boolean dryRun = false;
             
@@ -210,7 +209,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
             if (cl.hasOption(STYLESHEET_CLI)) {
                 String[] style = cl.getOptionValues(STYLESHEET_CLI);
                 if (style.length != 1) {
-                    System.err.println("Please specify a single stylesheet");
+                    DefaultLog.INSTANCE.error("Please specify a single stylesheet");
                     System.exit(1);
                 }
                 configuration.setStyleSheet(() -> Files.newInputStream(Paths.get(style[0])));
@@ -256,10 +255,10 @@ static FilenameFilter parseExclusions(List<String> excludes) {
                 orFilter.addFileFilter(new NameFileFilter(exclusion));
                 orFilter.addFileFilter(WildcardFileFilter.builder().setWildcards(exclusion).get());
             } catch (PatternSyntaxException e) {
-                System.err.println("Will skip given exclusion '" + exclude + "' due to " + e);
+                DefaultLog.INSTANCE.error("Will skip given exclusion '" + exclude + "' due to " + e);
             }
         }
-        System.err.println("Ignored " + ignoredLines + " lines in your exclusion files as comments or empty lines.");
+        DefaultLog.INSTANCE.error("Ignored " + ignoredLines + " lines in your exclusion files as comments or empty lines.");
         return new NotFileFilter(orFilter);
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
index 91b78c6f9..572a7f5e5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java
@@ -263,7 +263,7 @@ public void setStyleReport(boolean styleReport) {
      * closed consider wrapping it in a {@code NoCloseOutputStream}
      * 
      * @param out The OutputStream supplier that provides the output stream to write
-     * the report to. (may be null)
+     * the report to. A null value will use System.out.
      * @see NoCloseOutputStream
      */
     public void setOut(IOSupplier<OutputStream> out) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
index b81055e73..06cbe8d3a 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
@@ -29,6 +29,8 @@
 import org.apache.rat.document.impl.guesser.BinaryGuesser;
 import org.apache.rat.document.impl.guesser.NoteGuesser;
 import org.apache.rat.license.ILicense;
+import org.apache.rat.utils.Log;
+import org.apache.rat.utils.Log.Level;
 
 /**
  * Creates default analysers.
@@ -40,11 +42,13 @@ public class DefaultAnalyserFactory {
      * @param licenses The licenses to use in  the Analyser.
      * @return A document analyser that uses the provides licenses.
      */
-    public static IDocumentAnalyser createDefaultAnalyser(Collection<ILicense> licenses) {
+    public static IDocumentAnalyser createDefaultAnalyser(Log log, Collection<ILicense> licenses) {
         if (licenses.isEmpty()) {
             throw new ConfigurationException("At least one license must be defined");
         }
-        return new DefaultAnalyser(new LicenseCollection(licenses));
+        log.debug("Licenses in Test");
+        licenses.forEach(log::debug);
+        return new DefaultAnalyser(log, new LicenseCollection(licenses));
     }
 
     /**
@@ -56,13 +60,16 @@ private final static class DefaultAnalyser implements IDocumentAnalyser {
          * The license to analyze
          */
         private final ILicense license;
+        /** The log to use */
+        private final Log log;
 
         /**
          * Constructs a DocumentAnalyser for the specified license.
          * @param license The license to analyse
          */
-        public DefaultAnalyser(final ILicense license) {
+        public DefaultAnalyser(final Log log, final ILicense license) {
             this.license = license;
+            this.log = log;
         }
 
         @Override
@@ -76,7 +83,7 @@ public void analyse(Document document) throws RatDocumentAnalysisException {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY;
             } else {
                 documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_STANDARD;
-                final DocumentHeaderAnalyser headerAnalyser = new DocumentHeaderAnalyser(license);
+                final DocumentHeaderAnalyser headerAnalyser = new DocumentHeaderAnalyser(log, license);
                 headerAnalyser.analyse(document);
             }
             document.getMetaData().set(documentCategory);
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
index 944feb39a..b984fbe98 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
@@ -25,6 +25,9 @@
 import org.apache.rat.document.IDocumentAnalyser;
 import org.apache.rat.document.RatDocumentAnalysisException;
 import org.apache.rat.license.ILicense;
+import org.apache.rat.utils.Log;
+
+import static java.lang.String.format;
 
 /**
  * A Document analyzer that analyses document headers for a license.
@@ -35,21 +38,24 @@ class DocumentHeaderAnalyser implements IDocumentAnalyser {
      * The license to analyse
      */
     private final ILicense license;
+    /** the logger to use */
+    private final Log log;
 
     /**
      * Constructs the HeaderAnalyser for the specific license.
      * 
      * @param license The license to analyse
      */
-    public DocumentHeaderAnalyser(final ILicense license) {
+    public DocumentHeaderAnalyser(final Log log, final ILicense license) {
         super();
         this.license = license;
+        this.log = log;
     }
 
     @Override
     public void analyse(Document document) throws RatDocumentAnalysisException {
         try (Reader reader = document.reader()) {
-            // TODO: worker function should be moved into this class
+            log.info(format("Processing: %s", document));
             HeaderCheckWorker worker = new HeaderCheckWorker(reader, license, document);
             worker.read();
         } catch (IOException e) {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
index 308f06da4..57ee9de3d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/LicenseCollection.java
@@ -19,6 +19,7 @@
 package org.apache.rat.analysis;
 
 import java.util.Collection;
+import java.util.Collections;
 
 import org.apache.rat.analysis.matchers.AbstractMatcherContainer;
 import org.apache.rat.license.ILicense;
@@ -45,7 +46,7 @@ class LicenseCollection extends AbstractMatcherContainer implements ILicense {
      */
     public LicenseCollection(Collection<ILicense> enclosed) {
         super(enclosed);
-        this.enclosed = enclosed;
+        this.enclosed = Collections.unmodifiableCollection(enclosed);
         this.matchingLicense = null;
         this.lastState = State.i;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
index e1adbeabc..5766b5257 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/SPDXMatcherFactory.java
@@ -127,5 +127,12 @@ public class Match extends AbstractSimpleMatcher {
         protected boolean doMatch(String line) {
             return SPDXMatcherFactory.this.check(line, this);
         }
+        
+        @Override
+        public void reset() {
+            super.reset();
+            SPDXMatcherFactory.this.lastMatch = null;
+            
+        }
     }
 }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
index e10747be2..6870bcace 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
@@ -19,6 +19,7 @@
 package org.apache.rat.annotation;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.rat.utils.Log;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -196,9 +197,16 @@ public abstract class AbstractLicenseAppender {
     }
 
     private boolean isForced;
+    /** The log to use */
+    private final Log log;
 
-    public AbstractLicenseAppender() {
+    /**
+     * Constructor
+     * @param log The log to use.
+     */
+    public AbstractLicenseAppender(final Log log) {
         super();
+        this.log = log;
     }
 
     /**
@@ -247,11 +255,11 @@ public void append(File document) throws IOException {
         if (isForced) {
             boolean deleted = document.delete();
             if (!deleted) {
-                System.err.println("Could not delete original file to prepare renaming.");
+                log.error("Could not delete original file to prepare renaming.");
             }
             boolean renamed = newDocument.renameTo(document.getAbsoluteFile());
             if (!renamed) {
-                System.err.println("Failed to rename new file, original file remains unchanged.");
+                log.error("Failed to rename new file, original file remains unchanged.");
             }
         }
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java b/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java
index 64509ccf2..8c4ccf7d0 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenseAppender.java
@@ -20,6 +20,8 @@
 
 import java.io.File;
 
+import org.apache.rat.utils.Log;
+
 
 /**
  * Add an Apache License V2 license header to a
@@ -35,8 +37,8 @@ public class ApacheV2LicenseAppender extends AbstractLicenseAppender {
     /**
      * Create a license appender with the standard ASF license header.
      */
-    public ApacheV2LicenseAppender() {
-        super();
+    public ApacheV2LicenseAppender(final Log log) {
+        super(log);
     }
 
     /**
@@ -45,8 +47,8 @@ public ApacheV2LicenseAppender() {
      *
      * @param copyright copyright line.
      */
-    public ApacheV2LicenseAppender(String copyright) {
-        super();
+    public ApacheV2LicenseAppender(final Log log, String copyright) {
+        super(log);
         this.copyright = copyright;
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
index 830722b6a..201f7f783 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
@@ -205,6 +205,7 @@ public MetaData() {
      * @param license the license to add metadata for.
      */
     public void reportOnLicense(ILicense license) {
+        
         if (StringUtils.isNotBlank(license.getNotes())) {
             set(new MetaData.Datum(MetaData.RAT_URL_HEADER_SAMPLE, license.getNotes()));
         }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java b/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
index e4da2ee98..43185931c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
@@ -24,6 +24,7 @@
 import org.apache.rat.api.RatException;
 import org.apache.rat.report.AbstractReport;
 import org.apache.rat.report.xml.writer.IXmlWriter;
+import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 
 import java.io.IOException;
 import java.util.Calendar;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java b/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
index 8570c692b..eb0dd83e6 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
@@ -27,13 +27,14 @@
 import org.apache.rat.api.MetaData.Datum;
 import org.apache.rat.api.RatException;
 import org.apache.rat.report.AbstractReport;
+import org.apache.rat.utils.Log;
 
 
 public class LicenseAddingReport extends AbstractReport {
     private final AbstractLicenseAppender appender;
 
-    public LicenseAddingReport(String pCopyrightMsg, boolean pForced) {
-        appender = pCopyrightMsg == null ? new ApacheV2LicenseAppender() : new ApacheV2LicenseAppender(pCopyrightMsg);
+    public LicenseAddingReport(final Log log, String pCopyrightMsg, boolean pForced) {
+        appender = pCopyrightMsg == null ? new ApacheV2LicenseAppender(log) : new ApacheV2LicenseAppender(log,pCopyrightMsg);
         appender.setForce(pForced);
     }
 
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
index 1a9a48d1e..b88dbff60 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
@@ -56,12 +56,12 @@ public static RatReport createStandardReport(IXmlWriter writer,
             reporters.add(new ClaimAggregator(statistic));
         }
         if (configuration.isAddingLicenses()) {
-            reporters.add(new LicenseAddingReport(configuration.getCopyrightMessage(), configuration.isAddingLicensesForced()));
+            reporters.add(new LicenseAddingReport(configuration.getLog(), configuration.getCopyrightMessage(), configuration.isAddingLicensesForced()));
         }
         reporters.add(new SimpleXmlClaimReporter(writer));
 
         final IDocumentAnalyser analyser =
-            DefaultAnalyserFactory.createDefaultAnalyser(configuration.getLicenses(LicenseFilter.all));
+            DefaultAnalyserFactory.createDefaultAnalyser(configuration.getLog(), configuration.getLicenses(LicenseFilter.all));
         final DefaultPolicy policy = new DefaultPolicy(configuration.getLicenseFamilies(LicenseFilter.approved));
 
         final IDocumentAnalyser[] analysers = {analyser, policy};
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
index 74e0f9f5c..8a0ea6809 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
@@ -27,25 +27,32 @@ public class DefaultLog implements Log {
      * The instance of the default log.
      */
     public static final DefaultLog INSTANCE = new DefaultLog();
+    
+    private Level level;
 
     private DefaultLog() {
+        level = Level.INFO;
     }
 
+    public void setLevel(Level level) {
+        this.level = level;
+    }
     @Override
     public void log(Level level, String msg) {
-        switch (level) {
-        case DEBUG:
-        case INFO:
-        case WARN:
-            System.out.format("%s: %s%n", level, msg);
-            break;
-        case ERROR:
-            System.err.format("%s: %s%n", level, msg);
-            break;
-		case OFF:
-			break;
-		default:
-			break;
-        }
+        if (this.level.ordinal() <= level.ordinal())
+            switch (level) {
+            case DEBUG:
+            case INFO:
+            case WARN:
+                System.out.format("%s: %s%n", level, msg);
+                break;
+            case ERROR:
+                System.err.format("%s: %s%n", level, msg);
+                break;
+            case OFF:
+                break;
+            default:
+                break;
+            }
     }
 }
\ No newline at end of file
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
index 63db7f1d5..82eb9b8b5 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/Log.java
@@ -27,10 +27,7 @@ public interface Log {
      * The log levels supported by logging.
      */
     public enum Level {
-    	/**
-    	 * Log nothing.
-    	 */
-    	OFF, 
+        // these must be listed in order of decreasing noisiness.
     	/**
     	 * Log debug only.
     	 */
@@ -46,7 +43,11 @@ public enum Level {
     	/**
     	 * Log error only.
     	 */
-    	ERROR };
+    	ERROR,
+        /**
+         * Log nothing.
+         */
+        OFF};
 
     /**
      * Writes a message at a specific log level.
@@ -54,4 +55,24 @@ public enum Level {
      * @param message the Message to write.
      */
     void log(Level level, String message);
+    
+    default void log(Level level, Object message) {
+        log(level, message == null ? "NULL" : message.toString());
+    }
+    
+    default void debug(Object message) {
+        log(Level.DEBUG, message);
+    }
+
+    default void info(Object message) {
+        log(Level.INFO, message);
+    }
+    
+    default void warn(Object message) {
+        log(Level.WARN, message);
+    }
+    
+    default void error(Object message) {
+        log(Level.ERROR, message);
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
index 325a1f35d..30acdc4cc 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportConfigurationTest.java
@@ -541,7 +541,6 @@ public static void validateDefaultLicenses(ReportConfiguration config, String...
      * @param config The configuration to test.
      */
     public static void validateDefault(ReportConfiguration config) {
-        //config.validate( System.err::println );
         assertThat(config.isAddingLicenses()).isFalse();
         assertThat(config.isAddingLicensesForced()).isFalse();
         assertThat(config.getCopyrightMessage()).isNull();
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
index 60d13e0a0..8632e0294 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java
@@ -34,6 +34,7 @@
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class ReportTest {
@@ -67,18 +68,22 @@ public void testOutputOption() throws Exception {
 
     @Test
     public void testDefaultOutput() throws Exception {
+        
         PrintStream origin = System.out;
-        File output = new File("target/sysout");
-        System.setOut(new PrintStream(output));
-        CommandLine cl = new DefaultParser().parse(Report.buildOptions(), new String[]{});
-        ReportConfiguration config = Report.createConfiguration("target/test-classes/elements", cl);
-        Reporter.report(config);
-        assertTrue(output.exists());
-        String content = FileUtils.readFileToString(output, StandardCharsets.UTF_8);
-        assertTrue(content.contains("2 Unknown Licenses"));
-        assertTrue(content.contains("target/test-classes/elements/Source.java"));
-        assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
-        System.setOut(origin);
+        try {
+            File output = new File("target/sysout");
+            System.setOut(new PrintStream(output));
+            CommandLine cl = new DefaultParser().parse(Report.buildOptions(), new String[]{});
+            ReportConfiguration config = Report.createConfiguration("target/test-classes/elements", cl);
+            Reporter.report(config);
+            assertTrue(output.exists());
+            String content = FileUtils.readFileToString(output, StandardCharsets.UTF_8);
+            assertTrue(content.contains("2 Unknown Licenses"));
+            assertTrue(content.contains("target/test-classes/elements/Source.java"));
+            assertTrue(content.contains("target/test-classes/elements/sub/Empty.txt"));
+        } finally {
+            System.setOut(origin);
+        }
     }
 
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
index 3d05de02c..d675b6994 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterTest.java
@@ -35,6 +35,7 @@
 import org.apache.rat.testhelpers.XmlUtils;
 import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.walker.DirectoryWalker;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
@@ -57,6 +58,7 @@ public void xmlReportTest() throws Exception {
         configuration.setOut(() -> out);
         Reporter.report(configuration);
         Document doc = XmlUtils.toDom(new ByteArrayInputStream(out.toByteArray()));
+        
         XPath xPath = XPathFactory.newInstance().newXPath();
 
         XmlUtils.getNode(doc, xPath, "/rat-report[@timestamp]");
@@ -76,6 +78,7 @@ public void xmlReportTest() throws Exception {
 
         NodeList nodeList = (NodeList) xPath.compile("/rat-report/resource").evaluate(doc, XPathConstants.NODESET);
         assertEquals(12, nodeList.getLength());
+
     }
 
     private static final String NL = System.getProperty("line.separator");
@@ -97,8 +100,9 @@ public void plainReportWithArchivesAndUnapprovedLicenses() throws Exception {
         configuration.setOut(() -> out);
         Reporter.report(configuration);
 
+        out.flush();
         String document = out.toString();
-        // System.out.println(document);
+
         assertTrue(document.startsWith(HEADER), "'Generated at' is present in " + document );
 
         // final int generatedAtLineEnd = document.indexOf(NL, HEADER.length());
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
index 2442cdf3c..3d5f87ec6 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/AnalyserFactoryTest.java
@@ -34,6 +34,7 @@
 import org.apache.rat.report.claim.impl.xml.SimpleXmlClaimReporter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
 import org.apache.rat.test.utils.Resources;
+import org.apache.rat.utils.DefaultLog;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -57,7 +58,7 @@ public void setUp() throws Exception {
         out = new StringWriter();
         final XmlWriter writer = new XmlWriter(out);
         reporter = new SimpleXmlClaimReporter(writer);
-        analyser = DefaultAnalyserFactory.createDefaultAnalyser(Arrays.asList(MATCHES_NOTHING_MATCHER));
+        analyser = DefaultAnalyserFactory.createDefaultAnalyser(DefaultLog.INSTANCE, Arrays.asList(MATCHES_NOTHING_MATCHER));
     }
 
     @Test
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
index f0d41e2e4..124ed357b 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/matchers/SPDXMatcherTest.java
@@ -72,4 +72,15 @@ public void testTrueIsAlwaysTrue() {
         target.reset();
         assertEquals(State.i, target.currentState());
     }
+    
+    @Test
+    public void testResetClearsLastMatch() {
+        
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.t, target.matches("SPDX-License-Identifier: hello"));
+        assertEquals(State.t, target.currentState());
+        target.reset();
+        assertEquals(State.i, target.currentState());
+        assertEquals(State.i, target.matches("Something weird"));;
+    }
 }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
index c4b263fd7..188ca7949 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
@@ -30,6 +30,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.rat.test.utils.Resources;
+import org.apache.rat.utils.DefaultLog;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -73,7 +74,7 @@ private void commonTestTemplate(String relativeName,
             createTestFile(name, creator);
 
             ApacheV2LicenseAppender appender =
-                    new ApacheV2LicenseAppender();
+                    new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
             appender.append(new File(name));
 
             try (BufferedReader r = new BufferedReader(new FileReader(name + ".new"))){
@@ -107,7 +108,7 @@ public void createFile(Writer writer)
         File file = new File(filename);
         file.deleteOnExit();
         ApacheV2LicenseAppender appender =
-                new ApacheV2LicenseAppender();
+                new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
         appender.append(file);
 
         File newFile = new File(filename + ".new");
@@ -501,7 +502,7 @@ public void fileWithBOM() throws IOException {
         File f = Resources.getResourceFile("violations/FilterTest.cs");
        
         ApacheV2LicenseAppender appender =
-                new ApacheV2LicenseAppender();
+                new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
         appender.append(f);
 
         try (BufferedReader r =  new BufferedReader(new FileReader(f.getAbsolutePath()
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
index c3d1b4494..0593b3415 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
@@ -74,8 +74,6 @@ private void report(DirectoryWalker directory, RatReport report) throws Exceptio
     public void standardReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
 
-        ILicenseFamily family = ILicenseFamily.builder().setLicenseFamilyCategory("TEST")
-                .setLicenseFamilyName("Testing family").build();
         
         final TestingLicense testingLicense = new TestingLicense(new TestingMatcher(true), family);
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
index 991628105..2af06f330 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
@@ -50,6 +50,7 @@
 import org.apache.rat.test.utils.Resources;
 import org.apache.rat.testhelpers.TestingLicense;
 import org.apache.rat.testhelpers.XmlUtils;
+import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.walker.DirectoryWalker;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -76,7 +77,7 @@ public void setUp() throws Exception {
         final IHeaderMatcher qosMatcher = new CopyrightMatcher("2004", "2011", "QOS.ch");
         final ILicense qosLic = new TestingLicense("QOS", qosMatcher);
 
-        IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(Arrays.asList(asfLic, qosLic));
+        IDocumentAnalyser analyser = DefaultAnalyserFactory.createDefaultAnalyser(DefaultLog.INSTANCE,Arrays.asList(asfLic, qosLic));
         final List<AbstractReport> reporters = new ArrayList<>();
         reporters.add(reporter);
         report = new ClaimReporterMultiplexer(analyser, reporters);

From b157bce9e4408483b7233eaa356f6f1d1840c09d Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 16 Jan 2024 21:56:37 +0100
Subject: [PATCH 292/299] RAT-325: Add missing changelog about SPDX
 optimization

---
 src/changes/changes.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 051b91765..df8cf596c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -96,6 +96,12 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
       <action issue="RAT-346" type="remove" dev="pottlinger" due-to="Claude Warren">
         Remove apache-rat-api module that contains misleading license-related classes.
       </action>
+      <action issue="RAT-325" type="fix" dev="pottlinger" due-to="Claude Warren">
+        To improve the performance during SPDX processing a check to skip expensive regex operations was added.
+      </action>
+      <action issue="RAT-325" type="fix" dev="pottlinger" due-to="Claude Warren">
+        Internal logging feature enabled for license matching tests to avoid random test failures when manipulating System.out in test runs.
+      </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.16.1
       </action>

From b93793f28893c8ef7540884416e148b0ab59ed0c Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Tue, 16 Jan 2024 22:09:21 +0100
Subject: [PATCH 293/299] RAT-325: Reduce log level to not pollute build logs
 with each filename that is being processed

---
 .../java/org/apache/rat/analysis/DocumentHeaderAnalyser.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
index b984fbe98..9534db9e7 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
@@ -55,7 +55,7 @@ public DocumentHeaderAnalyser(final Log log, final ILicense license) {
     @Override
     public void analyse(Document document) throws RatDocumentAnalysisException {
         try (Reader reader = document.reader()) {
-            log.info(format("Processing: %s", document));
+            log.debug(format("Processing: %s", document));
             HeaderCheckWorker worker = new HeaderCheckWorker(reader, license, document);
             worker.read();
         } catch (IOException e) {

From 9623f09e823bf43720c5ced38c0f5bfcd69597f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 00:48:35 +0000
Subject: [PATCH 294/299] Bump actions/cache from 3.3.3 to 4.0.0

Bumps [actions/cache](https://github.com/actions/cache) from 3.3.3 to 4.0.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.3.3...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dd9aa4343..516c09e33 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Configura artifact caching
-        uses: actions/cache@v3.3.3
+        uses: actions/cache@v4.0.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

From cadd8645533847a058c155a2c5fca5213e672637 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 17 Jan 2024 07:56:07 +0100
Subject: [PATCH 295/299] Changed default logging level to WARN

---
 .../src/main/java/org/apache/rat/utils/DefaultLog.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
index 8a0ea6809..f1db757db 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
@@ -31,7 +31,7 @@ public class DefaultLog implements Log {
     private Level level;
 
     private DefaultLog() {
-        level = Level.INFO;
+        level = Level.WARN;
     }
 
     public void setLevel(Level level) {

From 47b662b12cce846788bb46e45402892b1fffdc38 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Wed, 17 Jan 2024 08:42:21 +0100
Subject: [PATCH 296/299] added --log-level option to CLI to set logging level

---
 .../src/main/java/org/apache/rat/Report.java    | 17 +++++++++++++++++
 .../java/org/apache/rat/utils/DefaultLog.java   |  5 +++++
 2 files changed, 22 insertions(+)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 73f516557..1c8ceab16 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -50,6 +50,7 @@
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
 import org.apache.rat.utils.DefaultLog;
+import org.apache.rat.utils.Log;
 import org.apache.rat.utils.Log.Level;
 import org.apache.rat.walker.ArchiveWalker;
 import org.apache.rat.walker.DirectoryWalker;
@@ -110,6 +111,7 @@ public class Report {
      */
     private static final String LIST_FAMILIES = "list-families";
 
+    private static final String LOG_LEVEL = "log-level";
 
     /**
      * Set unstyled XML output
@@ -137,6 +139,15 @@ public static void main(String[] args) throws Exception {
                     // for "cl"
         }
 
+        if (cl.hasOption(LOG_LEVEL)) {
+            try {
+                Log.Level level = Log.Level.valueOf(cl.getOptionValue(LOG_LEVEL).toUpperCase());
+                DefaultLog.INSTANCE.setLevel(level);
+            } catch (IllegalArgumentException e) {
+                DefaultLog.INSTANCE.warn(String.format("Invalied Log Level (%s) specified.", cl.getOptionValue(LOG_LEVEL)));
+                DefaultLog.INSTANCE.warn(String.format("Log level set at: %s", DefaultLog.INSTANCE.getLevel()));
+            }
+        }
         if (cl.hasOption(HELP)) {
             printUsage(opts);
         }
@@ -327,6 +338,10 @@ static Options buildOptions() {
         Option dir = new Option("d", "dir", false, "Used to indicate source when using --exclude");
         opts.addOption(dir);
 
+        opts.addOption( Option.builder().argName("level").longOpt(LOG_LEVEL)
+                .hasArgs().desc("sets the log level.  Valid options are: DEBUG, INFO, WARN, ERROR, NONE")
+                .build() );
+        
         OptionGroup outputType = new OptionGroup();
 
         Option xml = new Option(XML, "xml", false, "Output the report in raw XML format.  Not compatible with -s");
@@ -336,6 +351,8 @@ static Options buildOptions() {
                 "XSLT stylesheet to use when creating the" + " report.  Not compatible with -x");
         outputType.addOption(xslt);
         opts.addOptionGroup(outputType);
+        
+        
 
         return opts;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
index f1db757db..f421121d2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/utils/DefaultLog.java
@@ -37,6 +37,11 @@ private DefaultLog() {
     public void setLevel(Level level) {
         this.level = level;
     }
+    
+    public Level getLevel() {
+        return level;
+    }
+    
     @Override
     public void log(Level level, String msg) {
         if (this.level.ordinal() <= level.ordinal())

From c31bdf9be3371fa1a6729e32cf57c4c947a6e149 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Wed, 17 Jan 2024 11:42:56 +0100
Subject: [PATCH 297/299] Fixed error in log level text

---
 apache-rat-core/src/main/java/org/apache/rat/Report.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 1c8ceab16..54438d1aa 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -339,7 +339,7 @@ static Options buildOptions() {
         opts.addOption(dir);
 
         opts.addOption( Option.builder().argName("level").longOpt(LOG_LEVEL)
-                .hasArgs().desc("sets the log level.  Valid options are: DEBUG, INFO, WARN, ERROR, NONE")
+                .hasArgs().desc("sets the log level.  Valid options are: DEBUG, INFO, WARN, ERROR, OFF")
                 .build() );
         
         OptionGroup outputType = new OptionGroup();

From fe3a498992cd748b421f0487fade429782cef3b0 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude.warren@aiven.io>
Date: Wed, 17 Jan 2024 11:45:22 +0100
Subject: [PATCH 298/299] Fixed typo

---
 apache-rat-core/src/main/java/org/apache/rat/Report.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index 54438d1aa..1db814a64 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -144,7 +144,7 @@ public static void main(String[] args) throws Exception {
                 Log.Level level = Log.Level.valueOf(cl.getOptionValue(LOG_LEVEL).toUpperCase());
                 DefaultLog.INSTANCE.setLevel(level);
             } catch (IllegalArgumentException e) {
-                DefaultLog.INSTANCE.warn(String.format("Invalied Log Level (%s) specified.", cl.getOptionValue(LOG_LEVEL)));
+                DefaultLog.INSTANCE.warn(String.format("Invalid Log Level (%s) specified.", cl.getOptionValue(LOG_LEVEL)));
                 DefaultLog.INSTANCE.warn(String.format("Log level set at: %s", DefaultLog.INSTANCE.getLevel()));
             }
         }

From 1036fcbcae3c070bd186653707c3cb6de05f1c62 Mon Sep 17 00:00:00 2001
From: "P. Ottlinger" <pottlinger@apache.org>
Date: Sun, 21 Jan 2024 22:16:09 +0100
Subject: [PATCH 299/299] RAT-325: Add changelog entry about new default
 logging level WARN for CLI/test runs

---
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index df8cf596c..e6853e568 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -102,6 +102,9 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
       <action issue="RAT-325" type="fix" dev="pottlinger" due-to="Claude Warren">
         Internal logging feature enabled for license matching tests to avoid random test failures when manipulating System.out in test runs.
       </action>
+      <action issue="RAT-325" type="add" dev="pottlinger" due-to="Claude Warren">
+        Set log level default for CLI runs to WARN. This applies to test runs as well, as other UIs configure their logging natively.
+      </action>
       <action issue="RAT-339" type="update" dev="pottlinger" due-to="dependabot">
         TODO: collect all dependabot updates for release 0.16.1
       </action>