From 008577fe4414a2119d121310f73b724f9a0d0212 Mon Sep 17 00:00:00 2001
From: Claude Warren <claude@xenei.com>
Date: Sun, 12 May 2024 10:26:14 +0200
Subject: [PATCH] Added DeprecationReporter and logged deprecated uses

---
 .../org/apache/rat/DeprecationReporter.java   | 84 +++++++++++++++++++
 .../src/main/java/org/apache/rat/Report.java  | 72 +++++++++++-----
 .../configuration/XMLConfigurationReader.java |  2 +-
 .../apache/rat/header/ArrayCharFilter.java    |  5 ++
 .../org/apache/rat/header/CharFilter.java     |  4 +
 .../rat/header/FilteringSequenceFactory.java  |  4 +
 .../org/apache/rat/header/HeaderBean.java     |  4 +
 .../org/apache/rat/header/HeaderMatcher.java  |  4 +
 .../apache/rat/header/LineNumberReader.java   |  4 +
 .../rat/license/SimpleLicenseFamily.java      |  8 +-
 .../java/org/apache/rat/utils/DefaultLog.java | 21 ++++-
 .../org/apache/rat/utils/ReportingSet.java    |  4 +-
 .../java/org/apache/rat/DefaultsTest.java     |  2 +-
 .../apache/rat/ReportConfigurationTest.java   | 63 ++++++--------
 .../test/java/org/apache/rat/ReportTest.java  | 25 +++++-
 .../java/org/apache/rat/ReporterTest.java     | 12 +--
 .../analysis/DefaultAnalyserFactoryTest.java  | 14 ++--
 .../rat/analysis/TikaProcessorTest.java       | 16 ++--
 .../analysis/license/AbstractLicenseTest.java |  2 +-
 .../rat/annotation/TestLicenseAppender.java   | 10 +--
 .../XMLConfigurationWriterTest.java           | 10 +--
 .../builders/TextBuilderTest.java             |  8 +-
 .../apache/rat/license/SimpleLicenseTest.java |  6 +-
 .../apache/rat/policy/DefaultPolicyTest.java  |  2 +-
 .../rat/report/ConfigurationReportTest.java   |  4 +-
 .../rat/report/xml/XmlReportFactoryTest.java  |  6 +-
 .../apache/rat/testhelpers/TestingLog.java    | 48 +++++++++++
 .../rat/walker/DirectoryWalkerTest.java       |  2 +-
 src/changes/changes.xml                       |  2 +-
 29 files changed, 334 insertions(+), 114 deletions(-)
 create mode 100644 apache-rat-core/src/main/java/org/apache/rat/DeprecationReporter.java
 create mode 100644 apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java

