diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..bf0d39a
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,24 @@
+name: Java CI with Maven
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8, 11 ]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+
+      - run: ./mvnw --batch-mode --update-snapshots package -DskipTests
+      - run: ./mvnw --batch-mode --update-snapshots verify
\ No newline at end of file
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..c1dd12f
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..8c79a83
--- /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.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/api/pom.xml b/api/pom.xml
index 1e21e54..76c79d1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -14,13 +14,19 @@
    <parent>
       <groupId>org.ocpsoft.common</groupId>
       <artifactId>common-parent</artifactId>
-      <version>1.0.6-SNAPSHOT</version>
-      <relativePath>../</relativePath>
+      <version>1.0.7-SNAPSHOT</version>
    </parent>
-   
+
    <artifactId>common-api</artifactId>
    
    <name>OCPsoft Common API</name>
    <description>Common API and Utilities</description>
 
+   <dependencies>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+      </dependency>
+   </dependencies>
+
 </project>
diff --git a/api/src/main/java/org/ocpsoft/common/pattern/WeightedComparator.java b/api/src/main/java/org/ocpsoft/common/pattern/WeightedComparator.java
index 24e4da4..77d3041 100644
--- a/api/src/main/java/org/ocpsoft/common/pattern/WeightedComparator.java
+++ b/api/src/main/java/org/ocpsoft/common/pattern/WeightedComparator.java
@@ -33,7 +33,7 @@ public int compare(final Weighted left, final Weighted right)
       {
          return 0;
       }
-      return ((Integer) left.priority()).compareTo(right.priority());
+      return Integer.compare(left.priority(), right.priority());
    }
 
 }
diff --git a/api/src/main/java/org/ocpsoft/common/services/ServiceLoader.java b/api/src/main/java/org/ocpsoft/common/services/ServiceLoader.java
index 4ef2396..48389b6 100644
--- a/api/src/main/java/org/ocpsoft/common/services/ServiceLoader.java
+++ b/api/src/main/java/org/ocpsoft/common/services/ServiceLoader.java
@@ -22,8 +22,10 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -33,17 +35,16 @@
 import org.ocpsoft.common.spi.ServiceEnricher;
 import org.ocpsoft.common.spi.ServiceLocator;
 