diff --git a/apache-rat-core/src/main/java/org/apache/rat/DeprecationReporter.java b/apache-rat-core/src/main/java/org/apache/rat/DeprecationReporter.java
new file mode 100644
index 000000000..b15c31905
--- /dev/null
+++ b/apache-rat-core/src/main/java/org/apache/rat/DeprecationReporter.java
@@ -0,0 +1,84 @@
+package org.apache.rat;
+
+import org.apache.commons.cli.Option;
+import org.apache.rat.utils.DefaultLog;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.function.Consumer;
+
+import static java.lang.String.format;
+
+/**
+ * Reporting methods for deprecated objects.
+ */
+public class DeprecationReporter {
+    /**
+     * Deprecated Command line option consumer.
+     */
+    public static Consumer<Option> LOG_DEPRECATED = o -> {
+        StringBuilder buff = new StringBuilder();
+        if (o.getOpt() != null) {
+            buff.append("-").append(o.getOpt());
+            if (o.getLongOpt() != null) {
+                buff.append(", --").append(o.getLongOpt());
+            }
+        } else {
+            buff.append("--").append(o.getLongOpt());
+        }
+        DefaultLog.getInstance().warn(format("Option [%s] used.  %s", buff, o.getDeprecated().toString()));
+    };
+
+    /**
+     * Log Deprecated class use.
+     * @param clazz the Deprecated class to log
+     */
+    public static void logDeprecated(Class<?> clazz) {
+        if (clazz.getAnnotation(Deprecated.class) != null) {
+            StringBuilder sb = new StringBuilder(format("Deprecated class used: %s ", clazz));
+            Info info = clazz.getAnnotation(Info.class);
+            if (info != null) {
+                if (info.forRemoval()) {
+                    sb.append("  Scheduled for removal");
+                    if (!info.since().isEmpty()) {
+                        sb.append( " since ").append(info.since());
+                    }
+                    sb.append(".");
+                } else if (!info.since().isEmpty()) {
+                    sb.append(" Deprecated since ").append(info.since()).append(".");
+                }
+                if (!info.use().isEmpty()) {
+                    sb.append(" Use ").append(info.use()).append(" instead.");
+                }
+            }
+            DefaultLog.getInstance().warn(sb.toString());
+        }
+    }
+
+    /**
+     * Annotation to provide deprecation information for Java8.
+     * TODO remove this when Java 8 no longer supported.
+     */
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface Info {
+        /**
+         * The common name for the component. If not specified the name of the field or class is used.
+         * @return the component name.
+         */
+        String since() default "";
+
+        /**
+         * The description of the component.
+         * @return the component description.
+         */
+        boolean forRemoval() default false;
+        /**
+         * The component type
+         * @return the component type.
+         */
+        String use() default "";
+    }
+}
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 992957c0e..8d5f52b09 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,7 +126,7 @@ public String desc() {
     /**
      * Adds license headers to files missing headers.
      */
-    private static final DeprecatedAttributes addAttributes = DeprecatedAttributes.builder().setForRemoval(true).setSince("1.17.0")
+    private static final DeprecatedAttributes addAttributes = DeprecatedAttributes.builder().setForRemoval(true).setSince("0.17.0")
                                     .setDescription("Use '-A' or --addLicense instead.").get();
     static final OptionGroup ADD = new OptionGroup()
             .addOption(Option.builder("a").hasArg(false)
@@ -148,7 +148,7 @@ public String desc() {
             .desc("Define the output file where to write a report to (default is System.out).")
             .converter(Converter.FILE).build();
 
-    static final DeprecatedAttributes dirAttributes = DeprecatedAttributes.builder().setForRemoval(true).setSince("1.17.0")
+    static final DeprecatedAttributes dirAttributes = DeprecatedAttributes.builder().setForRemoval(true).setSince("0.17.0")
             .setDescription("Use '--'").get();
     static final Option DIR = Option.builder().option("d").longOpt("dir").hasArg()
             .desc(format( "[%s] %s", dirAttributes, "Used to indicate end of list when using --exclude.")).argName("DirOrArchive")
@@ -262,6 +262,13 @@ public String desc() {
             .converter(s -> ReportConfiguration.Processing.valueOf(s.toUpperCase()))
             .build();
 
+
+    private static void logDeprecated(Option option) {
+        if (option.isDeprecated()) {
+            DeprecationReporter.LOG_DEPRECATED.accept(option);
+        }
+    }
+
     private static String asString(Object[] args) {
         return Arrays.stream(args).map(Object::toString).collect(Collectors.joining(", "));
     }
@@ -276,13 +283,13 @@ private static String asString(Object[] args) {
     public static void main(String[] args) throws Exception {
         ReportConfiguration configuration = parseCommands(args, Report::printUsage);
         if (configuration != null) {
-            configuration.validate(DefaultLog.INSTANCE::error);
+            configuration.validate(DefaultLog.getInstance()::error);
             new Reporter(configuration).output();
         }
     }
 
     /**
-     * Parses the standard options to create a ReportConfiguraton.
+     * Parses the standard options to create a ReportConfiguration.
      *
      * @param args    the arguments to parse
      * @param helpCmd the help command to run when necessary.
@@ -294,7 +301,7 @@ public static ReportConfiguration parseCommands(String[] args, Consumer<Options>
     }
 
     /**
-     * Parses the standard options to create a ReportConfiguraton.
+     * Parses the standard options to create a ReportConfiguration.
      *
      * @param args    the arguments to parse
      * @param helpCmd the help command to run when necessary.
@@ -305,23 +312,23 @@ public static ReportConfiguration parseCommands(String[] args, Consumer<Options>
     public static ReportConfiguration parseCommands(String[] args, Consumer<Options> helpCmd, boolean noArgs) throws IOException {
         Options opts = buildOptions();
         CommandLine cl;
-        Consumer<Option> logDeprecated = o -> DefaultLog.INSTANCE.warn( format("Deprecated option %s used.  %s", o.getOpt(), o.getDeprecated().toString()));
         try {
-            //DefaultParser.builder().setDeprecatedHandler()
-            cl = DefaultParser.builder().setDeprecatedHandler(logDeprecated).build().parse(opts, args);
+            cl = DefaultParser.builder().setDeprecatedHandler(DeprecationReporter.LOG_DEPRECATED).build().parse(opts, args);
         } catch (ParseException e) {
-            DefaultLog.INSTANCE.error(e.getMessage());
-            DefaultLog.INSTANCE.error("Please use the \"--help\" option to see a list of valid commands and options");
+            DefaultLog.getInstance().error(e.getMessage());
+            DefaultLog.getInstance().error("Please use the \"--help\" option to see a list of valid commands and options");
             System.exit(1);
             return null; // dummy return (won't be reached) to avoid Eclipse complaint about possible NPE
             // for "cl"
         }
 
         if (cl.hasOption(LOG_LEVEL)) {
+            logDeprecated(LOG_LEVEL);
+            DefaultLog log = (DefaultLog) DefaultLog.getInstance();
             try {
-                DefaultLog.INSTANCE.setLevel(cl.getParsedOptionValue(LOG_LEVEL));
+                log.setLevel(cl.getParsedOptionValue(LOG_LEVEL));
             } catch (ParseException e) {
-                logParseException(e, LOG_LEVEL, cl, DefaultLog.INSTANCE.getLevel());
+                logParseException(e, LOG_LEVEL, cl, log.getLevel());
             }
         }
         if (cl.hasOption(HELP)) {
@@ -342,15 +349,25 @@ public static ReportConfiguration parseCommands(String[] args, Consumer<Options>
     }
 
     private static void logParseException(ParseException e, Option opt, CommandLine cl, Object dflt) {
-        DefaultLog.INSTANCE.warn(format("Invalid %s specified: %s ", opt.getOpt(), cl.getOptionValue(opt)));
-        DefaultLog.INSTANCE.warn(format("%s set to: %s", opt.getOpt(), dflt));
+        DefaultLog.getInstance().warn(format("Invalid %s specified: %s ", opt.getOpt(), cl.getOptionValue(opt)));
+        DefaultLog.getInstance().warn(format("%s set to: %s", opt.getOpt(), dflt));
+        DefaultLog.getInstance().debug(e);
     }
 
     static ReportConfiguration createConfiguration(String baseDirectory, CommandLine cl) throws IOException {
-        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.getInstance());
+
+        if (cl.hasOption(DIR)) {
+            logDeprecated(DIR);
+        }
+
+        if (cl.hasOption(DRY_RUN)) {
+            logDeprecated(DRY_RUN);
+            configuration.setDryRun(cl.hasOption(DRY_RUN));
+        }
 
-        configuration.setDryRun(cl.hasOption(DRY_RUN));
         if (cl.hasOption(LIST_FAMILIES)) {
+            logDeprecated(LIST_FAMILIES);
             try {
                 configuration.listFamilies(cl.getParsedOptionValue(LIST_FAMILIES));
             } catch (ParseException e) {
@@ -359,6 +376,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
         }
 
         if (cl.hasOption(LIST_LICENSES)) {
+            logDeprecated(LIST_LICENSES);
             try {
                 configuration.listLicenses(cl.getParsedOptionValue(LIST_LICENSES));
             } catch (ParseException e) {
@@ -367,6 +385,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
         }
 
         if (cl.hasOption(ARCHIVE)) {
+            logDeprecated(ARCHIVE);
             try {
                 configuration.setArchiveProcessing(cl.getParsedOptionValue(ARCHIVE));
             } catch (ParseException e) {
@@ -375,6 +394,7 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
         }
 
         if (cl.hasOption(OUT)) {
+            logDeprecated(OUT);
             try {
                 configuration.setOut((File) cl.getParsedOptionValue(OUT));
             } catch (ParseException e) {
@@ -383,21 +403,29 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
         }
 
         if (cl.hasOption(SCAN_HIDDEN_DIRECTORIES)) {
+            logDeprecated(SCAN_HIDDEN_DIRECTORIES);
             configuration.setDirectoriesToIgnore(FalseFileFilter.FALSE);
         }
 
         if (ADD.getSelected() != null) {
+            // @TODO remove this block when Commons-cli version 1.7.1 or higher is used
+            Arrays.stream(cl.getOptions()).filter( o -> o.getOpt().equals("a")).forEach( o -> cl.hasOption(o.getOpt()));
+            if (cl.hasOption(FORCE)) logDeprecated(FORCE);
+            if (cl.hasOption(COPYRIGHT)) logDeprecated(COPYRIGHT);
+            // remove that block ---^
             configuration.setAddLicenseHeaders(cl.hasOption(FORCE) ? AddLicenseHeaders.FORCED : AddLicenseHeaders.TRUE);
             configuration.setCopyrightMessage(cl.getOptionValue(COPYRIGHT));
         }
 
         if (cl.hasOption(EXCLUDE_CLI)) {
+            logDeprecated(EXCLUDE_CLI);
             String[] excludes = cl.getOptionValues(EXCLUDE_CLI);
             if (excludes != null) {
                 final FilenameFilter filter = parseExclusions(Arrays.asList(excludes));
                 configuration.setFilesToIgnore(filter);
             }
         } else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
+            logDeprecated(EXCLUDE_FILE_CLI);
             String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
             if (excludeFileName != null) {
                 final FilenameFilter filter = parseExclusions(
@@ -407,13 +435,15 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
         }
 
         if (cl.hasOption(XML)) {
+            logDeprecated(XML);
             configuration.setStyleReport(false);
         } else {
             configuration.setStyleReport(true);
             if (cl.hasOption(STYLESHEET_CLI)) {
+                logDeprecated(STYLESHEET_CLI);
                 String[] style = cl.getOptionValues(STYLESHEET_CLI);
                 if (style.length != 1) {
-                    DefaultLog.INSTANCE.error("Please specify a single stylesheet");
+                    DefaultLog.getInstance().error("Please specify a single stylesheet");
                     System.exit(1);
                 }
 
@@ -428,14 +458,16 @@ static ReportConfiguration createConfiguration(String baseDirectory, CommandLine
 
         Defaults.Builder defaultBuilder = Defaults.builder();
         if (cl.hasOption(NO_DEFAULTS)) {
+            logDeprecated(NO_DEFAULTS);
             defaultBuilder.noDefault();
         }
         if (cl.hasOption(LICENSES)) {
+            logDeprecated(LICENSES);
             for (String fn : cl.getOptionValues(LICENSES)) {
                 defaultBuilder.add(fn);
             }
         }
-        Defaults defaults = defaultBuilder.build(DefaultLog.INSTANCE);
+        Defaults defaults = defaultBuilder.build(DefaultLog.getInstance());
         configuration.setFrom(defaults);
         if (baseDirectory != null) {
             configuration.setReportable(getDirectory(baseDirectory, configuration));
@@ -466,7 +498,7 @@ static FilenameFilter parseExclusions(List<String> excludes) {
             try {
                 orFilter.addFileFilter(new RegexFileFilter(exclusion));
             } catch (PatternSyntaxException e) {
-                DefaultLog.INSTANCE.info("Will skip given exclusion '" + exclude + "' due to " + e.getMessage());
+                DefaultLog.getInstance().info("Will skip given exclusion '" + exclude + "' due to " + e.getMessage());
             }
             orFilter.addFileFilter(new NameFileFilter(exclusion));
             if (exclude.contains("?") || exclude.contains("*")) {
@@ -474,7 +506,7 @@ static FilenameFilter parseExclusions(List<String> excludes) {
             }
         }
         if (ignoredLines > 0) {
-            DefaultLog.INSTANCE.info("Ignored " + ignoredLines + " lines in your exclusion files as comments or empty lines.");
+            DefaultLog.getInstance().info("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/configuration/XMLConfigurationReader.java b/apache-rat-core/src/main/java/org/apache/rat/configuration/XMLConfigurationReader.java
index 728f8587f..f19d09ad9 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
@@ -127,7 +127,7 @@ public void setLog(Log log) {
     }
 
     public Log getLog() {
-        return log == null ? DefaultLog.INSTANCE : log;
+        return log == null ? DefaultLog.getInstance() : log;
     }
 
     @Override
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 9b3ee888f..e27997080 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
@@ -17,7 +17,11 @@
  * under the License.                                           *
  */ 
 package org.apache.rat.header;
+
+import org.apache.rat.DeprecationReporter;
+
 @Deprecated // since 0.17
+@DeprecationReporter.Info(since = "0.17", forRemoval = true)
 class ArrayCharFilter implements CharFilter {
 
     private final char[] filtered;
@@ -25,6 +29,7 @@ class ArrayCharFilter implements CharFilter {
     
     protected ArrayCharFilter(final char[] filtered) {
         super();
+        DeprecationReporter.logDeprecated(this.getClass());
         this.filtered = filtered;
         length = filtered.length;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/CharFilter.java b/apache-rat-core/src/main/java/org/apache/rat/header/CharFilter.java
index 13f28d528..be80825f3 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/CharFilter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/CharFilter.java
@@ -17,7 +17,11 @@
  * under the License.                                           *
  */ 
 package org.apache.rat.header;
+
+import org.apache.rat.DeprecationReporter;
+
 @Deprecated // since 0.17
+@DeprecationReporter.Info(since = "0.17", forRemoval = true)
 interface CharFilter {
 
     /**
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java b/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java
index 2c852a570..2ff791862 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java
@@ -18,10 +18,13 @@
  */ 
 package org.apache.rat.header;
 
+import org.apache.rat.DeprecationReporter;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.nio.CharBuffer;
 @Deprecated // since 0.17
+@DeprecationReporter.Info(since = "0.17", forRemoval = true)
 class FilteringSequenceFactory {
     
     private static final int BUFFER_CAPACITY = 5000;
@@ -34,6 +37,7 @@ public FilteringSequenceFactory(final CharFilter filter) {
     }
     
     public FilteringSequenceFactory(final int capacity, final CharFilter filter) {
+        DeprecationReporter.logDeprecated(this.getClass());
         this.buffer = CharBuffer.allocate(capacity);
         this.filter = filter;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/HeaderBean.java b/apache-rat-core/src/main/java/org/apache/rat/header/HeaderBean.java
index bf979ee0f..30c07b78c 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/HeaderBean.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/HeaderBean.java
@@ -18,9 +18,12 @@
  */ 
 package org.apache.rat.header;
 
+import org.apache.rat.DeprecationReporter;
+
 import java.util.regex.Pattern;
 
 @Deprecated // since 0.17
+@DeprecationReporter.Info(since = "0.17", forRemoval = true)
 public class HeaderBean {
 
     private Pattern headerPattern;
@@ -32,6 +35,7 @@ public HeaderBean() {
     
     public HeaderBean(Pattern headerPattern, boolean match) {
         super();
+        DeprecationReporter.logDeprecated(this.getClass());
         this.headerPattern = headerPattern;
         this.match = match;
     }
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
index 4c887d238..89b71b0a2 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/HeaderMatcher.java
@@ -18,6 +18,8 @@
  */ 
 package org.apache.rat.header;
 
+import org.apache.rat.DeprecationReporter;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.util.regex.Matcher;
@@ -34,6 +36,7 @@
  *
  */
 @Deprecated // since 0.17
+@DeprecationReporter.Info(since = "0.17", forRemoval = true)
 public class HeaderMatcher {
 
     private final FilteringSequenceFactory factory;
@@ -46,6 +49,7 @@ public HeaderMatcher(final CharFilter filter, final int capacity) {
     }
     
     public HeaderMatcher(final CharFilter filter, final int capacity, final HeaderBean[] headers) {
+        DeprecationReporter.logDeprecated(this.getClass());
         factory = new FilteringSequenceFactory(capacity, filter);
         read = null;
         this.headers = headers;
diff --git a/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java b/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java
index 8465ec5a3..1aa3f113e 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java
@@ -18,6 +18,8 @@
  */ 
 package org.apache.rat.header;
 
+import org.apache.rat.DeprecationReporter;
+
 import java.io.IOException;
 import java.io.Reader;
 
@@ -30,12 +32,14 @@
  * thus providing upwards compatibility for RAT.
  */
 @Deprecated // since 0.17
+@DeprecationReporter.Info(since = "0.17", forRemoval = true)
 public class LineNumberReader {
 	private final Reader parent;
 	private boolean previousCharWasCR = false;
 	private int lineNumber = 0;
 
 	public LineNumberReader(Reader pReader) {
+		DeprecationReporter.logDeprecated(this.getClass());
 		parent = pReader;
 	}
 
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 3e6cd4cf4..49b358f17 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
@@ -18,15 +18,21 @@
  */
 package org.apache.rat.license;
 
+import org.apache.rat.DeprecationReporter;
+import org.apache.rat.utils.DefaultLog;
+
 /**
  * An implementation of the ILicenseFamily.
  */
 @Deprecated // remove in v1.0
+@DeprecationReporter.Info(since = "0.17", forRemoval = true, use = "ILicenseFamilyBuilder")
 public class SimpleLicenseFamily  {
     private String familyName;
     private String familyCategory;
 
-    public SimpleLicenseFamily() {}
+    public SimpleLicenseFamily() {
+        DeprecationReporter.logDeprecated(SimpleLicenseFamily.class);
+    }
 
     public void setFamilyName(String familyName) {
         this.familyName = familyName;
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 f421121d2..d6215a875 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
@@ -26,7 +26,24 @@ public class DefaultLog implements Log {
     /**
      * The instance of the default log.
      */
-    public static final DefaultLog INSTANCE = new DefaultLog();
+    private static Log INSTANCE = new DefaultLog();
+
+    /**
+     * Retrieves teh DefaultLog instance.
+     * @return the Default log instance.
+     */
+    public static Log getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Sets the default log instance.
+     * If not set an instance of DefaultLog will be returned
+     * @param instance a Log to use as the defult.
+     */
+    public static void setInstance(final Log instance) {
+        INSTANCE = instance == null ? new DefaultLog() : instance;
+    }
     
     private Level level;
 
@@ -60,4 +77,4 @@ public void log(Level level, String msg) {
                 break;
             }
     }
-}
\ No newline at end of file
+}
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 fa506a328..68c7cdb86 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
@@ -37,7 +37,7 @@ public class ReportingSet<T> implements SortedSet<T> {
     private final SortedSet<T> delegate;
     private Options duplicateOption = Options.IGNORE;
     private Log.Level duplicateLogLevel = Log.Level.WARN;
-    private Log log = DefaultLog.INSTANCE;
+    private Log log = DefaultLog.getInstance();
     private Function<T,String> duplicateFmt = (t) -> String.format("Duplicate %s (%s) detected %s", t.getClass(), t);
 
     public enum Options { OVERWRITE, IGNORE, FAIL }
@@ -283,4 +283,4 @@ public Object[] toArray() {
     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/DefaultsTest.java b/apache-rat-core/src/test/java/org/apache/rat/DefaultsTest.java
index fe7f31e51..0a1ee5085 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
@@ -39,7 +39,7 @@ public class DefaultsTest {
 
     @Test
     public void defaultConfigTest() {
-        Defaults defaults = Defaults.builder().build(DefaultLog.INSTANCE);
+        Defaults defaults = Defaults.builder().build(DefaultLog.getInstance());
 
         Set<ILicense> licenses = defaults.getLicenses(LicenseFilter.ALL);
 
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 27b3aeaf5..2af8e326e 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
@@ -56,9 +56,9 @@
 import org.apache.rat.license.ILicenseFamily;
 import org.apache.rat.license.LicenseSetFactory.LicenseFilter;
 import org.apache.rat.report.IReportable;
+import org.apache.rat.testhelpers.TestingLog;
 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.utils.ReportingSet.Options;
 import org.apache.rat.walker.NameBasedHiddenFileFilter;
@@ -69,11 +69,11 @@
 public class ReportConfigurationTest {
 
     private ReportConfiguration underTest;
-    private LoggingCapture log;
+    private TestingLog log;
 
     @BeforeEach
     public void setup() {
-        log = new LoggingCapture();
+        log = new TestingLog();
         underTest = new ReportConfiguration(log);
     }
 
@@ -191,7 +191,7 @@ public void filesToIgnoreTest() {
 
         assertThat(underTest.getFilesToIgnore()).isExactlyInstanceOf(FalseFileFilter.class);
 
-        underTest.setFrom(Defaults.builder().build(DefaultLog.INSTANCE));
+        underTest.setFrom(Defaults.builder().build(DefaultLog.getInstance()));
         assertThat(underTest.getFilesToIgnore()).isExactlyInstanceOf(FalseFileFilter.class);
 
         FilenameFilter filter = mock(FilenameFilter.class);
@@ -203,7 +203,7 @@ public void filesToIgnoreTest() {
     public void directoriesToIgnoreTest() {
         assertThat(underTest.getDirectoriesToIgnore()).isExactlyInstanceOf(NameBasedHiddenFileFilter.class);
 
-        underTest.setFrom(Defaults.builder().build(DefaultLog.INSTANCE));
+        underTest.setFrom(Defaults.builder().build(DefaultLog.getInstance()));
         assertThat(underTest.getDirectoriesToIgnore()).isExactlyInstanceOf(NameBasedHiddenFileFilter.class);
 
         underTest.setDirectoriesToIgnore(DirectoryFileFilter.DIRECTORY);
@@ -218,7 +218,7 @@ public void directoriesToIgnoreTest() {
     public void archiveProcessingTest() {
         assertThat(underTest.getArchiveProcessing()).isEqualTo(ReportConfiguration.Processing.NOTIFICATION);
 
-        underTest.setFrom(Defaults.builder().build(DefaultLog.INSTANCE));
+        underTest.setFrom(Defaults.builder().build(DefaultLog.getInstance()));
         assertThat(underTest.getArchiveProcessing()).isEqualTo(ReportConfiguration.Processing.NOTIFICATION);
 
         underTest.setArchiveProcessing(ReportConfiguration.Processing.ABSENCE);
@@ -357,7 +357,7 @@ public void testFlags() {
     public void testValidate() {
         final StringBuilder sb = new StringBuilder();
         try {
-            underTest.validate(s -> sb.append(s));
+            underTest.validate(sb::append);
             fail("should have thrown ConfigurationException");
         } catch (ConfigurationException e) {
             assertThat(e.getMessage()).isEqualTo("Reportable may not be null");
@@ -366,7 +366,7 @@ public void testValidate() {
 
         underTest.setReportable(mock(IReportable.class));
         try {
-            underTest.validate(s -> sb.append(s));
+            underTest.validate(sb::append);
             fail("should have thrown ConfigurationException");
         } catch (ConfigurationException e) {
             assertThat(e.getMessage()).isEqualTo("You must specify at least one license");
@@ -375,7 +375,7 @@ public void testValidate() {
 
         underTest.addLicense(testingLicense("valid", "Validation testing license"));
         try {
-            underTest.validate(s -> sb.append(s));
+            underTest.validate(sb::append);
             fail("should have thrown ConfigurationException");
         } catch (ConfigurationException e) {
             assertThat(e.getMessage()).isEqualTo("Stylesheet must be specified if report styling is selected");
@@ -384,12 +384,12 @@ public void testValidate() {
 
         underTest.setStyleSheet(()->mock(InputStream.class));
         underTest.setStyleReport(false);
-        underTest.validate(s -> sb.append(s));
+        underTest.validate(sb::append);
         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));
+        underTest.validate(sb2::append);
         assertThat(sb2.length()).isEqualTo(0);
     }
     
@@ -414,20 +414,20 @@ public void testSetOut() throws IOException {
     public void logFamilyCollisionTest() {
         // setup
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name"));
-        assertFalse(log.captured.toString().contains("CAT"));
+        assertFalse(log.getCaptured().contains("CAT"));
        
         // verify default collision logs WARNING
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-        assertTrue(log.captured.toString().contains("WARN"), ()->"default value not WARN");
-        assertTrue(log.captured.toString().contains("CAT"), ()->"'CAT' not found");
+        assertTrue(log.getCaptured().contains("WARN"), "default value not WARN");
+        assertTrue(log.getCaptured().contains("CAT"), "'CAT' not found");
         
         // 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);
+        assertTrue(log.getCaptured().contains("CAT"), "'CAT' not found");
+        assertTrue(log.getCaptured().contains(l.name()), "logging not set to "+l);
         }
 
     }
@@ -435,18 +435,18 @@ public void logFamilyCollisionTest() {
     @Test
     public void familyDuplicateOptionsTest() {
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name"));
-        assertFalse(log.captured.toString().contains("CAT"));
+        assertFalse(log.getCaptured().toString().contains("CAT"));
         
         // verify default second setting ignores change
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-        assertTrue(log.captured.toString().contains("CAT"));
+        assertTrue(log.getCaptured().toString().contains("CAT"));
         assertEquals("name", underTest.getLicenseFamilies(LicenseFilter.ALL).stream()
                 .filter(s -> s.getFamilyCategory().equals("CAT  ")).map(s -> s.getFamilyName()).findFirst().get());
         
         underTest.familyDuplicateOption(Options.OVERWRITE);
         // verify second setting ignores change
         underTest.addFamily(ILicenseFamily.builder().setLicenseFamilyCategory("CAT").setLicenseFamilyName("name2"));
-        assertTrue(log.captured.toString().contains("CAT"));
+        assertTrue(log.getCaptured().toString().contains("CAT"));
         assertEquals("name2", underTest.getLicenseFamilies(LicenseFilter.ALL).stream()
                 .filter(s -> s.getFamilyCategory().equals("CAT  ")).map(s -> s.getFamilyName()).findFirst().get());
 
@@ -474,7 +474,7 @@ public void logLicenseCollisionTest() {
         underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setFamily(family.getFamilyCategory())
                 .setMatcher( matcher ).setLicenseFamilies(underTest.getLicenseFamilies(LicenseFilter.ALL))
                 .build());
-        assertTrue(log.captured.toString().contains("WARN"));
+        assertTrue(log.getCaptured().contains("WARN"));
         
         log.clear();
         underTest.logLicenseCollisions(Level.ERROR);
@@ -483,7 +483,7 @@ public void logLicenseCollisionTest() {
         underTest.addLicense(ILicense.builder().setId("ID").setName("license name2").setFamily(family.getFamilyCategory())
                 .setMatcher( matcher ).setLicenseFamilies(underTest.getLicenseFamilies(LicenseFilter.ALL))
                 .build());
-        assertTrue(log.captured.toString().contains("ERROR"));
+        assertTrue(log.getCaptured().contains("ERROR"));
 
     }
     
@@ -502,7 +502,7 @@ public void licenseDuplicateOptionsTest() {
         
         // verify default second setting ignores change
         underTest.addLicense(makeLicense.apply("license name2"));
-        assertTrue(log.captured.toString().contains("WARN"));
+        assertTrue(log.getCaptured().toString().contains("WARN"));
         assertEquals("license name",
                 underTest.getLicenses(LicenseFilter.ALL).stream().map(ILicense::getName).findFirst().get());
         
@@ -576,30 +576,15 @@ public static void validateDefault(ReportConfiguration config) {
         assertThat(config.getCopyrightMessage()).isNull();
         assertThat(config.getFilesToIgnore()).isExactlyInstanceOf(FalseFileFilter.class);
         assertThat(config.isStyleReport()).isTrue();
-        assertThat(config.getStyleSheet()).isNotNull().withFailMessage("Stylesheet should not be null");
-        assertThat(config.getDirectoriesToIgnore()).isNotNull().withFailMessage("Directory filter should not be null");
+        assertThat(config.getStyleSheet()).withFailMessage("Stylesheet should not be null").isNotNull();
+        assertThat(config.getDirectoriesToIgnore()).withFailMessage("Directory filter should not be null").isNotNull();
         assertThat(config.getDirectoriesToIgnore()).isExactlyInstanceOf(NameBasedHiddenFileFilter.class);
         
         validateDefaultApprovedLicenses(config);
         validateDefaultLicenseFamilies(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;
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 8f42fa04c..c0aa90b7a 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,6 +18,7 @@
  */
 package org.apache.rat;
 
+import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -38,11 +39,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.DeprecatedAttributes;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
@@ -51,6 +54,7 @@
 import org.apache.rat.license.LicenseSetFactory;
 import org.apache.rat.report.xml.writer.IXmlWriter;
 import org.apache.rat.report.xml.writer.impl.base.XmlWriter;
+import org.apache.rat.testhelpers.TestingLog;
 import org.apache.rat.testhelpers.TextUtils;
 import org.apache.rat.utils.DefaultLog;
 import org.apache.rat.utils.Log;
@@ -160,6 +164,7 @@ static Stream<Arguments> optionsProvider() {
         List<Arguments> lst = new ArrayList<>();
         String[] args;
         Predicate<ReportConfiguration> test;
+
 //        Report.ARCHIVE
         for (ReportConfiguration.Processing processing : ReportConfiguration.Processing.values()) {
             args = new String[]{"--" + Report.ARCHIVE.getLongOpt(), processing.name().toLowerCase()};
@@ -176,6 +181,7 @@ static Stream<Arguments> optionsProvider() {
         lst.add(Arguments.of(args, test));
 
 //        Report.DIR;
+
 //        Report.DRY_RUN;
         args = new String[]{"--" + Report.DRY_RUN.getLongOpt()};
         test = ReportConfiguration::isDryRun;
@@ -254,9 +260,10 @@ static Stream<Arguments> optionsProvider() {
         }
 
 //        Report LOG_LEVEL
+        DefaultLog log = (DefaultLog) DefaultLog.getInstance();
         for (Log.Level l : Log.Level.values()) {
             args = new String[]{"--" + Report.LOG_LEVEL.getLongOpt(), l.name().toLowerCase()};
-            test = c -> DefaultLog.INSTANCE.getLevel() == l;
+            test = c -> log.getLevel() == l;
             lst.add(Arguments.of(args, test));
         }
 //        Report.NO_DEFAULTS
@@ -305,4 +312,20 @@ static Stream<Arguments> optionsProvider() {
         lst.add(Arguments.of(args, test.negate()));
         return lst.stream();
     }
+
+    @Test
+    public void testDeprecatedUseLogged() throws IOException {
+        TestingLog log = new TestingLog();
+        try {
+            DefaultLog.setInstance(log);
+            String[] args = {longOpt(Report.DIR), "foo", "-a"};
+            ReportConfiguration config = Report.parseCommands(args, (o) -> {
+            }, true);
+
+        } finally {
+            DefaultLog.setInstance(null);
+        }
+        log.assertContains("WARN: Option [-d, --dir] used.  Deprecated for removal since 0.17.0: Use '--'");
+        log.assertContains("WARN: Option [-a] used.  Deprecated for removal since 0.17.0: Use '-A or --addLicense'");
+    }
 }
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 599b8b066..38537eedf 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
@@ -209,11 +209,11 @@ private static void checkNode(Document doc, XPath xpath, String resource, Licens
 
     @Test
     public void xmlReportTest() throws Exception {
-        Defaults defaults = Defaults.builder().build(DefaultLog.INSTANCE);
+        Defaults defaults = Defaults.builder().build(DefaultLog.getInstance());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.getInstance());
         configuration.setStyleReport(false);
         configuration.setFrom(defaults);
         configuration.setDirectoriesToIgnore(HiddenFileFilter.HIDDEN);
@@ -273,11 +273,11 @@ private String licenseOut(String family, String id, String name) {
 
     @Test
     public void plainReportTest() throws Exception {
-        Defaults defaults = Defaults.builder().build(DefaultLog.INSTANCE);
+        Defaults defaults = Defaults.builder().build(DefaultLog.getInstance());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.getInstance());
         configuration.setFrom(defaults);
         configuration.setDirectoriesToIgnore(HiddenFileFilter.HIDDEN);
         configuration.setReportable(new DirectoryWalker(configuration, new FileDocument(new File(elementsPath))));
@@ -331,11 +331,11 @@ public void plainReportTest() throws Exception {
 
     @Test
     public void UnapprovedLicensesReportTest() throws Exception {
-        Defaults defaults = Defaults.builder().build(DefaultLog.INSTANCE);
+        Defaults defaults = Defaults.builder().build(DefaultLog.getInstance());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.getInstance());
         configuration.setFrom(defaults);
         configuration.setDirectoriesToIgnore(HiddenFileFilter.HIDDEN);
         configuration.setReportable(new DirectoryWalker(configuration, new FileDocument(new File(elementsPath))));
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java
index 3070b312e..fa6c1e824 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/DefaultAnalyserFactoryTest.java
@@ -47,7 +47,7 @@ public class DefaultAnalyserFactoryTest {
     public void setUp() throws Exception {
         out = new StringWriter();
         reporter = new SimpleXmlClaimReporter(new XmlWriter(out));
-        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
+        ReportConfiguration config = new ReportConfiguration(DefaultLog.getInstance());
         config.addLicense(UnknownLicense.INSTANCE);
         analyser = DefaultAnalyserFactory.createDefaultAnalyser(config);
     }
@@ -106,8 +106,8 @@ public void binaryTypeAnalyser() throws Exception {
     public void archiveTypeAnalyserTest() throws Exception {
         final Document document = new FileDocument(
                 Resources.getResourceFile("/elements/dummy.jar"));
-        Defaults defaults = Defaults.builder().build(DefaultLog.INSTANCE);
-        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
+        Defaults defaults = Defaults.builder().build(DefaultLog.getInstance());
+        ReportConfiguration config = new ReportConfiguration(DefaultLog.getInstance());
         config.setFrom(defaults);
         config.setFilesToIgnore(FalseFileFilter.FALSE);
         analyser = DefaultAnalyserFactory.createDefaultAnalyser(config);
@@ -120,8 +120,8 @@ public void archiveTypeAnalyserTest() throws Exception {
     public void archivesAbsenceTest() throws Exception {
         final Document document = new FileDocument(
                 Resources.getResourceFile("/elements/dummy.jar"));
-        Defaults defaults = Defaults.builder().build(DefaultLog.INSTANCE);
-        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
+        Defaults defaults = Defaults.builder().build(DefaultLog.getInstance());
+        ReportConfiguration config = new ReportConfiguration(DefaultLog.getInstance());
         config.setFrom(defaults);
         config.setFilesToIgnore(FalseFileFilter.FALSE);
         config.setArchiveProcessing(ReportConfiguration.Processing.ABSENCE);
@@ -138,8 +138,8 @@ public void archivesAbsenceTest() throws Exception {
     public void archivesPresenceTest() throws Exception {
         final Document document = new FileDocument(
                 Resources.getResourceFile("/elements/dummy.jar"));
-        Defaults defaults = Defaults.builder().build(DefaultLog.INSTANCE);
-        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
+        Defaults defaults = Defaults.builder().build(DefaultLog.getInstance());
+        ReportConfiguration config = new ReportConfiguration(DefaultLog.getInstance());
         config.setFrom(defaults);
         config.setFilesToIgnore(FalseFileFilter.FALSE);
         config.setArchiveProcessing(ReportConfiguration.Processing.PRESENCE);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/analysis/TikaProcessorTest.java b/apache-rat-core/src/test/java/org/apache/rat/analysis/TikaProcessorTest.java
index ad7607044..20f211345 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/analysis/TikaProcessorTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/analysis/TikaProcessorTest.java
@@ -57,27 +57,27 @@ public int read() throws IOException {
                 throw new MalformedInputException(0);
             }
         });
-        assertThrows(RatDocumentAnalysisException.class, () -> TikaProcessor.process(DefaultLog.INSTANCE, doc));
+        assertThrows(RatDocumentAnalysisException.class, () -> TikaProcessor.process(DefaultLog.getInstance(), doc));
     }
 
     @Test
     public void UTF16_input() throws Exception {
         Document doc = getDocument(Resources.getResourceStream("/binaries/UTF16_with_signature.xml"));
-        TikaProcessor.process(DefaultLog.INSTANCE, doc);
+        TikaProcessor.process(DefaultLog.getInstance(), doc);
         assertEquals(Document.Type.STANDARD, doc.getMetaData().getDocumentType());
     }
 
     @Test
     public void UTF8_input() throws Exception {
         FileDocument doc = new FileDocument(Resources.getResourceFile("/binaries/UTF8_with_signature.xml"));
-        TikaProcessor.process(DefaultLog.INSTANCE, doc);
+        TikaProcessor.process(DefaultLog.getInstance(), doc);
         assertEquals(Document.Type.STANDARD, doc.getMetaData().getDocumentType());
     }
 
     @Test
     public void missNamedBinaryTest() throws Exception {
         FileDocument doc = new FileDocument(Resources.getResourceFile("/binaries/Image-png.not"));
-        TikaProcessor.process(DefaultLog.INSTANCE, doc);
+        TikaProcessor.process(DefaultLog.getInstance(), doc);
         assertEquals(Document.Type.BINARY, doc.getMetaData().getDocumentType());
     }
 
@@ -85,21 +85,21 @@ public void missNamedBinaryTest() throws Exception {
     @Test
     public void plainTextTest() throws Exception {
         FileDocument doc = new FileDocument(Resources.getResourceFile("/elements/Text.txt"));
-        TikaProcessor.process(DefaultLog.INSTANCE, doc);
+        TikaProcessor.process(DefaultLog.getInstance(), doc);
         assertEquals(Document.Type.STANDARD, doc.getMetaData().getDocumentType());
     }
 
     @Test
     public void emptyFileTest() throws Exception {
         FileDocument doc = new FileDocument(Resources.getResourceFile("/elements/sub/Empty.txt"));
-        TikaProcessor.process(DefaultLog.INSTANCE, doc);
+        TikaProcessor.process(DefaultLog.getInstance(), doc);
         assertEquals(Document.Type.STANDARD, doc.getMetaData().getDocumentType());
     }
 
     @Test
     public void javaFileWithChineseCharacters_RAT301() throws Exception {
         FileDocument doc = new FileDocument(Resources.getResourceFile("/tikaFiles/standard/ChineseCommentsJava.java"));
-        TikaProcessor.process(DefaultLog.INSTANCE, doc);
+        TikaProcessor.process(DefaultLog.getInstance(), doc);
         assertEquals(Document.Type.STANDARD, doc.getMetaData().getDocumentType());
     }
 
@@ -113,7 +113,7 @@ public void testTikaFiles() throws RatDocumentAnalysisException, IOException {
             if (typeDir.isDirectory()) {
                 for (File file : Objects.requireNonNull(typeDir.listFiles())) {
                     Document doc = new FileDocument(file);
-                    String mimeType = TikaProcessor.process(DefaultLog.INSTANCE, doc);
+                    String mimeType = TikaProcessor.process(DefaultLog.getInstance(), doc);
                     statistic.incCounter(doc.getMetaData().getDocumentType(), 1);
                     assertEquals( docType, doc.getMetaData().getDocumentType(), () -> "Wrong type for "+file.toString());
                     unseenMime.remove(mimeType);
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 0e0e1a807..4f55de93e 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
@@ -56,7 +56,7 @@ protected AbstractLicenseTest() {
     @BeforeEach
     public void setup() {
         data = new MetaData();
-        defaults = Defaults.builder().build(DefaultLog.INSTANCE);
+        defaults = Defaults.builder().build(DefaultLog.getInstance());
     }
 
     protected ILicense extractCategory(String id) {
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 a6b6040b9..dcc11a188 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
@@ -72,7 +72,7 @@ private void commonTestTemplate(String relativeName, FileCreator creator, NewFil
 
         createTestFile(name, creator);
 
-        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
+        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.getInstance());
         appender.append(new File(name));
 
         try (BufferedReader r = new BufferedReader(new FileReader(name + ".new"))) {
@@ -106,7 +106,7 @@ public void createFile(Writer writer) throws IOException {
 
         File file = new File(filename);
         file.deleteOnExit();
-        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
+        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.getInstance());
         appender.append(file);
 
         File newFile = new File(filename + ".new");
@@ -470,7 +470,7 @@ public void createFile(Writer writer) throws IOException {
     public void fileWithBOM() throws IOException {
         File f = Resources.getResourceFile("violations/FilterTest.cs");
 
-        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
+        ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.getInstance());
         appender.append(f);
 
         try (BufferedReader r = new BufferedReader(new FileReader(f.getAbsolutePath() + ".new"))) {
@@ -651,7 +651,7 @@ public void testForced() throws IOException {
         try {
             createTestFile(name, phpCreator);
 
-            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
+            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.getInstance());
             appender.setForce(true);
             appender.append(new File(name));
 
@@ -684,7 +684,7 @@ public void testExecutePermsPreserved() throws IOException {
             createTestFile(name, phpCreator);
             assertTrue(new File(name).setExecutable(true), "Unable to set executable flag");
 
-            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.INSTANCE);
+            ApacheV2LicenseAppender appender = new ApacheV2LicenseAppender(DefaultLog.getInstance());
             appender.setForce(true);
             appender.append(new File(name));
 
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationWriterTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationWriterTest.java
index 86cad7650..dc89071ee 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationWriterTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/XMLConfigurationWriterTest.java
@@ -46,8 +46,8 @@ public class XMLConfigurationWriterTest {
 
     @Test
     public void roundTrip() throws RatException {
-        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
-        config.setFrom(Defaults.builder().build(DefaultLog.INSTANCE));
+        ReportConfiguration config = new ReportConfiguration(DefaultLog.getInstance());
+        config.setFrom(Defaults.builder().build(DefaultLog.getInstance()));
         config.listFamilies(LicenseFilter.ALL);
         config.listLicenses(LicenseFilter.ALL);
         XMLConfigurationWriter underTest = new XMLConfigurationWriter(config);
@@ -63,8 +63,8 @@ public void roundTrip() throws RatException {
     
     @Test
     public void testGen() throws Exception {
-        ReportConfiguration config = new ReportConfiguration(DefaultLog.INSTANCE);
-        config.setFrom(Defaults.builder().build(DefaultLog.INSTANCE));
+        ReportConfiguration config = new ReportConfiguration(DefaultLog.getInstance());
+        config.setFrom(Defaults.builder().build(DefaultLog.getInstance()));
         config.listFamilies(LicenseFilter.ALL);
         config.listLicenses(LicenseFilter.ALL);
         XMLConfigurationWriter underTest = new XMLConfigurationWriter(config);
@@ -86,4 +86,4 @@ public void testGen() throws Exception {
         assertEquals(0, any.getChildNodes().getLength());
         assertNotNull(any.getAttributes().getNamedItem("resource"), () -> "'resource' attribute missing");
     }
-}
\ No newline at end of file
+}
diff --git a/apache-rat-core/src/test/java/org/apache/rat/configuration/builders/TextBuilderTest.java b/apache-rat-core/src/test/java/org/apache/rat/configuration/builders/TextBuilderTest.java
index fa22f55f0..a82a3c77a 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/configuration/builders/TextBuilderTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/configuration/builders/TextBuilderTest.java
@@ -54,8 +54,8 @@ public void fullTextMatcherTest() throws NoSuchMethodException, SecurityExceptio
         attributes.put("id", "IDValue");
 
         Description description = DescriptionBuilder.buildMap(underTest.builtClass());
-        description.setChildren(DefaultLog.INSTANCE, underTest, attributes);
-        description.setChild(DefaultLog.INSTANCE, underTest, "simpleText", "example text");
+        description.setChildren(DefaultLog.getInstance(), underTest, attributes);
+        description.setChild(DefaultLog.getInstance(), underTest, "simpleText", "example text");
 
         SimpleTextMatcher m = underTest.build();
         assertEquals("example text", m.getSimpleText());
@@ -84,8 +84,8 @@ public void simpleTextMatcherTest() throws NoSuchMethodException, SecurityExcept
         TextBuilder underTest = new TextBuilder();
 
         Description description = DescriptionBuilder.buildMap(underTest.builtClass());
-        description.setChildren(DefaultLog.INSTANCE, underTest, attributes);
-        description.setChild(DefaultLog.INSTANCE, underTest, "simpleText", "exampletext");
+        description.setChildren(DefaultLog.getInstance(), underTest, attributes);
+        description.setChild(DefaultLog.getInstance(), underTest, "simpleText", "exampletext");
 
         SimpleTextMatcher m = underTest.build();
         assertEquals("exampletext", m.getSimpleText());
diff --git a/apache-rat-core/src/test/java/org/apache/rat/license/SimpleLicenseTest.java b/apache-rat-core/src/test/java/org/apache/rat/license/SimpleLicenseTest.java
index b100b444f..a462849a9 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/license/SimpleLicenseTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/license/SimpleLicenseTest.java
@@ -48,11 +48,11 @@ public void descriptionTest() throws IllegalAccessException, IllegalArgumentExce
         Map<String, Description> children = underTest.getChildren();
         assertEquals(6, children.size());
         assertTrue(children.containsKey("id"));
-        assertEquals("TestingId", children.get("id").getParamValue(DefaultLog.INSTANCE, lic));
+        assertEquals("TestingId", children.get("id").getParamValue(DefaultLog.getInstance(), lic));
         assertTrue(children.containsKey("name"));
-        assertEquals("My testing license", children.get("name").getParamValue(DefaultLog.INSTANCE, lic));
+        assertEquals("My testing license", children.get("name").getParamValue(DefaultLog.getInstance(), lic));
         assertTrue(children.containsKey("note"));
-        assertEquals("These are the notes", children.get("note").getParamValue(DefaultLog.INSTANCE, lic));
+        assertEquals("These are the notes", children.get("note").getParamValue(DefaultLog.getInstance(), lic));
 
         assertTrue(children.containsKey("matcher"));
         assertEquals(ComponentType.PARAMETER, children.get("matcher").getType());
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 250bf5159..ee11d203d 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
@@ -60,7 +60,7 @@ public class DefaultPolicyTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        defaults = Defaults.builder().build(DefaultLog.INSTANCE);
+        defaults = Defaults.builder().build(DefaultLog.getInstance());
         policy = new DefaultPolicy(defaults.getLicenseFamilies(LicenseFilter.APPROVED));
         document = new TestingDocument("subject");
     }
diff --git a/apache-rat-core/src/test/java/org/apache/rat/report/ConfigurationReportTest.java b/apache-rat-core/src/test/java/org/apache/rat/report/ConfigurationReportTest.java
index 9759c4f20..f9b4e8c9e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/report/ConfigurationReportTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/report/ConfigurationReportTest.java
@@ -52,10 +52,10 @@ public class ConfigurationReportTest {
 
     @BeforeEach
     public void setup() {
-        reportConfiguration = new ReportConfiguration(DefaultLog.INSTANCE);
+        reportConfiguration = new ReportConfiguration(DefaultLog.getInstance());
         reportConfiguration.listFamilies(LicenseFilter.ALL);
         reportConfiguration.listLicenses(LicenseFilter.ALL);
-        reportConfiguration.setFrom(Defaults.builder().build(DefaultLog.INSTANCE));
+        reportConfiguration.setFrom(Defaults.builder().build(DefaultLog.getInstance()));
 
         sw = new StringWriter();
         writer = new XmlWriter(sw);
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 28604993d..610c7db15 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
@@ -72,9 +72,9 @@ private void report(DirectoryWalker directory, RatReport report) throws Exceptio
     @Test
     public void standardReport() throws Exception {
         final String elementsPath = Resources.getResourceDirectory("elements/Source.java");
-        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.getInstance());
         final TestingLicense testingLicense = new TestingLicense(new TestingMatcher(true), family);
-        configuration.setFrom(Defaults.builder().build(DefaultLog.INSTANCE));
+        configuration.setFrom(Defaults.builder().build(DefaultLog.getInstance()));
         configuration.setDirectoriesToIgnore(HiddenFileFilter.HIDDEN);
         DirectoryWalker directory = new DirectoryWalker(configuration, new FileDocument(new File(elementsPath)));
         final ClaimStatistic statistic = new ClaimStatistic();
@@ -104,7 +104,7 @@ public void testNoLicense() throws Exception {
         when(mockLicense.getLicenseFamily()).thenReturn(family);
 
         final ClaimStatistic statistic = new ClaimStatistic();
-        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.INSTANCE);
+        final ReportConfiguration configuration = new ReportConfiguration(DefaultLog.getInstance());
         // configuration.addLicense(mockLicense);
         try {
             XmlReportFactory.createStandardReport(writer, statistic, configuration);
diff --git a/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java
new file mode 100644
index 000000000..aad7010d5
--- /dev/null
+++ b/apache-rat-core/src/test/java/org/apache/rat/testhelpers/TestingLog.java
@@ -0,0 +1,48 @@
+package org.apache.rat.testhelpers;
+
+import org.apache.rat.utils.Log;
+
+/**
+ * Log that captures output for later review.
+ */
+public class TestingLog implements Log {
+
+    private StringBuilder captured = new StringBuilder();
+
+    /**
+     * Clears the captured buffer
+     */
+    public void clear() {
+        captured = new StringBuilder();
+    }
+
+    /**
+     * Gets the captured log entries.
+     * @return the log entries
+     */
+    public String getCaptured() {
+        return captured.toString();
+    }
+
+    public void assertContains(String expected) {
+        TextUtils.assertContains("WARN: Option [-d, --dir] used.  Deprecated for removal since 0.17.0: Use '--'", captured.toString());
+    }
+
+    public void assertNotContains(String expected) {
+        TextUtils.assertContains("WARN: Option [-d, --dir] used.  Deprecated for removal since 0.17.0: Use '--'", captured.toString());
+    }
+
+    public void assertContainsPattern(String pattern) {
+        TextUtils.assertPatternInTarget(pattern, captured.toString());
+    }
+
+    public void assertNotContainsPattern(String pattern) {
+        TextUtils.assertPatternNotInTarget(pattern, captured.toString());
+    }
+
+    @Override
+    public void log(Level level, String msg) {
+        captured.append(String.format("%s: %s%n", level, msg));
+    }
+
+}
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 5c946e7f3..4c7f2a845 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
@@ -54,7 +54,7 @@ private static void fileWriter(File dir, String name, String contents) throws IO
 
     @BeforeEach
     public void beforeEach() {
-        reportConfiguration = new ReportConfiguration(DefaultLog.INSTANCE);
+        reportConfiguration = new ReportConfiguration(DefaultLog.getInstance());
     }
 
     @BeforeAll
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 086ce824d..fed612060 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -72,7 +72,7 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
     </release>
     -->
     <release version="0.17-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
-      <action issue="RAT-256" type="fix" dev="claudenw">
+      <action issue="RAT-265" type="fix" dev="claudenw">
         Fixed the filter compilation so that illegal regex do not cause other filters to be ignored.
         Updated the logging to only log a warning when at least one filter was skipped.
       </action>