-
 /**
- * This class handles looking up service providers on the class path. It implements the <a
- * href="http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#Service%20Provider" >Service Provider section
- * of the JAR File Specification</a>.
+ * This class handles looking up service providers on the class path. It implements the
+ * <a href="http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#Service%20Provider" >Service Provider
+ * section of the JAR File Specification</a>.
  * 
  * The Service Provider programmatic lookup was not specified prior to Java 6 so this interface allows use of the
  * specification prior to Java 6.
  * 
- * The API is copied from <a href="http://java.sun.com/javase/6/docs/api/java/util/ServiceLoader.html"
- * >java.util.ServiceLoader</a>
+ * The API is copied from
+ * <a href="http://java.sun.com/javase/6/docs/api/java/util/ServiceLoader.html" >java.util.ServiceLoader</a>
  * 
  * @author Pete Muir
  * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
@@ -105,11 +106,10 @@ public static <S> ServiceLoader<S> loadTypesafe(final Class<S> service)
     */
    public static <S> ServiceLoader<S> load(final Class<S> service, ClassLoader loader)
    {
-      if (loader == null)
-      {
+      if (loader == null) {
          loader = service.getClassLoader();
       }
-      return new ServiceLoader<S>(service, loader);
+      return new ServiceLoader<>(service, loader);
    }
 
    private final String serviceFile;
@@ -139,11 +139,10 @@ private ServiceLoader(final Class<S> service, final ClassLoader loader)
     */
    public void reload()
    {
-      providers = new HashSet<S>();
-      loadedImplementations = new HashSet<Class<?>>();
+      providers = new HashSet<>();
+      loadedImplementations = new HashSet<>();
 
-      for (URL serviceFile : loadServiceFiles())
-      {
+      for (URL serviceFile : loadServiceFiles()) {
          loadServiceFile(serviceFile);
       }
 
@@ -151,13 +150,11 @@ public void reload()
          locatorLoader = java.util.ServiceLoader
                   .load(ServiceLocator.class);
 
-      for (ServiceLocator locator : locatorLoader)
-      {
+      for (ServiceLocator locator : locatorLoader) {
          Collection<Class<S>> serviceTypes = locator.locate(expectedType);
-         if ((serviceTypes != null) && !serviceTypes.isEmpty())
-         {
+         if ((serviceTypes != null) && !serviceTypes.isEmpty()) {
             for (Class<S> type : serviceTypes) {
-               loadClass(type); // TODO lb3 test this now
+               loadClass(type);
             }
          }
       }
@@ -166,17 +163,14 @@ public void reload()
 
    private List<URL> loadServiceFiles()
    {
-      List<URL> serviceFiles = new ArrayList<URL>();
-      try
-      {
+      List<URL> serviceFiles = new ArrayList<>();
+      try {
          Enumeration<URL> serviceFileEnumerator = loader.getResources(serviceFile);
-         while (serviceFileEnumerator.hasMoreElements())
-         {
+         while (serviceFileEnumerator.hasMoreElements()) {
             serviceFiles.add(serviceFileEnumerator.nextElement());
          }
       }
-      catch (IOException e)
-      {
+      catch (IOException e) {
          throw new RuntimeException("Could not load resources from " + serviceFile, e);
       }
       return serviceFiles;
@@ -184,47 +178,26 @@ private List<URL> loadServiceFiles()
 
    private void loadServiceFile(final URL serviceFile)
    {
-      InputStream is = null;
-      try
-      {
-         is = serviceFile.openStream();
-         BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+      try (InputStream is = serviceFile.openStream()) {
+         BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
          String serviceClassName = null;
-         while ((serviceClassName = reader.readLine()) != null)
-         {
+         while ((serviceClassName = reader.readLine()) != null) {
             serviceClassName = trim(serviceClassName);
-            if (serviceClassName.length() > 0)
-            {
+            if (serviceClassName.length() > 0) {
                loadService(serviceClassName);
             }
          }
       }
-      catch (IOException e)
-      {
+      catch (IOException e) {
          throw new RuntimeException("Could not read services file " + serviceFile, e);
       }
-      finally
-      {
-         if (is != null)
-         {
-            try
-            {
-               is.close();
-            }
-            catch (IOException e)
-            {
-               throw new RuntimeException("Could not close services file " + serviceFile, e);
-            }
-         }
-      }
    }
 
    private String trim(String line)
    {
       final int comment = line.indexOf('#');
 
-      if (comment > -1)
-      {
+      if (comment > -1) {
          line = line.substring(0, comment);
       }
       return line.trim();
@@ -238,21 +211,17 @@ private void loadService(final String serviceClassName)
 
    private void loadClass(final Class<? extends S> serviceClass)
    {
-      if (serviceClass == null)
-      {
+      if (serviceClass == null) {
          return;
       }
-      if (loadedImplementations.contains(serviceClass))
-      {
+      if (loadedImplementations.contains(serviceClass)) {
          return;
       }
       Collection<? extends S> services = loadEnriched(serviceClass);
-      if ((services == null) || services.isEmpty())
-      {
+      if ((services == null) || services.isEmpty()) {
          return;
       }
-      for (S service : services)
-      {
+      for (S service : services) {
          loadedImplementations.add(service.getClass());
       }
       providers.addAll(services);
@@ -262,18 +231,15 @@ private Class<? extends S> loadClass(final String serviceClassName)
    {
       Class<?> clazz = null;
       Class<? extends S> serviceClass = null;
-      try
-      {
+      try {
          clazz = loader.loadClass(serviceClassName);
          serviceClass = clazz.asSubclass(expectedType);
       }
-      catch (ClassNotFoundException e)
-      {
+      catch (ClassNotFoundException e) {
          throw new RuntimeException("ClassNotFoundException: Service class [" + serviceClassName
                   + "] could not be loaded.");
       }
-      catch (ClassCastException e)
-      {
+      catch (ClassCastException e) {
          throw new ClassCastException("ClassCastException: Service class [" + serviceClassName
                   + "] did not implement the interface [" + expectedType.getName() + "]");
       }
@@ -289,47 +255,37 @@ private Class<? extends S> loadClass(final String serviceClassName)
     */
    public static <T> Collection<T> loadEnriched(final Class<T> serviceClass)
    {
-      try
-      {
-         Collection<T> services = new ArrayList<T>();
+      try {
+         Collection<T> services = Collections.emptyList();
          ServiceEnricher origin = null;
 
-         if (!NonEnriching.class.isAssignableFrom(serviceClass))
-         {
-            if (enricherLoader == null)
-            {
+         if (!NonEnriching.class.isAssignableFrom(serviceClass)) {
+            if (enricherLoader == null) {
                enricherLoader = java.util.ServiceLoader
                         .load(ServiceEnricher.class);
             }
 
-            for (ServiceEnricher enricher : enricherLoader)
-            {
+            for (ServiceEnricher enricher : enricherLoader) {
                services = enricher.produce(serviceClass);
-               if (services == null)
-               {
-                  services = new ArrayList<T>();
+               if (services == null) {
+                  services = Collections.emptyList();
                }
-               if (!services.isEmpty())
-               {
+               if (!services.isEmpty()) {
                   origin = enricher;
                   break;
                }
             }
          }
 
-         if (services.isEmpty())
-         {
+         if (services.isEmpty()) {
             Constructor<? extends T> constructor = serviceClass.getDeclaredConstructor();
             constructor.setAccessible(true);
-            services.add(constructor.newInstance());
+            services = Collections.singletonList(constructor.newInstance());
          }
 
-         if (!NonEnriching.class.isAssignableFrom(serviceClass))
-         {
-            for (ServiceEnricher enricher : enricherLoader)
-            {
-               if (!enricher.equals(origin))
-               {
+         if (!NonEnriching.class.isAssignableFrom(serviceClass)) {
+            for (ServiceEnricher enricher : enricherLoader) {
+               if (!enricher.equals(origin)) {
                   for (T service : services) {
                      enricher.enrich(service);
                   }
@@ -339,32 +295,14 @@ public static <T> Collection<T> loadEnriched(final Class<T> serviceClass)
 
          return services;
       }
-      catch (NoClassDefFoundError e)
-      {
+      catch (NoClassDefFoundError e) {
          throw new RuntimeException("Could not instantiate service class " + serviceClass.getName(), e);
       }
-      catch (InvocationTargetException e)
-      {
+      catch (InvocationTargetException e) {
          throw new RuntimeException("Error instantiating " + serviceClass, e.getCause());
       }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException("Error instantiating " + serviceClass, e);
-      }
-      catch (InstantiationException e)
-      {
-         throw new RuntimeException("Error instantiating " + serviceClass, e);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException("Error instantiating " + serviceClass, e);
-      }
-      catch (SecurityException e)
-      {
-         throw new RuntimeException("Error instantiating " + serviceClass, e);
-      }
-      catch (NoSuchMethodException e)
-      {
+      catch (IllegalArgumentException | InstantiationException | IllegalAccessException | SecurityException
+               | NoSuchMethodException e) {
          throw new RuntimeException("Error instantiating " + serviceClass, e);
       }
    }
@@ -399,8 +337,7 @@ public static <T> Collection<T> loadEnriched(final Class<T> serviceClass)
    @Override
    public Iterator<S> iterator()
    {
-      if (providers == null)
-      {
+      if (providers == null) {
          reload();
       }
       return providers.iterator();
@@ -416,4 +353,4 @@ public String toString()
    {
       return "Services for " + serviceFile;
    }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/ocpsoft/common/services/ServiceProvider.java b/api/src/main/java/org/ocpsoft/common/services/ServiceProvider.java
index 9666e63..4894222 100644
--- a/api/src/main/java/org/ocpsoft/common/services/ServiceProvider.java
+++ b/api/src/main/java/org/ocpsoft/common/services/ServiceProvider.java
@@ -13,5 +13,5 @@
  */
 public interface ServiceProvider extends Weighted
 {
-   public <T> List<T> getServices(Class<T> type);
+   <T> List<T> getServices(Class<T> type);
 }
diff --git a/api/src/main/java/org/ocpsoft/common/util/Iterators.java b/api/src/main/java/org/ocpsoft/common/util/Iterators.java
index 9953c76..e0b8a6b 100644
--- a/api/src/main/java/org/ocpsoft/common/util/Iterators.java
+++ b/api/src/main/java/org/ocpsoft/common/util/Iterators.java
@@ -36,7 +36,7 @@ public Iterators()
     */
    public static <T> List<T> asList(final Iterable<T> iterable)
    {
-      List<T> result = new ArrayList<T>();
+      List<T> result = new ArrayList<>();
       for (T t : iterable)
       {
          result.add(t);
@@ -49,7 +49,7 @@ public static <T> List<T> asList(final Iterable<T> iterable)
     */
    public static <T> List<T> asList(final Iterator<T> iterator)
    {
-      List<T> result = new ArrayList<T>();
+      List<T> result = new ArrayList<>();
       while (iterator.hasNext())
       {
          T t = iterator.next();
@@ -63,7 +63,7 @@ public static <T> List<T> asList(final Iterator<T> iterator)
     */
    public static <T> Set<T> asSet(final Iterable<T> iterable)
    {
-      Set<T> result = new HashSet<T>();
+      Set<T> result = new HashSet<>();
       for (T t : iterable)
       {
          result.add(t);
@@ -76,7 +76,7 @@ public static <T> Set<T> asSet(final Iterable<T> iterable)
     */
    public static <T> Set<T> asSet(final Iterator<T> iterator)
    {
-      Set<T> result = new HashSet<T>();
+      Set<T> result = new HashSet<>();
       while (iterator.hasNext())
       {
          T t = iterator.next();
diff --git a/api/src/main/java/org/ocpsoft/common/util/Streams.java b/api/src/main/java/org/ocpsoft/common/util/Streams.java
index 2299498..b361d56 100644
--- a/api/src/main/java/org/ocpsoft/common/util/Streams.java
+++ b/api/src/main/java/org/ocpsoft/common/util/Streams.java
@@ -22,7 +22,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Utility methods for working with {@link InputStream} and {@link OutputStream} instances.
@@ -76,7 +76,7 @@ public static String toString(final InputStream stream)
       try
       {
          final char[] buffer = new char[0x10000];
-         Reader in = new InputStreamReader(stream, "UTF-8");
+         Reader in = new InputStreamReader(stream, StandardCharsets.UTF_8);
          int read;
          do
          {
@@ -87,12 +87,7 @@ public static String toString(final InputStream stream)
             }
          }
          while (read >= 0);
-      }
-      catch (UnsupportedEncodingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (IOException e)
+      } catch (IOException e)
       {
          throw new RuntimeException(e);
       }
diff --git a/api/src/main/java/org/ocpsoft/common/util/Strings.java b/api/src/main/java/org/ocpsoft/common/util/Strings.java
index 7704778..942937c 100644
--- a/api/src/main/java/org/ocpsoft/common/util/Strings.java
+++ b/api/src/main/java/org/ocpsoft/common/util/Strings.java
@@ -17,6 +17,7 @@
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * Utility methods for manipulating {@link String} instances
@@ -33,15 +34,7 @@ public Strings()
     */
    public static boolean areEqual(final String left, final String right)
    {
-      if ((left == null) && (right == null))
-      {
-         return true;
-      }
-      else if ((left == null) || (right == null))
-      {
-         return false;
-      }
-      return left.equals(right);
+      return Objects.equals(left, right);
    }
 
    /**
@@ -90,7 +83,7 @@ public static boolean isTrue(final String value)
     */
    public static String join(final Collection<?> collection, final String delimiter)
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       Iterator<?> iter = collection.iterator();
       while (iter.hasNext())
       {
diff --git a/api/src/test/java/org/ocpsoft/common/services/MockServiceEnricher.java b/api/src/test/java/org/ocpsoft/common/services/MockServiceEnricher.java
index 3fb991f..32357a4 100644
--- a/api/src/test/java/org/ocpsoft/common/services/MockServiceEnricher.java
+++ b/api/src/test/java/org/ocpsoft/common/services/MockServiceEnricher.java
@@ -21,7 +21,7 @@ public class MockServiceEnricher implements ServiceEnricher
    @SuppressWarnings("unchecked")
    public <T> Collection<T> produce(final Class<T> type)
    {
-      Collection<T> result = new ArrayList<T>();
+      Collection<T> result = new ArrayList<>();
       /*
        * If we are asked for an instance of #2, provide two instances of #2 with different names.
        */
diff --git a/api/src/test/java/org/ocpsoft/common/services/ServiceLoaderTest.java b/api/src/test/java/org/ocpsoft/common/services/ServiceLoaderTest.java
index 713c447..021cb1b 100644
--- a/api/src/test/java/org/ocpsoft/common/services/ServiceLoaderTest.java
+++ b/api/src/test/java/org/ocpsoft/common/services/ServiceLoaderTest.java
@@ -54,8 +54,7 @@ public void testWithLocatorExtension()
 
    @Test
    @SuppressWarnings("unchecked")
-   public void testWithEnricherProviderDoesNotProduceUnlessTypeMatches() throws Exception
-   {
+   public void testWithEnricherProviderDoesNotProduceUnlessTypeMatches() {
       MockServiceEnricher.produceLocated = true;
       ServiceLoader<DummyService> services = ServiceLoader.load(DummyService.class);
       List<DummyService> list = Iterators.asList(services);
@@ -65,8 +64,7 @@ public void testWithEnricherProviderDoesNotProduceUnlessTypeMatches() throws Exc
 
    @Test
    @SuppressWarnings("unchecked")
-   public void testWithEnricherAndLocatorProducesTwoSeparateNamedServiceInstances() throws Exception
-   {
+   public void testWithEnricherAndLocatorProducesTwoSeparateNamedServiceInstances() {
       MockServiceEnricher.produceLocated = true;
       MockServiceLocator.provide = true;
       ServiceLoader<DummyService> services = ServiceLoader.load(DummyService.class);
@@ -78,8 +76,7 @@ public void testWithEnricherAndLocatorProducesTwoSeparateNamedServiceInstances()
 
    @Test
    @SuppressWarnings("unchecked")
-   public void testEnricherThatProvidesClassDoesNotEnrich() throws Exception
-   {
+   public void testEnricherThatProvidesClassDoesNotEnrich() {
       MockServiceEnricher.produceStandard = true;
       MockServiceEnricher.produced = false;
       MockServiceEnricher.enriched = false;
diff --git a/mvnw b/mvnw
new file mode 100755
index 0000000..5643201
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,316 @@
+#!/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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   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
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -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 "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; 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; \\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
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# 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/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# 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.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+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 "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -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
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 0000000..23b7079
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,188 @@
+@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 Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_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 DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_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('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@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%
diff --git a/pom.xml b/pom.xml
index d89ce02..ce04284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.ocpsoft</groupId>
       <artifactId>ocpsoft-parent</artifactId>
-      <version>6</version>
+      <version>16</version>
    </parent>
    
    <name>OCPsoft Common - Parent</name>
@@ -22,12 +22,12 @@
    
    <groupId>org.ocpsoft.common</groupId>
    <artifactId>common-parent</artifactId>
-   <version>1.0.6-SNAPSHOT</version>
+   <version>1.0.7-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <version.junit>4.8.1</version.junit>
+      <version.junit>4.13.2</version.junit>
    </properties>
 
    <modules>
@@ -50,12 +50,20 @@
       </dependencies>
    </dependencyManagement>
 
-   <dependencies>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-      </dependency>
-   </dependencies>
+   <build>
+      <pluginManagement>
+         <plugins>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-compiler-plugin</artifactId>
+               <configuration>
+                  <source>1.8</source>
+                  <target>1.8</target>
+               </configuration>
+            </plugin>
+         </plugins>
+      </pluginManagement>
+   </build>
 
    <developers>
       <developer>
@@ -77,10 +85,16 @@
       <connection>scm:git:git://github.com/ocpsoft/common.git</connection>
       <developerConnection>scm:git:git@github.com:ocpsoft/common.git</developerConnection>
       <url>http://github.com/ocpsoft/common</url>
-   </scm>
+     <tag>HEAD</tag>
+  </scm>
 
    <issueManagement>
       <system>GitHub</system>
       <url>https://github.com/ocpsoft/common/issues</url>
    </issueManagement>
+
+   <ciManagement>
+      <system>GitHub Actions</system>
+      <url>https://github.com/ocpsoft/common/actions</url>
+   </ciManagement>
 </project>