diff --git a/aggregate/pom.xml b/aggregate/pom.xml
index 1fc1a84e..6da5ee89 100644
--- a/aggregate/pom.xml
+++ b/aggregate/pom.xml
@@ -5,7 +5,7 @@
   <packaging>pom</packaging>
   <version>20220608.2-SNAPSHOT</version>
   <parent>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
     <version>20220608.2-SNAPSHOT</version>
@@ -13,7 +13,8 @@
 
   <modules>
     <module>..</module>
-    <module>../html-types</module>
-    <module>../parent</module>
+    <module>../java8-shim</module>
+    <module>../java10-shim</module>
+    <module>../owasp-java-html-sanitizer</module>
   </modules>
 </project>
diff --git a/empiricism/pom.xml b/empiricism/pom.xml
index 2a5d1c8f..0679df4b 100644
--- a/empiricism/pom.xml
+++ b/empiricism/pom.xml
@@ -5,7 +5,7 @@
   <version>20220608.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
     <version>20220608.2-SNAPSHOT</version>
diff --git a/html-types/pom.xml b/html-types/pom.xml
index 97f9eb19..c3fdcc79 100644
--- a/html-types/pom.xml
+++ b/html-types/pom.xml
@@ -5,7 +5,7 @@
   <version>20220608.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <parent>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
     <version>20220608.2-SNAPSHOT</version>
diff --git a/java10-shim/pom.xml b/java10-shim/pom.xml
new file mode 100644
index 00000000..21b96c35
--- /dev/null
+++ b/java10-shim/pom.xml
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>java10-shim</artifactId>
+  <packaging>jar</packaging>
+  <parent>
+    <relativePath>..</relativePath>
+    <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+    <artifactId>parent</artifactId>
+    <version>20220608.2-SNAPSHOT</version>
+  </parent>
+
+  <name>Java 10 Shim</name>
+  <description>
+    Provides an implementation of java8-shim that interoperates with
+    Java >= 10 idioms for immutable collections.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>10</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+      <artifactId>java8-shim</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java b/java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java
new file mode 100644
index 00000000..78de9746
--- /dev/null
+++ b/java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java
@@ -0,0 +1,67 @@
+package org.owasp.shim;
+
+import java.util.*;
+
+@SuppressWarnings("Since15") // We're compiling two versions to handle @since problems.
+final class ForJava9AndLater extends Java8Shim {
+
+    @Override public <T> List<T> listOf() {
+        return List.of();
+    }
+
+    @Override public <T> List<T> listOf(T a) {
+        return List.of(a);
+    }
+
+    @Override public <T> List<T> listOf(T a, T b) {
+        return List.of(a, b);
+    }
+
+    @Override public <T> List<T> listOf(T a, T b, T c) {
+        return List.of(a, b, c);
+    }
+
+    @Override public <T> List<T> listOf(T... els) {
+        return List.of(els);
+    }
+
+    @Override public <T> List<T> listCopyOf(Collection<? extends T> c) {
+        return List.copyOf(c);
+    }
+
+    @Override public <K, V> Map<K, V> mapCopyOf(Map<? extends K, ? extends V> m) {
+        return Map.copyOf(m);
+    }
+
+    @Override public <K, V> Map.Entry<K, V> mapEntry(K key, V value) {
+        return Map.entry(key, value);
+    }
+
+    @Override public <K, V> Map<K, V> mapOfEntries(Map.Entry<K, V>... entries) {
+        return Map.ofEntries(entries);
+    }
+
+    @Override public <T> Set<T> setOf() {
+        return Set.of();
+    }
+
+    @Override public <T> Set<T> setOf(T a) {
+        return Set.of(a);
+    }
+
+    @Override public <T> Set<T> setOf(T a, T b) {
+        return Set.of(a, b);
+    }
+
+    @Override public <T> Set<T> setOf(T a, T b, T c) {
+        return Set.of(a, b, c);
+    }
+
+    @Override public <T> Set<T> setOf(T... els) {
+        return Set.of(els);
+    }
+
+    @Override public <T> Set<T> setCopyOf(Collection<? extends T> c) {
+        return Set.copyOf(c);
+    }
+}
diff --git a/java8-shim/pom.xml b/java8-shim/pom.xml
new file mode 100644
index 00000000..c414253b
--- /dev/null
+++ b/java8-shim/pom.xml
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>java8-shim</artifactId>
+  <packaging>jar</packaging>
+  <parent>
+    <relativePath>..</relativePath>
+    <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+    <artifactId>parent</artifactId>
+    <version>20220608.2-SNAPSHOT</version>
+  </parent>
+
+  <name>Java 8 Shim</name>
+  <description>
+    Backports @since Java 9 collection factories like List.of onto
+    Java8 in a way that uses the real ones where available, falls back
+    to a conforming implementation on Java8 and JIT compiles well.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>8</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/java8-shim/src/main/java/org/owasp/shim/ForJava8.java b/java8-shim/src/main/java/org/owasp/shim/ForJava8.java
new file mode 100644
index 00000000..34805a77
--- /dev/null
+++ b/java8-shim/src/main/java/org/owasp/shim/ForJava8.java
@@ -0,0 +1,256 @@
+package org.owasp.shim;
+
+import java.util.*;
+
+class ForJava8 extends Java8Shim {
+    @Override public <T> List<T> listOf() {
+        return ImmutableListShim.empty();
+    }
+
+    @Override public <T> List<T> listOf(T a) {
+        return new ImmutableListShim<>(Collections.singletonList(a));
+    }
+
+    @Override public <T> List<T> listOf(T a, T b) {
+        ArrayList<T> ls = new ArrayList<>(2);
+        ls.add(a);
+        ls.add(b);
+        return new ImmutableListShim<>(ls);
+    }
+
+    @Override public <T> List<T> listOf(T a, T b, T c) {
+        ArrayList<T> ls = new ArrayList<>(3);
+        ls.add(a);
+        ls.add(b);
+        ls.add(c);
+        return new ImmutableListShim<>(ls);
+    }
+
+    @Override public <T> List<T> listOf(T... els) {
+        return new ImmutableListShim<>(Arrays.asList(els));
+    }
+
+    @SuppressWarnings("unchecked") // Immutable collections aren't invariant
+    @Override public <T> List<T> listCopyOf(Collection<? extends T> c) {
+        if (c instanceof ImmutableListShim) {
+            return (ImmutableListShim<T>) c;
+        }
+        return new ImmutableListShim<>(new ArrayList<>(c));
+    }
+
+    @SuppressWarnings("unchecked") // Immutable collections aren't invariant
+    @Override public <K, V> Map<K, V> mapCopyOf(Map<? extends K, ? extends V> m) {
+        if (m instanceof ImmutableMapShim) {
+            return (ImmutableMapShim<K, V>) m;
+        }
+        return new ImmutableMapShim<>(new LinkedHashMap<>(m));
+    }
+
+    @Override public <K, V> Map.Entry<K, V> mapEntry(K key, V value) {
+        return new ImmutableEntryShim<>(key, value);
+    }
+
+    @Override public <K, V> Map<K, V> mapOfEntries(Map.Entry<K, V>... entries) {
+        Map<K, V> m = new LinkedHashMap<>(entries.length);
+        for (Map.Entry<K, V> e : entries) {
+            m.put(e.getKey(), e.getValue());
+        }
+        return new ImmutableMapShim<>(m);
+    }
+
+    @Override public <T> Set<T> setOf() {
+        return new ImmutableSetShim<>(Collections.emptySet());
+    }
+
+    @Override public <T> Set<T> setOf(T a) {
+        return new ImmutableSetShim<>(Collections.singleton(a));
+    }
+
+    @Override public <T> Set<T> setOf(T a, T b) {
+        LinkedHashSet<T> ls = new LinkedHashSet<>(2);
+        ls.add(a);
+        ls.add(b);
+        return new ImmutableSetShim<>(ls);
+    }
+
+    @Override public <T> Set<T> setOf(T a, T b, T c) {
+        LinkedHashSet<T> ls = new LinkedHashSet<>(3);
+        ls.add(a);
+        ls.add(b);
+        ls.add(c);
+        return new ImmutableSetShim<>(ls);
+    }
+
+    @Override public <T> Set<T> setOf(T... els) {
+        return new ImmutableSetShim<>(new LinkedHashSet<>(Arrays.asList(els)));
+    }
+
+    @SuppressWarnings("unchecked") // Immutable collections aren't invariant
+    @Override public <T> Set<T> setCopyOf(Collection<? extends T> c) {
+        if (c instanceof ImmutableSetShim) {
+
+            return (ImmutableSetShim<T>) c;
+        }
+        return new ImmutableSetShim<>(new LinkedHashSet<>(c));
+    }
+
+    private static final class ImmutableListShim<T> extends AbstractList<T> {
+        private final List<T> underlying;
+
+        ImmutableListShim(List<T> underlying) {
+            this.underlying = underlying;
+        }
+
+        @Override
+        public T get(int index) {
+            return underlying.get(index);
+        }
+
+        @Override
+        public int size() {
+            return underlying.size();
+        }
+
+        private static final ImmutableListShim<Object> empty = new ImmutableListShim<>(Collections.emptyList());
+
+        @SuppressWarnings("unchecked") // contains no elements of any specific T
+        static <T> ImmutableListShim<T> empty() {
+            return (ImmutableListShim<T>) empty;
+        }
+    }
+
+    private static final class ImmutableMapShim<K, V> extends AbstractMap<K, V> {
+        private final Map<K, V> underlying;
+
+        ImmutableMapShim(Map<K, V> underlying) {
+            this.underlying = underlying;
+        }
+
+        @Override
+        public V get(Object k) {
+            return underlying.get(k);
+        }
+
+        @Override
+        public boolean containsKey(Object k) {
+            return underlying.containsKey(k);
+        }
+
+        @Override
+        public Set<Entry<K, V>> entrySet() {
+            return new ImmutableEntrySetShim<>(underlying.entrySet());
+        }
+    }
+
+    private static final class ImmutableEntrySetShim<K, V> extends AbstractSet<Map.Entry<K, V>> {
+        private final Set<Map.Entry<K, V>> underlying;
+        ImmutableEntrySetShim(Set<Map.Entry<K, V>> underlying) {
+            this.underlying = underlying;
+        }
+
+
+        @Override
+        public Iterator<Map.Entry<K, V>> iterator() {
+            class IteratorImpl implements Iterator<Map.Entry<K, V>> {
+                private final Iterator<Map.Entry<K, V>> underlying;
+                private ImmutableEntryShim<K, V> pending;
+
+                IteratorImpl(Iterator<Map.Entry<K, V>> underlying) {
+                    this.underlying = underlying;
+                }
+
+                @Override
+                public boolean hasNext() {
+                    if (pending == null && underlying.hasNext()) {
+                        Map.Entry<K, V> e = underlying.next();
+                        pending = new ImmutableEntryShim<>(e.getKey(), e.getValue());
+                    }
+                    return pending != null;
+                }
+
+                @Override
+                public Map.Entry<K, V> next() {
+                    ImmutableEntryShim<K, V> next = pending;
+                    pending = null;
+                    if (next == null) { throw new NoSuchElementException(); }
+                    return next;
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            }
+            return new IteratorImpl(underlying.iterator());
+        }
+
+        @Override
+        public int size() {
+            return underlying.size();
+        }
+    }
+
+    private static final class ImmutableEntryShim<K, V> implements Map.Entry<K, V> {
+        private final K key;
+        private final V value;
+        ImmutableEntryShim(K key, V value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        @Override
+        public K getKey() { return key; }
+
+        @Override
+        public V getValue() { return value; }
+
+        @Override
+        public V setValue(V value) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private static final class ImmutableSetShim<T> extends AbstractSet<T> {
+        private final Set<T> underlying;
+
+        ImmutableSetShim(Set<T> underlying) {
+            this.underlying = underlying;
+        }
+
+        @Override
+        public Iterator<T> iterator() {
+            class IteratorImpl implements Iterator<T> {
+                private final Iterator<T> underlying;
+                IteratorImpl(Iterator<T> underlying) {
+                    this.underlying = underlying;
+                }
+
+                @Override
+                public boolean hasNext() {
+                    return underlying.hasNext();
+                }
+
+                @Override
+                public T next() {
+                    return underlying.next();
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            }
+            return new IteratorImpl(underlying.iterator());
+        }
+
+        @Override
+        public int size() {
+            return underlying.size();
+        }
+
+        @Override
+        public boolean contains(Object o) {
+            return underlying.contains(o);
+        }
+    }
+}
diff --git a/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java b/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java
new file mode 100644
index 00000000..abc5c1c5
--- /dev/null
+++ b/java8-shim/src/main/java/org/owasp/shim/Java8Shim.java
@@ -0,0 +1,106 @@
+package org.owasp.shim;
+
+import java.util.*;
+
+/**
+ * Static adapters for Java 9 APIs that we need to support on Java 8.
+ */
+@SuppressWarnings("JavadocReference")
+public abstract class Java8Shim {
+    /** Statically import this and do `j8.listOf(...)`. */
+    public static Java8Shim j8() { return instance; }
+
+    Java8Shim() {} // Not public so there can only be one instance loaded below.
+
+    private static final Java8Shim instance;
+    static {
+        Object _instance;
+        try {
+            try {
+                // This is compiled with -release 1.9 in a separate project.
+                _instance = Class.forName("org.owasp.shim.ForJava9AndLater").newInstance();
+            } catch (Error e) {
+                // This is co-located with this project and is a fall-back.
+                _instance = Class.forName("org.owasp.shim.ForJava8").newInstance();
+            }
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+            throw new Error(e);
+        }
+        instance = (Java8Shim) _instance;
+    }
+
+    /**
+     * {@link java.util.List.of}
+     */
+    public abstract <T> List<T> listOf();
+
+    /**
+     * {@link java.util.List.of}
+     */
+    public abstract <T> List<T> listOf(T a);
+
+    /**
+     * {@link java.util.List.of}
+     */
+    public abstract <T> List<T> listOf(T a, T b);
+
+    /**
+     * {@link java.util.List.of}
+     */
+    public abstract <T> List<T> listOf(T a, T b, T c);
+
+    /**
+     * {@link java.util.List.of}
+     */
+    public abstract <T> List<T> listOf(T... els);
+
+    /**
+     * {@link java.util.List.copyOf}
+     */
+    public abstract <T> List<T> listCopyOf(Collection<? extends T> c);
+
+    /**
+     * {@link java.util.Map.copyOf}
+     */
+    public abstract <K, V> Map<K, V> mapCopyOf(Map<? extends K, ? extends V> m);
+
+    /**
+     * {@link java.util.Map.entry}
+     */
+    public abstract <K, V> Map.Entry<K, V> mapEntry(K key, V value);
+
+    /**
+     * {@link java.util.Map.ofEntries}
+     */
+    public abstract <K, V> Map<K, V> mapOfEntries(Map.Entry<K, V>... entries);
+
+    /**
+     * {@link java.util.Set.of}
+     */
+    public abstract <T> Set<T> setOf();
+
+    /**
+     * {@link java.util.Set.of}
+     */
+    public abstract <T> Set<T> setOf(T a);
+
+    /**
+     * {@link java.util.Set.of}
+     */
+    public abstract <T> Set<T> setOf(T a, T b);
+
+    /**
+     * {@link java.util.Set.of}
+     */
+    public abstract <T> Set<T> setOf(T a, T b, T c);
+
+    /**
+     * {@link java.util.Set.of}
+     */
+    public abstract <T> Set<T> setOf(T... els);
+
+    /**
+     * {@link java.util.Set.copyOf}
+     */
+    public abstract <T> Set<T> setCopyOf(Collection<? extends T> c);
+}
diff --git a/owasp-java-html-sanitizer/pom.xml b/owasp-java-html-sanitizer/pom.xml
new file mode 100644
index 00000000..9b9dd8b2
--- /dev/null
+++ b/owasp-java-html-sanitizer/pom.xml
@@ -0,0 +1,154 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>owasp-java-html-sanitizer</artifactId>
+  <packaging>bundle</packaging>
+  <parent>
+    <relativePath>..</relativePath>
+    <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+    <artifactId>parent</artifactId>
+    <version>20220608.2-SNAPSHOT</version>
+  </parent>
+
+  <name>OWASP Java HTML Sanitizer</name>
+  <description>
+    Takes third-party HTML and produces HTML that is safe to embed in
+    your web application.
+    Fast and easy to configure.
+  </description>
+
+  <build>
+    <plugins>
+      <!-- http://www.javaworld.com/article/2074515/core-java/
+           unit-test-code-coverage-with-maven-and-jacoco.html -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <!--configuration>
+          <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
+          <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
+        </configuration-->
+        <executions>
+          <execution>
+            <id>jacoco-initialize</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>jacoco-site</id>
+            <phase>package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eluder.coveralls</groupId>
+        <artifactId>coveralls-maven-plugin</artifactId>
+        <configuration>
+          <repoToken>TENYw0IKRulLOXgkyzjGqNi0hQyhBiSiU</repoToken>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>org.owasp.html</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-verifier-plugin</artifactId>
+        <configuration>
+          <verificationFile>src/test/resources/osgi-integration-verification.xml</verificationFile>
+        </configuration>
+        <executions>
+          <execution>
+            <id>main</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>10</source>
+          <target>10</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+      <artifactId>java8-shim</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+      <artifactId>java10-shim</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>nu.validator.htmlparser</groupId>
+      <artifactId>htmlparser</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <!-- `mvn compile site` will generate target/site/findbugs.html -->
+      <!-- http://gleclaire.github.io/findbugs-maven-plugin/dependency-info.html -->
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>3.1.12.2</version>
+        <configuration>
+          <!--
+            Enables analysis which takes more memory but finds more bugs.
+            If you run out of memory, changes the value of the effort element
+            to 'Low'.
+          -->
+          <effort>Max</effort>
+          <!-- Reports all bugs (other values are medium and max) -->
+          <threshold>Low</threshold>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>
diff --git a/src/main/java/org/owasp/html/AttributePolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/AttributePolicy.java
similarity index 100%
rename from src/main/java/org/owasp/html/AttributePolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/AttributePolicy.java
diff --git a/src/main/java/org/owasp/html/CssGrammar.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssGrammar.java
similarity index 100%
rename from src/main/java/org/owasp/html/CssGrammar.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssGrammar.java
diff --git a/src/main/java/org/owasp/html/CssSchema.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssSchema.java
similarity index 86%
rename from src/main/java/org/owasp/html/CssSchema.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssSchema.java
index 342dd1ee..edb1c054 100644
--- a/src/main/java/org/owasp/html/CssSchema.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssSchema.java
@@ -37,6 +37,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import static org.owasp.shim.Java8Shim.j8;
 
 import javax.annotation.Nullable;
 
@@ -54,11 +55,11 @@ public static final class Property {
     /** A bitfield of BIT_* constants describing groups of allowed tokens. */
     final int bits;
     /** Specific allowed values. */
-	final Set<String> literals;
+    final Set<String> literals;
     /**
      * Maps lower-case function tokens to the schema key for their parameters.
      */
-	final Map<String, String> fnKeys;
+    final Map<String, String> fnKeys;
 
     /**
      * @param bits A bitfield of BIT_* constants describing groups of allowed tokens.
@@ -69,8 +70,8 @@ public Property(
         int bits, Set<String> literals,
         Map<String, String> fnKeys) {
       this.bits = bits;
-      this.literals = Set.copyOf(literals);
-      this.fnKeys = Map.copyOf(fnKeys);
+      this.literals = j8().setCopyOf(literals);
+      this.fnKeys = j8().mapCopyOf(fnKeys);
     }
 
     @Override
@@ -262,9 +263,9 @@ Property forKey(String propertyName) {
   static {
     Map<String, String> zeroFns = Collections.emptyMap();
     Map<String, Property> builder = new HashMap<>();
-    Set<String> mozBorderRadiusLiterals0 = Set.of("/");
-    Set<String> mozOpacityLiterals0 = Set.of("inherit");
-    Set<String> mozOutlineLiterals0 = Set.of(
+    Set<String> mozBorderRadiusLiterals0 = j8().setOf("/");
+    Set<String> mozOpacityLiterals0 = j8().setOf("inherit");
+    Set<String> mozOutlineLiterals0 = j8().setOf(
         "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
         "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
         "burlywood", "cadetblue", "chartreuse", "chocolate", "coral",
@@ -292,121 +293,119 @@ Property forKey(String propertyName) {
         "silver", "skyblue", "slateblue", "slategray", "snow", "springgreen",
         "steelblue", "tan", "teal", "thistle", "tomato", "turquoise", "violet",
         "wheat", "white", "whitesmoke", "yellow", "yellowgreen");
-    Set<String> mozOutlineLiterals1 = Set.of(
+    Set<String> mozOutlineLiterals1 = j8().setOf(
         "dashed", "dotted", "double", "groove", "outset", "ridge", "solid");
-    Set<String> mozOutlineLiterals2 = Set.of("thick", "thin");
-    Set<String> mozOutlineLiterals3 = Set.of(
+    Set<String> mozOutlineLiterals2 = j8().setOf("thick", "thin");
+    Set<String> mozOutlineLiterals3 = j8().setOf(
         "hidden", "inherit", "inset", "invert", "medium", "none");
-    Map<String, String> mozOutlineFunctions =
-      Map.<String, String>of(
-        "rgb(", "rgb()", "rgba(", "rgba()",
-        "hsl(", "hsl()", "hsla(", "hsla()");
+    Map<String, String> mozOutlineFunctions = j8().mapOfEntries(
+        j8().mapEntry("rgb(", "rgb()"), j8().mapEntry("rgba(", "rgba()"),
+        j8().mapEntry("hsl(", "hsl()"), j8().mapEntry("hsla(", "hsla()"));
     Set<String> mozOutlineColorLiterals0 =
-      Set.of("inherit", "invert");
+      j8().setOf("inherit", "invert");
     Set<String> mozOutlineStyleLiterals0 =
-      Set.of("hidden", "inherit", "inset", "none");
+      j8().setOf("hidden", "inherit", "inset", "none");
     Set<String> mozOutlineWidthLiterals0 =
-      Set.of("inherit", "medium");
+      j8().setOf("inherit", "medium");
     Set<String> oTextOverflowLiterals0 =
-      Set.of("clip", "ellipsis");
-    Set<String> azimuthLiterals0 = Set.of(
+      j8().setOf("clip", "ellipsis");
+    Set<String> azimuthLiterals0 = j8().setOf(
         "behind", "center-left", "center-right", "far-left", "far-right",
         "left-side", "leftwards", "right-side", "rightwards");
-    Set<String> azimuthLiterals1 = Set.of("left", "right");
+    Set<String> azimuthLiterals1 = j8().setOf("left", "right");
     Set<String> azimuthLiterals2 =
-      Set.of("center", "inherit");
-    Set<String> backgroundLiterals0 = Set.of(
+      j8().setOf("center", "inherit");
+    Set<String> backgroundLiterals0 = j8().setOf(
         "border-box", "contain", "content-box", "cover", "padding-box");
     Set<String> backgroundLiterals1 =
-      Set.of("no-repeat", "repeat-x", "repeat-y", "round", "space");
-    Set<String> backgroundLiterals2 = Set.of("bottom", "top");
-    Set<String> backgroundLiterals3 = Set.of(
+      j8().setOf("no-repeat", "repeat-x", "repeat-y", "round", "space");
+    Set<String> backgroundLiterals2 = j8().setOf("bottom", "top");
+    Set<String> backgroundLiterals3 = j8().setOf(
         ",", "/", "auto", "center", "fixed", "inherit", "local", "none",
         "repeat", "scroll", "transparent");
-    Map<String, String> backgroundFunctions =
-      Map.of(
-      "image(", "image()",
-      "linear-gradient(", "linear-gradient()",
-      "radial-gradient(", "radial-gradient()",
-      "repeating-linear-gradient(", "repeating-linear-gradient()",
-      "repeating-radial-gradient(", "repeating-radial-gradient()",
-      "rgb(", "rgb()", "rgba(", "rgba()",
-      "hsl(", "hsl()", "hsla(", "hsla()");
+    Map<String, String> backgroundFunctions = j8().mapOfEntries(
+      j8().mapEntry("image(", "image()"),
+      j8().mapEntry("linear-gradient(", "linear-gradient()"),
+      j8().mapEntry("radial-gradient(", "radial-gradient()"),
+      j8().mapEntry("repeating-linear-gradient(", "repeating-linear-gradient()"),
+      j8().mapEntry("repeating-radial-gradient(", "repeating-radial-gradient()"),
+      j8().mapEntry("rgb(", "rgb()"), j8().mapEntry("rgba(", "rgba()"),
+      j8().mapEntry("hsl(", "hsl()"), j8().mapEntry("hsla(", "hsla()"));
     Set<String> backgroundAttachmentLiterals0 =
-      Set.of(",", "fixed", "local", "scroll");
+      j8().setOf(",", "fixed", "local", "scroll");
     Set<String> backgroundColorLiterals0 =
-      Set.of("inherit", "transparent");
+      j8().setOf("inherit", "transparent");
     Set<String> backgroundImageLiterals0 =
-      Set.of(",", "none");
+      j8().setOf(",", "none");
     Map<String, String> backgroundImageFunctions =
-      Map.<String, String>of(
-          "image(", "image()",
-          "linear-gradient(", "linear-gradient()",
-          "radial-gradient(", "radial-gradient()",
-          "repeating-linear-gradient(", "repeating-linear-gradient()",
-          "repeating-radial-gradient(", "repeating-radial-gradient()");
-    Set<String> backgroundPositionLiterals0 = Set.of(
+      j8().mapOfEntries(
+        j8().mapEntry("image(", "image()"),
+        j8().mapEntry("linear-gradient(", "linear-gradient()"),
+        j8().mapEntry("radial-gradient(", "radial-gradient()"),
+        j8().mapEntry("repeating-linear-gradient(", "repeating-linear-gradient()"),
+        j8().mapEntry("repeating-radial-gradient(", "repeating-radial-gradient()"));
+    Set<String> backgroundPositionLiterals0 = j8().setOf(
         ",", "center");
-    Set<String> backgroundRepeatLiterals0 = Set.of(
+    Set<String> backgroundRepeatLiterals0 = j8().setOf(
         ",", "repeat");
-    Set<String> borderLiterals0 = Set.of(
+    Set<String> borderLiterals0 = j8().setOf(
         "hidden", "inherit", "inset", "medium", "none", "transparent");
-    Set<String> borderCollapseLiterals0 = Set.of(
+    Set<String> borderCollapseLiterals0 = j8().setOf(
         "collapse", "inherit", "separate");
-    Set<String> bottomLiterals0 = Set.of("auto", "inherit");
-    Set<String> boxShadowLiterals0 = Set.of(
+    Set<String> bottomLiterals0 = j8().setOf("auto", "inherit");
+    Set<String> boxShadowLiterals0 = j8().setOf(
         ",", "inset", "none");
-    Set<String> clearLiterals0 = Set.of(
+    Set<String> clearLiterals0 = j8().setOf(
         "both", "inherit", "none");
     Map<String, String> clipFunctions =
-        Map.<String, String>of("rect(", "rect()");
-    Set<String> contentLiterals0 = Set.of("none", "normal");
-    Set<String> cueLiterals0 = Set.of("inherit", "none");
-    Set<String> cursorLiterals0 = Set.of(
+        j8().mapOfEntries(j8().mapEntry("rect(", "rect()"));
+    Set<String> contentLiterals0 = j8().setOf("none", "normal");
+    Set<String> cueLiterals0 = j8().setOf("inherit", "none");
+    Set<String> cursorLiterals0 = j8().setOf(
         "all-scroll", "col-resize", "crosshair", "default", "e-resize",
         "hand", "help", "move", "n-resize", "ne-resize", "no-drop",
         "not-allowed", "nw-resize", "pointer", "progress", "row-resize",
         "s-resize", "se-resize", "sw-resize", "text", "vertical-text",
         "w-resize", "wait");
-    Set<String> cursorLiterals1 = Set.of(
+    Set<String> cursorLiterals1 = j8().setOf(
         ",", "auto", "inherit");
-    Set<String> directionLiterals0 = Set.of("ltr", "rtl");
-    Set<String> displayLiterals0 = Set.of(
+    Set<String> directionLiterals0 = j8().setOf("ltr", "rtl");
+    Set<String> displayLiterals0 = j8().setOf(
         "-moz-inline-box", "-moz-inline-stack", "block", "inline",
         "inline-block", "inline-table", "list-item", "run-in", "table",
         "table-caption", "table-cell", "table-column", "table-column-group",
         "table-footer-group", "table-header-group", "table-row",
         "table-row-group");
-    Set<String> elevationLiterals0 = Set.of(
+    Set<String> elevationLiterals0 = j8().setOf(
         "above", "below", "higher", "level", "lower");
-    Set<String> emptyCellsLiterals0 = Set.of("hide", "show");
+    Set<String> emptyCellsLiterals0 = j8().setOf("hide", "show");
     //Map<String, String> filterFunctions =
-    //  Map.<String, String>of("alpha(", "alpha()");
-    Set<String> fontLiterals0 = Set.of(
+    //  j8().mapOfEntries(mapEntry("alpha(", "alpha()"));
+    Set<String> fontLiterals0 = j8().setOf(
         "100", "200", "300", "400", "500", "600", "700", "800", "900", "bold",
         "bolder", "lighter");
-    Set<String> fontLiterals1 = Set.of(
+    Set<String> fontLiterals1 = j8().setOf(
         "large", "larger", "small", "smaller", "x-large", "x-small",
         "xx-large", "xx-small", "xxx-large", "medium");
-    Set<String> fontLiterals2 = Set.of(
+    Set<String> fontLiterals2 = j8().setOf(
         "caption", "icon", "menu", "message-box", "small-caption",
         "status-bar");
-    Set<String> fontLiterals3 = Set.of(
+    Set<String> fontLiterals3 = j8().setOf(
         "cursive", "fantasy", "monospace", "sans-serif", "serif");
-    Set<String> fontLiterals4 = Set.of("italic", "oblique");
-    Set<String> fontLiterals5 = Set.of(
+    Set<String> fontLiterals4 = j8().setOf("italic", "oblique");
+    Set<String> fontLiterals5 = j8().setOf(
         ",", "/", "inherit", "medium", "normal", "small-caps");
-    Set<String> fontFamilyLiterals0 = Set.of(",", "inherit");
-    Set<String> fontStretchLiterals0 = Set.of(
+    Set<String> fontFamilyLiterals0 = j8().setOf(",", "inherit");
+    Set<String> fontStretchLiterals0 = j8().setOf(
         "condensed", "expanded", "extra-condensed", "extra-expanded",
         "narrower", "semi-condensed", "semi-expanded", "ultra-condensed",
         "ultra-expanded", "wider");
-    Set<String> fontStretchLiterals1 = Set.of("normal");
-    Set<String> fontStyleLiterals0 = Set.of(
+    Set<String> fontStretchLiterals1 = j8().setOf("normal");
+    Set<String> fontStyleLiterals0 = j8().setOf(
         "inherit", "normal");
-    Set<String> fontVariantLiterals0 = Set.of(
+    Set<String> fontVariantLiterals0 = j8().setOf(
         "inherit", "normal", "small-caps");
-    Set<String> listStyleLiterals0 = Set.of(
+    Set<String> listStyleLiterals0 = j8().setOf(
         "armenian", "cjk-decimal", "decimal", "decimal-leading-zero", "disc",
         "disclosure-closed", "disclosure-open", "ethiopic-numeric", "georgian",
         "hebrew", "hiragana", "hiragana-iroha", "japanese-formal",
@@ -416,82 +415,82 @@ Property forKey(String propertyName) {
         "lower-roman", "simp-chinese-formal", "simp-chinese-informal",
         "square", "trad-chinese-formal", "trad-chinese-informal",
         "upper-alpha", "upper-latin", "upper-roman");
-    Set<String> listStyleLiterals1 = Set.of(
+    Set<String> listStyleLiterals1 = j8().setOf(
         "inside", "outside");
-    Set<String> listStyleLiterals2 = Set.of(
+    Set<String> listStyleLiterals2 = j8().setOf(
         "circle", "inherit", "none");
-    Set<String> maxHeightLiterals0 = Set.of(
+    Set<String> maxHeightLiterals0 = j8().setOf(
         "auto", "inherit", "none");
-    Set<String> overflowLiterals0 = Set.of(
+    Set<String> overflowLiterals0 = j8().setOf(
         "auto", "hidden", "inherit", "scroll", "visible");
-    Set<String> overflowWrapLiterals0 = Set.of(
+    Set<String> overflowWrapLiterals0 = j8().setOf(
         "normal", "break-word", "anywhere", "inherit");
-    Set<String> overflowXLiterals0 = Set.of(
+    Set<String> overflowXLiterals0 = j8().setOf(
         "no-content", "no-display");
-    Set<String> overflowXLiterals1 = Set.of(
+    Set<String> overflowXLiterals1 = j8().setOf(
         "auto", "hidden", "scroll", "visible");
-    Set<String> pageBreakAfterLiterals0 = Set.of(
+    Set<String> pageBreakAfterLiterals0 = j8().setOf(
         "always", "auto", "avoid", "inherit");
-    Set<String> pageBreakInsideLiterals0 = Set.of(
+    Set<String> pageBreakInsideLiterals0 = j8().setOf(
         "auto", "avoid", "inherit");
-    Set<String> pitchLiterals0 = Set.of(
+    Set<String> pitchLiterals0 = j8().setOf(
         "high", "low", "x-high", "x-low");
-    Set<String> playDuringLiterals0 = Set.of(
+    Set<String> playDuringLiterals0 = j8().setOf(
         "auto", "inherit", "mix", "none", "repeat");
-    Set<String> positionLiterals0 = Set.of(
+    Set<String> positionLiterals0 = j8().setOf(
         "absolute", "relative", "static");
-    Set<String> speakLiterals0 = Set.of(
+    Set<String> speakLiterals0 = j8().setOf(
         "inherit", "none", "normal", "spell-out");
-    Set<String> speakHeaderLiterals0 = Set.of(
+    Set<String> speakHeaderLiterals0 = j8().setOf(
         "always", "inherit", "once");
-    Set<String> speakNumeralLiterals0 = Set.of(
+    Set<String> speakNumeralLiterals0 = j8().setOf(
         "continuous", "digits");
-    Set<String> speakPunctuationLiterals0 = Set.of(
+    Set<String> speakPunctuationLiterals0 = j8().setOf(
         "code", "inherit", "none");
-    Set<String> speechRateLiterals0 = Set.of(
+    Set<String> speechRateLiterals0 = j8().setOf(
         "fast", "faster", "slow", "slower", "x-fast", "x-slow");
-    Set<String> tableLayoutLiterals0 = Set.of(
+    Set<String> tableLayoutLiterals0 = j8().setOf(
         "auto", "fixed", "inherit");
-    Set<String> textAlignLiterals0 = Set.of(
+    Set<String> textAlignLiterals0 = j8().setOf(
         "center", "inherit", "justify");
-    Set<String> textDecorationLiterals0 = Set.of(
+    Set<String> textDecorationLiterals0 = j8().setOf(
         "blink", "line-through", "overline", "underline");
-    Set<String> textTransformLiterals0 = Set.of(
+    Set<String> textTransformLiterals0 = j8().setOf(
         "capitalize", "lowercase", "uppercase");
-    Set<String> textWrapLiterals0 = Set.of(
+    Set<String> textWrapLiterals0 = j8().setOf(
         "suppress", "unrestricted");
-    Set<String> unicodeBidiLiterals0 = Set.of(
+    Set<String> unicodeBidiLiterals0 = j8().setOf(
         "bidi-override", "embed");
-    Set<String> verticalAlignLiterals0 = Set.of(
+    Set<String> verticalAlignLiterals0 = j8().setOf(
         "baseline", "middle", "sub", "super", "text-bottom", "text-top");
-    Set<String> visibilityLiterals0 = Set.of(
+    Set<String> visibilityLiterals0 = j8().setOf(
         "collapse", "hidden", "inherit", "visible");
-    Set<String> voiceFamilyLiterals0 = Set.of(
+    Set<String> voiceFamilyLiterals0 = j8().setOf(
         "child", "female", "male");
-    Set<String> volumeLiterals0 = Set.of(
+    Set<String> volumeLiterals0 = j8().setOf(
         "loud", "silent", "soft", "x-loud", "x-soft");
-    Set<String> whiteSpaceLiterals0 = Set.of(
+    Set<String> whiteSpaceLiterals0 = j8().setOf(
         "-moz-pre-wrap", "-o-pre-wrap", "-pre-wrap", "nowrap", "pre",
         "pre-line", "pre-wrap");
-    Set<String> wordBreakLiterals0 = Set.of(
+    Set<String> wordBreakLiterals0 = j8().setOf(
         "break-all", "break-word", "keep-all", "normal");
-    Set<String> wordWrapLiterals0 = Set.of(
+    Set<String> wordWrapLiterals0 = j8().setOf(
         "anywhere", "break-word", "normal");
-    Set<String> rgb$FunLiterals0 = Set.of(",");
-    Set<String> linearGradient$FunLiterals0 = Set.of(
+    Set<String> rgb$FunLiterals0 = j8().setOf(",");
+    Set<String> linearGradient$FunLiterals0 = j8().setOf(
         ",", "to");
-    Set<String> radialGradient$FunLiterals0 = Set.of(
+    Set<String> radialGradient$FunLiterals0 = j8().setOf(
         "at", "closest-corner", "closest-side", "ellipse", "farthest-corner",
         "farthest-side");
-    Set<String> radialGradient$FunLiterals1 = Set.of(
+    Set<String> radialGradient$FunLiterals1 = j8().setOf(
         ",", "center", "circle");
-    Set<String> rect$FunLiterals0 = Set.of(",", "auto");
-	//Set<String> alpha$FunLiterals0 = Set.of("=", "opacity");
+    Set<String> rect$FunLiterals0 = j8().setOf(",", "auto");
+    //Set<String> alpha$FunLiterals0 = j8().setOf("=", "opacity");
     Property mozBorderRadius =
        new Property(5, mozBorderRadiusLiterals0, zeroFns);
     builder.put("-moz-border-radius", mozBorderRadius);
     Property mozBorderRadiusBottomleft =
-       new Property(5, Set.<String>of(), zeroFns);
+       new Property(5, j8().setOf(), zeroFns);
     builder.put("-moz-border-radius-bottomleft", mozBorderRadiusBottomleft);
     Property mozOpacity = new Property(1, mozOpacityLiterals0, zeroFns);
     builder.put("-moz-opacity", mozOpacity);
@@ -610,7 +609,7 @@ Property forKey(String propertyName) {
         0, union(emptyCellsLiterals0, mozOpacityLiterals0), zeroFns);
     builder.put("empty-cells", emptyCells);
     //builder.put("filter",
-    //            new Property(0, ImmutableSet.<String>of(), filterFunctions));
+    //            new Property(0, j8().setOf(), filterFunctions));
     @SuppressWarnings("unchecked")
     Property cssFloat = new Property(
         0, union(azimuthLiterals1, cueLiterals0), zeroFns);
@@ -864,7 +863,7 @@ private static <T> Set<T> union(Set<T>... subsets) {
     return Collections.unmodifiableSet(all);
   }
 
-  static final Set<String> DEFAULT_WHITELIST = Set.of(
+  static final Set<String> DEFAULT_WHITELIST = j8().setOf(
       "-moz-border-radius",
       "-moz-border-radius-bottomleft",
       "-moz-border-radius-bottomright",
diff --git a/src/main/java/org/owasp/html/CssTokens.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssTokens.java
similarity index 97%
rename from src/main/java/org/owasp/html/CssTokens.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssTokens.java
index 4c2ec3ad..ec6d1726 100644
--- a/src/main/java/org/owasp/html/CssTokens.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/CssTokens.java
@@ -31,8 +31,8 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.NoSuchElementException;
+import static org.owasp.shim.Java8Shim.j8;
 
 import javax.annotation.Nullable;
 
@@ -1464,32 +1464,32 @@ private static int[] truncateOrShare(int[] arr, int limit) {
    *     http://dev.w3.org/csswg/css-values/#other-units
    */
   private static final Trie<Integer> UNIT_TRIE = new Trie<>(
-      Map.ofEntries(
-        Map.entry("em", LENGTH_UNIT_TYPE),
-        Map.entry("ex", LENGTH_UNIT_TYPE),
-        Map.entry("ch", LENGTH_UNIT_TYPE),  // Width of zero character
-        Map.entry("rem", LENGTH_UNIT_TYPE),  // Root element font-size
-        Map.entry("vh", LENGTH_UNIT_TYPE),
-        Map.entry("vw", LENGTH_UNIT_TYPE),
-        Map.entry("vmin", LENGTH_UNIT_TYPE),
-        Map.entry("vmax", LENGTH_UNIT_TYPE),
-        Map.entry("px", LENGTH_UNIT_TYPE),
-        Map.entry("mm", LENGTH_UNIT_TYPE),
-        Map.entry("cm", LENGTH_UNIT_TYPE),
-        Map.entry("in", LENGTH_UNIT_TYPE),
-        Map.entry("pt", LENGTH_UNIT_TYPE),
-        Map.entry("pc", LENGTH_UNIT_TYPE),
-        Map.entry("deg", ANGLE_UNIT_TYPE),
-        Map.entry("rad", ANGLE_UNIT_TYPE),
-        Map.entry("grad", ANGLE_UNIT_TYPE),
-        Map.entry("turn", ANGLE_UNIT_TYPE),
-        Map.entry("s", TIME_UNIT_TYPE),
-        Map.entry("ms", TIME_UNIT_TYPE),
-        Map.entry("hz", FREQUENCY_UNIT_TYPE),
-        Map.entry("khz", FREQUENCY_UNIT_TYPE),
-        Map.entry("dpi", RESOLUTION_UNIT_TYPE),
-        Map.entry("dpcm", RESOLUTION_UNIT_TYPE),
-        Map.entry("dppx", RESOLUTION_UNIT_TYPE))
+      j8().mapOfEntries(
+        j8().mapEntry("em", LENGTH_UNIT_TYPE),
+        j8().mapEntry("ex", LENGTH_UNIT_TYPE),
+        j8().mapEntry("ch", LENGTH_UNIT_TYPE),  // Width of zero character
+        j8().mapEntry("rem", LENGTH_UNIT_TYPE),  // Root element font-size
+        j8().mapEntry("vh", LENGTH_UNIT_TYPE),
+        j8().mapEntry("vw", LENGTH_UNIT_TYPE),
+        j8().mapEntry("vmin", LENGTH_UNIT_TYPE),
+        j8().mapEntry("vmax", LENGTH_UNIT_TYPE),
+        j8().mapEntry("px", LENGTH_UNIT_TYPE),
+        j8().mapEntry("mm", LENGTH_UNIT_TYPE),
+        j8().mapEntry("cm", LENGTH_UNIT_TYPE),
+        j8().mapEntry("in", LENGTH_UNIT_TYPE),
+        j8().mapEntry("pt", LENGTH_UNIT_TYPE),
+        j8().mapEntry("pc", LENGTH_UNIT_TYPE),
+        j8().mapEntry("deg", ANGLE_UNIT_TYPE),
+        j8().mapEntry("rad", ANGLE_UNIT_TYPE),
+        j8().mapEntry("grad", ANGLE_UNIT_TYPE),
+        j8().mapEntry("turn", ANGLE_UNIT_TYPE),
+        j8().mapEntry("s", TIME_UNIT_TYPE),
+        j8().mapEntry("ms", TIME_UNIT_TYPE),
+        j8().mapEntry("hz", FREQUENCY_UNIT_TYPE),
+        j8().mapEntry("khz", FREQUENCY_UNIT_TYPE),
+        j8().mapEntry("dpi", RESOLUTION_UNIT_TYPE),
+        j8().mapEntry("dpcm", RESOLUTION_UNIT_TYPE),
+        j8().mapEntry("dppx", RESOLUTION_UNIT_TYPE))
         );
 
   static boolean isWellKnownUnit(CharSequence s, int start, int end) {
diff --git a/src/main/java/org/owasp/html/ElementAndAttributePolicies.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementAndAttributePolicies.java
similarity index 95%
rename from src/main/java/org/owasp/html/ElementAndAttributePolicies.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementAndAttributePolicies.java
index da4a0f2d..2fde9c86 100644
--- a/src/main/java/org/owasp/html/ElementAndAttributePolicies.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementAndAttributePolicies.java
@@ -34,6 +34,8 @@
 import java.util.Map;
 import javax.annotation.concurrent.Immutable;
 
+import static org.owasp.shim.Java8Shim.j8;
+
 /**
  * Encapsulates all the information needed by the
  * {@link ElementAndAttributePolicyBasedSanitizerPolicy} to sanitize one kind
@@ -54,7 +56,7 @@ final class ElementAndAttributePolicies {
       HtmlTagSkipType htmlTagSkipType) {
     this.elementName = elementName;
     this.elPolicy = elPolicy;
-    this.attrPolicies = Map.copyOf(attrPolicies);
+    this.attrPolicies = j8().mapCopyOf(attrPolicies);
     this.htmlTagSkipType = htmlTagSkipType;
   }
 
@@ -99,8 +101,7 @@ ElementAndAttributePolicies andGlobals(
             attrPolicy, globalAttrPolicy);
         if (!joined.equals(attrPolicy)) {
           if (anded == null) {
-            anded = new LinkedHashMap<>();
-            anded.putAll(this.attrPolicies);
+            anded = new LinkedHashMap<>(this.attrPolicies);
           }
           anded.put(attrName, joined);
         }
@@ -110,8 +111,7 @@ ElementAndAttributePolicies andGlobals(
       String attrName = e.getKey();
       if (!this.attrPolicies.containsKey(attrName)) {
         if (anded == null) {
-          anded = new LinkedHashMap<>();
-          anded.putAll(this.attrPolicies);
+          anded = new LinkedHashMap<>(this.attrPolicies);
         }
         anded.put(attrName, e.getValue());
       }
diff --git a/src/main/java/org/owasp/html/ElementAndAttributePolicyBasedSanitizerPolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementAndAttributePolicyBasedSanitizerPolicy.java
similarity index 97%
rename from src/main/java/org/owasp/html/ElementAndAttributePolicyBasedSanitizerPolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementAndAttributePolicyBasedSanitizerPolicy.java
index 4f78e2c8..0af4f51f 100644
--- a/src/main/java/org/owasp/html/ElementAndAttributePolicyBasedSanitizerPolicy.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementAndAttributePolicyBasedSanitizerPolicy.java
@@ -37,6 +37,8 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.owasp.shim.Java8Shim.j8;
+
 /**
  * A sanitizer policy that applies element and attribute policies to tags.
  */
@@ -63,12 +65,12 @@ class ElementAndAttributePolicyBasedSanitizerPolicy
       Map<String, ElementAndAttributePolicies> elAndAttrPolicies,
       Set<String> allowedTextContainers) {
     this.out = out;
-    this.elAndAttrPolicies = Map.copyOf(elAndAttrPolicies);
-    this.allowedTextContainers = Set.copyOf(allowedTextContainers);
+    this.elAndAttrPolicies = j8().mapCopyOf(elAndAttrPolicies);
+    this.allowedTextContainers = j8().setCopyOf(allowedTextContainers);
   }
 
   static final Set<String> SKIPPABLE_ELEMENT_CONTENT
-      = Set.of(
+      = j8().setOf(
           "script", "style", "noscript", "nostyle", "noembed", "noframes",
           "iframe", "object", "frame", "frameset", "title");
 
diff --git a/src/main/java/org/owasp/html/ElementPolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementPolicy.java
similarity index 100%
rename from src/main/java/org/owasp/html/ElementPolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/ElementPolicy.java
diff --git a/src/main/java/org/owasp/html/Encoding.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/Encoding.java
similarity index 100%
rename from src/main/java/org/owasp/html/Encoding.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/Encoding.java
diff --git a/src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java
similarity index 100%
rename from src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java
diff --git a/src/main/java/org/owasp/html/Handler.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/Handler.java
similarity index 96%
rename from src/main/java/org/owasp/html/Handler.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/Handler.java
index 73339a96..8a65ad84 100644
--- a/src/main/java/org/owasp/html/Handler.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/Handler.java
@@ -43,7 +43,7 @@ public interface Handler<T> {
   void handle(T x);
 
   /** A handler that does nothing given any input. */
-  public static final Handler<Object> DO_NOTHING = new Handler<>() {
+  public static final Handler<Object> DO_NOTHING = new Handler<Object>() {
     public void handle(Object x) {
       // Really, do nothing.
     }
diff --git a/src/main/java/org/owasp/html/HtmlChangeListener.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlChangeListener.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlChangeListener.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlChangeListener.java
diff --git a/src/main/java/org/owasp/html/HtmlChangeReporter.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlChangeReporter.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlChangeReporter.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlChangeReporter.java
diff --git a/src/main/java/org/owasp/html/HtmlElementTables.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlElementTables.java
similarity index 99%
rename from src/main/java/org/owasp/html/HtmlElementTables.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlElementTables.java
index e230b870..f5b176df 100644
--- a/src/main/java/org/owasp/html/HtmlElementTables.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlElementTables.java
@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import static org.owasp.shim.Java8Shim.j8;
 
 /**
  * Metadata about HTML elements.
@@ -123,7 +124,7 @@ public HtmlElementTables(
     COLGROUP_TAG = indexForName("colgroup");
     IFRAME_TAG = indexForName("iframe");
 
-    List<FreeWrapper> freeWrappers = List.of(
+    List<FreeWrapper> freeWrappers = j8().listOf(
         new FreeWrapper(
             LI_TAG,
             // LI_TAG is allowed here since an LI can appear when an LI is on
@@ -401,12 +402,12 @@ public static final class HtmlElementNames {
 
     /** */
     public HtmlElementNames(List<String> canonNames) {
-      this.canonNames = List.copyOf(canonNames);
+      this.canonNames = j8().listCopyOf(canonNames);
     }
 
     /** */
     HtmlElementNames(String... canonNames) {
-      this.canonNames = List.of(canonNames);
+      this.canonNames = j8().listOf(canonNames);
     }
 
     /**
@@ -721,7 +722,7 @@ public enum TextContentModelBit {
   }
 
   static final Comparator<int[]> COMPARE_BY_ZEROTH =
-      new Comparator<>() {
+      new Comparator<int[]>() {
         public int compare(int[] a, int[] b) {
           return Integer.compare(a[0], b[0]);
         }
diff --git a/src/main/java/org/owasp/html/HtmlElementTablesCanned.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlElementTablesCanned.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlElementTablesCanned.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlElementTablesCanned.java
diff --git a/src/main/java/org/owasp/html/HtmlEntities.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlEntities.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlEntities.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlEntities.java
diff --git a/src/main/java/org/owasp/html/HtmlLexer.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlLexer.java
similarity index 99%
rename from src/main/java/org/owasp/html/HtmlLexer.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlLexer.java
index cc6d2bbf..97783227 100644
--- a/src/main/java/org/owasp/html/HtmlLexer.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlLexer.java
@@ -34,6 +34,8 @@
 
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.owasp.shim.Java8Shim.j8;
+
 /**
  * A flexible lexer for HTML.
  * This is hairy code, but it is outside the TCB for the HTML sanitizer.
@@ -261,12 +263,12 @@ private static boolean isValuelessAttribute(String attribName) {
   }
 
   // From http://issues.apache.org/jira/browse/XALANC-519
-  private static final Set<String> VALUELESS_ATTRIB_NAMES = Set.of(
+  private static final Set<String> VALUELESS_ATTRIB_NAMES = j8().setOf(
       "checked", "compact", "declare", "defer", "disabled",
       "ismap", "multiple", "nohref", "noresize", "noshade",
       "nowrap", "readonly", "selected");
 
-  private static final Set<String> mixedCaseForeignAttributeNames = Set.of(
+  private static final Set<String> mixedCaseForeignAttributeNames = j8().setOf(
           "attributeName",
           "attributeType",
           "baseFrequency",
@@ -347,7 +349,7 @@ private static boolean isValuelessAttribute(String attribName) {
           "zoomAndPan"
   );
 
-  private static final Set<String> mixedCaseForeignElementNames = Set.of(
+  private static final Set<String> mixedCaseForeignElementNames = j8().setOf(
           "animateColor",
           "animateMotion",
           "animateTransform",
diff --git a/src/main/java/org/owasp/html/HtmlPolicyBuilder.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlPolicyBuilder.java
similarity index 98%
rename from src/main/java/org/owasp/html/HtmlPolicyBuilder.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlPolicyBuilder.java
index 54c0305f..d5a5df05 100644
--- a/src/main/java/org/owasp/html/HtmlPolicyBuilder.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlPolicyBuilder.java
@@ -46,6 +46,8 @@
 
 import org.owasp.html.ElementPolicy.JoinableElementPolicy;
 
+import static org.owasp.shim.Java8Shim.j8;
+
 /**
  * Conveniences for configuring policies for the {@link HtmlSanitizer}.
  *
@@ -163,7 +165,7 @@ public class HtmlPolicyBuilder {
    * output.
    */
   public static final Set<String> DEFAULT_SKIP_IF_EMPTY
-      = Set.of("a", "font", "img", "input", "span");
+      = j8().setOf("a", "font", "img", "input", "span");
 
   static final Map<String, HtmlTagSkipType> DEFAULT_SKIP_TAG_MAP_IF_EMPTY_ATTR;
   static {
@@ -185,7 +187,7 @@ public class HtmlPolicyBuilder {
    *      >About rel=noopener</a>
    */
   public static final List<String> DEFAULT_RELS_ON_TARGETTED_LINKS
-      = List.of("noopener", "noreferrer");
+      = j8().listOf("noopener", "noreferrer");
 
   static final String DEFAULT_RELS_ON_TARGETTED_LINKS_STR
       = DEFAULT_RELS_ON_TARGETTED_LINKS.stream().collect(Collectors.joining(" "));
@@ -539,7 +541,7 @@ public HtmlPolicyBuilder allowStyling(CssSchema whitelist) {
     // still not allowing styles when allowStyling is followed by a call to
     // disallowAttributesGlobally("style").
     this.allowAttributesGlobally(
-        AttributePolicy.IDENTITY_ATTRIBUTE_POLICY, List.of("style"));
+        AttributePolicy.IDENTITY_ATTRIBUTE_POLICY, j8().listOf("style"));
 
     return this;
   }
@@ -698,7 +700,7 @@ public PolicyFactory toFactory() {
 
     return new PolicyFactory(
         compiled.compiledPolicies, Collections.unmodifiableSet(textContainerSetBuilder),
-        Map.copyOf(compiled.globalAttrPolicies),
+        j8().mapCopyOf(compiled.globalAttrPolicies),
         preprocessor, postprocessor);
   }
 
@@ -740,7 +742,7 @@ private CompiledState compilePolicies() {
     Map<String, AttributePolicy> globalAttrPolicies
         = new LinkedHashMap<>(this.globalAttrPolicies);
     @SuppressWarnings("hiding")
-    Set<String> allowedProtocols = Set.copyOf(this.allowedProtocols);
+    Set<String> allowedProtocols = j8().setCopyOf(this.allowedProtocols);
 
     // Implement requireRelsOnLinks & skip...
     {
@@ -748,9 +750,9 @@ private CompiledState compilePolicies() {
       if (linkPolicy != null) {
         RelsOnLinksPolicy relsOnLinksPolicy = RelsOnLinksPolicy.create(
             this.extraRelsForLinks != null
-            ? this.extraRelsForLinks : Set.<String>of(),
+            ? this.extraRelsForLinks : j8().setOf(),
             this.skipRelsForLinks != null
-            ? this.skipRelsForLinks : Set.<String>of());
+            ? this.skipRelsForLinks : j8().setOf());
         elPolicies.put(
             "a",
             ElementPolicy.Util.join(linkPolicy, relsOnLinksPolicy));
@@ -810,7 +812,7 @@ private CompiledState compilePolicies() {
       Map<String, AttributePolicy> elAttrPolicies
           = attrPolicies.get(elementName);
       if (elAttrPolicies == null) {
-        elAttrPolicies = Map.of();
+        elAttrPolicies = j8().mapOfEntries();
       }
 
       Map<String, AttributePolicy> attrsBuilder
@@ -874,7 +876,7 @@ public final class AttributeBuilder {
     private AttributePolicy policy = AttributePolicy.IDENTITY_ATTRIBUTE_POLICY;
 
     AttributeBuilder(List<? extends String> attributeNames) {
-      this.attributeNames = List.copyOf(attributeNames);
+      this.attributeNames = j8().listCopyOf(attributeNames);
     }
 
     /**
@@ -928,7 +930,7 @@ public AttributeBuilder matching(
      */
     public AttributeBuilder matching(
         boolean ignoreCase, String... allowedValues) {
-      return matching(ignoreCase, Set.of(allowedValues));
+      return matching(ignoreCase, j8().setOf(allowedValues));
     }
 
     /**
@@ -939,7 +941,7 @@ public AttributeBuilder matching(
      */
     public AttributeBuilder matching(
         final boolean ignoreCase, Set<? extends String> allowedValues) {
-      final Set<String> allowed = Set.copyOf(allowedValues);
+      final Set<String> allowed = j8().setCopyOf(allowedValues);
       return matching(new AttributePolicy() {
         public @Nullable String apply(
             String elementName, String attributeName, String uncanonValue) {
@@ -995,7 +997,7 @@ private static final class RelsOnLinksPolicy
     final List<String> whenTargetPresent;
 
     static final RelsOnLinksPolicy EMPTY = new RelsOnLinksPolicy(
-        Set.<String>of(), Set.<String>of());
+        j8().setOf(), j8().setOf());
 
     static RelsOnLinksPolicy create(
         Set<? extends String> extra,
@@ -1007,13 +1009,13 @@ static RelsOnLinksPolicy create(
     RelsOnLinksPolicy(
         Set<? extends String> extra,
         Set<? extends String> skip) {
-      this.extra = Set.copyOf(extra);
-      this.skip = Set.copyOf(skip);
+      this.extra = j8().setCopyOf(extra);
+      this.skip = j8().setCopyOf(skip);
       Set<String> targetOnly = new HashSet<>();
       targetOnly.addAll(DEFAULT_RELS_ON_TARGETTED_LINKS);
       targetOnly.removeAll(extra);
       targetOnly.removeAll(skip);
-      this.whenTargetPresent = List.copyOf(targetOnly);
+      this.whenTargetPresent = j8().listCopyOf(targetOnly);
     }
 
     private static int indexOfAttributeValue(
diff --git a/src/main/java/org/owasp/html/HtmlSanitizer.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlSanitizer.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlSanitizer.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlSanitizer.java
diff --git a/src/main/java/org/owasp/html/HtmlStreamEventProcessor.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamEventProcessor.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlStreamEventProcessor.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamEventProcessor.java
diff --git a/src/main/java/org/owasp/html/HtmlStreamEventReceiver.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamEventReceiver.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlStreamEventReceiver.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamEventReceiver.java
diff --git a/src/main/java/org/owasp/html/HtmlStreamEventReceiverWrapper.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamEventReceiverWrapper.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlStreamEventReceiverWrapper.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamEventReceiverWrapper.java
diff --git a/src/main/java/org/owasp/html/HtmlStreamRenderer.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamRenderer.java
similarity index 99%
rename from src/main/java/org/owasp/html/HtmlStreamRenderer.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamRenderer.java
index c0c9d5bf..7e657ee1 100644
--- a/src/main/java/org/owasp/html/HtmlStreamRenderer.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlStreamRenderer.java
@@ -38,6 +38,8 @@
 import javax.annotation.WillCloseWhenClosed;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.owasp.shim.Java8Shim.j8;
+
 /**
  * Given a series of HTML tokens, writes valid, normalized HTML to the output.
  * The output will have well-defined tag boundaries, but there may be orphaned
@@ -481,5 +483,5 @@ private static boolean isTagEnd(char ch) {
     return ch < 63 && 0 != (TAG_ENDS & (1L << ch));
   }
 
-  private static final Set<String> foreignContentRootElementNames = Set.of("svg", "math");
+  private static final Set<String> foreignContentRootElementNames = j8().setOf("svg", "math");
 }
diff --git a/src/main/java/org/owasp/html/HtmlTagSkipType.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlTagSkipType.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlTagSkipType.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlTagSkipType.java
diff --git a/src/main/java/org/owasp/html/HtmlTextEscapingMode.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlTextEscapingMode.java
similarity index 81%
rename from src/main/java/org/owasp/html/HtmlTextEscapingMode.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlTextEscapingMode.java
index 3ccb5c8d..1fae9241 100644
--- a/src/main/java/org/owasp/html/HtmlTextEscapingMode.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlTextEscapingMode.java
@@ -29,6 +29,7 @@
 package org.owasp.html;
 
 import java.util.Map;
+import static org.owasp.shim.Java8Shim.j8;
 
 /**
  * From section 8.1.2.6 of http://www.whatwg.org/specs/web-apps/current-work/
@@ -83,14 +84,14 @@ public enum HtmlTextEscapingMode {
   ;
 
   private static final Map<String, HtmlTextEscapingMode> ESCAPING_MODES
-      = Map.ofEntries(
-      Map.entry("iframe", CDATA),
+      = j8().mapOfEntries(
+      j8().mapEntry("iframe", CDATA),
       // HTML5 does not treat listing as CDATA and treats XMP as deprecated,
       // but HTML2 does at
       // http://www.w3.org/MarkUp/1995-archive/NonStandard.html
       // Listing is not supported by browsers.
-      Map.entry("listing", CDATA_SOMETIMES),
-      Map.entry("xmp", CDATA),
+      j8().mapEntry("listing", CDATA_SOMETIMES),
+      j8().mapEntry("xmp", CDATA),
 
       // Technically, noembed, noscript and noframes are CDATA_SOMETIMES but
       // we can only be hurt by allowing tag content that looks like text so
@@ -98,40 +99,40 @@ public enum HtmlTextEscapingMode {
       //.put("noembed", CDATA_SOMETIMES)
       //.put("noframes", CDATA_SOMETIMES)
       //.put("noscript", CDATA_SOMETIMES)
-      Map.entry("comment", CDATA_SOMETIMES),  // IE only
+      j8().mapEntry("comment", CDATA_SOMETIMES),  // IE only
 
       // Runs till end of file.
-      Map.entry("plaintext", PLAIN_TEXT),
+      j8().mapEntry("plaintext", PLAIN_TEXT),
 
-      Map.entry("script", CDATA),
-      Map.entry("style", CDATA),
+      j8().mapEntry("script", CDATA),
+      j8().mapEntry("style", CDATA),
 
       // Textarea and Title are RCDATA, not CDATA, so decode entity references.
-      Map.entry("textarea", RCDATA),
-      Map.entry("title", RCDATA),
+      j8().mapEntry("textarea", RCDATA),
+      j8().mapEntry("title", RCDATA),
 
       // Nodes that can't contain content.
       // http://www.w3.org/TR/html-markup/syntax.html#void-elements
-      Map.entry("area", VOID),
-      Map.entry("base", VOID),
-      Map.entry("br", VOID),
-      Map.entry("col", VOID),
-      Map.entry("command", VOID),
-      Map.entry("embed", VOID),
-      Map.entry("hr", VOID),
-      Map.entry("img", VOID),
-      Map.entry("input", VOID),
-      Map.entry("keygen", VOID),
-      Map.entry("link", VOID),
-      Map.entry("meta", VOID),
-      Map.entry("param", VOID),
-      Map.entry("source", VOID),
-      Map.entry("track", VOID),
-      Map.entry("wbr", VOID),
+      j8().mapEntry("area", VOID),
+      j8().mapEntry("base", VOID),
+      j8().mapEntry("br", VOID),
+      j8().mapEntry("col", VOID),
+      j8().mapEntry("command", VOID),
+      j8().mapEntry("embed", VOID),
+      j8().mapEntry("hr", VOID),
+      j8().mapEntry("img", VOID),
+      j8().mapEntry("input", VOID),
+      j8().mapEntry("keygen", VOID),
+      j8().mapEntry("link", VOID),
+      j8().mapEntry("meta", VOID),
+      j8().mapEntry("param", VOID),
+      j8().mapEntry("source", VOID),
+      j8().mapEntry("track", VOID),
+      j8().mapEntry("wbr", VOID),
 
        // EMPTY per http://www.w3.org/TR/REC-html32#basefont
-      Map.entry("basefont", VOID),
-      Map.entry("isindex", VOID));
+      j8().mapEntry("basefont", VOID),
+      j8().mapEntry("isindex", VOID));
 
 
   /**
diff --git a/src/main/java/org/owasp/html/HtmlToken.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlToken.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlToken.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlToken.java
diff --git a/src/main/java/org/owasp/html/HtmlTokenType.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlTokenType.java
similarity index 100%
rename from src/main/java/org/owasp/html/HtmlTokenType.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/HtmlTokenType.java
diff --git a/src/main/java/org/owasp/html/IntVector.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/IntVector.java
similarity index 100%
rename from src/main/java/org/owasp/html/IntVector.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/IntVector.java
diff --git a/src/main/java/org/owasp/html/Joinable.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/Joinable.java
similarity index 100%
rename from src/main/java/org/owasp/html/Joinable.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/Joinable.java
diff --git a/src/main/java/org/owasp/html/JoinedAttributePolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/JoinedAttributePolicy.java
similarity index 100%
rename from src/main/java/org/owasp/html/JoinedAttributePolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/JoinedAttributePolicy.java
diff --git a/src/main/java/org/owasp/html/PolicyFactory.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/PolicyFactory.java
similarity index 100%
rename from src/main/java/org/owasp/html/PolicyFactory.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/PolicyFactory.java
diff --git a/src/main/java/org/owasp/html/Sanitizers.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/Sanitizers.java
similarity index 100%
rename from src/main/java/org/owasp/html/Sanitizers.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/Sanitizers.java
diff --git a/src/main/java/org/owasp/html/SrcsetAttributePolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/SrcsetAttributePolicy.java
similarity index 100%
rename from src/main/java/org/owasp/html/SrcsetAttributePolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/SrcsetAttributePolicy.java
diff --git a/src/main/java/org/owasp/html/StandardUrlAttributePolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/StandardUrlAttributePolicy.java
similarity index 100%
rename from src/main/java/org/owasp/html/StandardUrlAttributePolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/StandardUrlAttributePolicy.java
diff --git a/src/main/java/org/owasp/html/Strings.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/Strings.java
similarity index 100%
rename from src/main/java/org/owasp/html/Strings.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/Strings.java
diff --git a/src/main/java/org/owasp/html/StylingPolicy.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/StylingPolicy.java
similarity index 100%
rename from src/main/java/org/owasp/html/StylingPolicy.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/StylingPolicy.java
diff --git a/src/main/java/org/owasp/html/TCB.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/TCB.java
similarity index 100%
rename from src/main/java/org/owasp/html/TCB.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/TCB.java
diff --git a/src/main/java/org/owasp/html/TagBalancingHtmlStreamEventReceiver.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/TagBalancingHtmlStreamEventReceiver.java
similarity index 97%
rename from src/main/java/org/owasp/html/TagBalancingHtmlStreamEventReceiver.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/TagBalancingHtmlStreamEventReceiver.java
index a437baec..4fd86423 100644
--- a/src/main/java/org/owasp/html/TagBalancingHtmlStreamEventReceiver.java
+++ b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/TagBalancingHtmlStreamEventReceiver.java
@@ -29,6 +29,7 @@
 package org.owasp.html;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.List;
 
@@ -110,9 +111,9 @@ public void openTag(String elementName, List<String> attrs) {
 
     if (openElements.size() < nestingLimit) {
       underlying.openTag(METADATA.canonNameForIndex(elIndex), attrs);
-    }
-    if (!HtmlTextEscapingMode.isVoidElement(canonElementName)) {
-      openElements.add(elIndex);
+      if (!HtmlTextEscapingMode.isVoidElement(canonElementName)) {
+        openElements.add(elIndex);
+      }
     }
   }
 
@@ -482,9 +483,7 @@ private static boolean hasSpecialTextMode(int elementIndex) {
     //     "element in select scope"
     //     "element in table scope"
     SCOPE_FOR_END_TAG = new byte[METADATA.nElementTypes()];
-    for (int i = 0; i < SCOPE_FOR_END_TAG.length; ++i) {
-      SCOPE_FOR_END_TAG[i] = IN;
-    }
+    Arrays.fill(SCOPE_FOR_END_TAG, IN);
     SCOPE_FOR_END_TAG[METADATA.indexForName("caption")]
       = SCOPE_FOR_END_TAG[METADATA.indexForName("col")]
       = SCOPE_FOR_END_TAG[METADATA.indexForName("colgroup")]
@@ -504,7 +503,12 @@ private static boolean hasSpecialTextMode(int elementIndex) {
   private void dumpState(String msg) {
     System.err.println(msg);
     System.err.println("\tstack");
-    for (int i = 0, n = openElements.size(); i < n; ++i) {
+    int nOpen = openElements.size();
+    int maxStackToDump = 5;
+    if (nOpen > maxStackToDump) {
+      System.err.println("\t\t" + (nOpen - maxStackToDump) + " elided");
+    }
+    for (int i = Math.max(0, nOpen - maxStackToDump); i < nOpen; ++i) {
       int idx = openElements.get(i);
       System.err.println("\t\t" + METADATA.canonNameForIndex(idx));
     }
diff --git a/src/main/java/org/owasp/html/TokenStream.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/TokenStream.java
similarity index 100%
rename from src/main/java/org/owasp/html/TokenStream.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/TokenStream.java
diff --git a/src/main/java/org/owasp/html/Trie.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/Trie.java
similarity index 100%
rename from src/main/java/org/owasp/html/Trie.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/Trie.java
diff --git a/src/main/java/org/owasp/html/examples/EbayPolicyExample.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/examples/EbayPolicyExample.java
similarity index 100%
rename from src/main/java/org/owasp/html/examples/EbayPolicyExample.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/examples/EbayPolicyExample.java
diff --git a/src/main/java/org/owasp/html/examples/SlashdotPolicyExample.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/examples/SlashdotPolicyExample.java
similarity index 100%
rename from src/main/java/org/owasp/html/examples/SlashdotPolicyExample.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/examples/SlashdotPolicyExample.java
diff --git a/src/main/java/org/owasp/html/examples/UrlTextExample.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/examples/UrlTextExample.java
similarity index 100%
rename from src/main/java/org/owasp/html/examples/UrlTextExample.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/examples/UrlTextExample.java
diff --git a/src/main/java/org/owasp/html/package-info.java b/owasp-java-html-sanitizer/src/main/java/org/owasp/html/package-info.java
similarity index 100%
rename from src/main/java/org/owasp/html/package-info.java
rename to owasp-java-html-sanitizer/src/main/java/org/owasp/html/package-info.java
diff --git a/src/test/java/org/owasp/html/AllExamples.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/AllExamples.java
similarity index 100%
rename from src/test/java/org/owasp/html/AllExamples.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/AllExamples.java
diff --git a/src/test/java/org/owasp/html/AntiSamyBenchmark.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/AntiSamyBenchmark.java
similarity index 100%
rename from src/test/java/org/owasp/html/AntiSamyBenchmark.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/AntiSamyBenchmark.java
diff --git a/src/test/java/org/owasp/html/AntiSamyTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/AntiSamyTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/AntiSamyTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/AntiSamyTest.java
diff --git a/src/test/java/org/owasp/html/Benchmark.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/Benchmark.java
similarity index 99%
rename from src/test/java/org/owasp/html/Benchmark.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/Benchmark.java
index ea172b7d..e4a917ad 100644
--- a/src/test/java/org/owasp/html/Benchmark.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/Benchmark.java
@@ -147,7 +147,7 @@ private static String sanitize(String html) {
     StringBuilder sb = new StringBuilder(html.length());
 
     final HtmlStreamRenderer renderer = HtmlStreamRenderer.create(
-        sb, new Handler<>() {
+        sb, new Handler<String>() {
 
           public void handle(String x) {
             throw new AssertionError(x);
diff --git a/src/test/java/org/owasp/html/CssFuzzerTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssFuzzerTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/CssFuzzerTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssFuzzerTest.java
diff --git a/src/test/java/org/owasp/html/CssGrammarTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssGrammarTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/CssGrammarTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssGrammarTest.java
diff --git a/src/test/java/org/owasp/html/CssSchemaTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssSchemaTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/CssSchemaTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssSchemaTest.java
diff --git a/src/test/java/org/owasp/html/CssTokensTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssTokensTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/CssTokensTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/CssTokensTest.java
diff --git a/src/test/java/org/owasp/html/ElementPolicyTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/ElementPolicyTest.java
similarity index 94%
rename from src/test/java/org/owasp/html/ElementPolicyTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/ElementPolicyTest.java
index 00a4aff5..e612d204 100644
--- a/src/test/java/org/owasp/html/ElementPolicyTest.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/ElementPolicyTest.java
@@ -13,6 +13,7 @@
 import static org.owasp.html.ElementPolicy.REJECT_ALL_ELEMENT_POLICY;
 import static org.owasp.html.ElementPolicy.IDENTITY_ELEMENT_POLICY;
 import static org.owasp.html.ElementPolicy.Util.join;
+import static org.owasp.shim.Java8Shim.j8;
 
 @SuppressWarnings("javadoc")
 public final class ElementPolicyTest extends TestCase {
@@ -47,11 +48,11 @@ private static void assertPassed(ElementPolicy p, String... expected) {
     assertEquals(p.toString(), Arrays.asList(expected), actual);
   }
 
-  private static List<String> TEST_EL_NAMES = List.of(
+  private static List<String> TEST_EL_NAMES = j8().listOf(
       "abacus", "abracadabra", "bar", "foo", "far", "cadr", "cdr");
 
   @Test
-  public static final void testJoin() {
+  public final void testJoin() {
     ElementPolicy a = new HasCharElementPolicy('a');
     ElementPolicy b = new HasCharElementPolicy('b');
     ElementPolicy c = new HasCharElementPolicy('c');
diff --git a/src/test/java/org/owasp/html/EncodingTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/EncodingTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/EncodingTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/EncodingTest.java
diff --git a/src/test/java/org/owasp/html/ExamplesTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/ExamplesTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/ExamplesTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/ExamplesTest.java
diff --git a/src/test/java/org/owasp/html/FuzzyTestCase.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/FuzzyTestCase.java
similarity index 100%
rename from src/test/java/org/owasp/html/FuzzyTestCase.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/FuzzyTestCase.java
diff --git a/src/test/java/org/owasp/html/HtmlChangeReporterTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlChangeReporterTest.java
similarity index 98%
rename from src/test/java/org/owasp/html/HtmlChangeReporterTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlChangeReporterTest.java
index 20643932..3b8f4357 100644
--- a/src/test/java/org/owasp/html/HtmlChangeReporterTest.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlChangeReporterTest.java
@@ -40,14 +40,14 @@ static class Context {
   }
 
   @Test
-  public static final void testChangeReporting() {
+  public final void testChangeReporting() {
     final Context testContext = new Context();
 
     StringBuilder out = new StringBuilder();
     final StringBuilder log = new StringBuilder();
     HtmlStreamRenderer renderer = HtmlStreamRenderer.create(
         out, Handler.DO_NOTHING);
-    HtmlChangeListener<Context> listener = new HtmlChangeListener<>() {
+    HtmlChangeListener<Context> listener = new HtmlChangeListener<Context>() {
       public void discardedTag(Context context, String elementName) {
         assertSame(testContext, context);
         log.append('<').append(elementName).append("> ");
diff --git a/src/test/java/org/owasp/html/HtmlElementTablesTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlElementTablesTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/HtmlElementTablesTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlElementTablesTest.java
diff --git a/src/test/java/org/owasp/html/HtmlLexerTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlLexerTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/HtmlLexerTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlLexerTest.java
diff --git a/src/test/java/org/owasp/html/HtmlPolicyBuilderFuzzerTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlPolicyBuilderFuzzerTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/HtmlPolicyBuilderFuzzerTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlPolicyBuilderFuzzerTest.java
diff --git a/src/test/java/org/owasp/html/HtmlPolicyBuilderTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlPolicyBuilderTest.java
similarity index 86%
rename from src/test/java/org/owasp/html/HtmlPolicyBuilderTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlPolicyBuilderTest.java
index 6655e5c8..3ac35180 100644
--- a/src/test/java/org/owasp/html/HtmlPolicyBuilderTest.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlPolicyBuilderTest.java
@@ -28,23 +28,21 @@
 
 package org.owasp.html;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import org.junit.Test;
 
 import junit.framework.TestCase;
 
-@SuppressWarnings("javadoc")
+import static org.owasp.shim.Java8Shim.j8;
+
+@SuppressWarnings({"javadoc", "HttpUrlsUsage", "RedundantSuppression", "UnnecessaryUnicodeEscape"})
 public class HtmlPolicyBuilderTest extends TestCase {
 
-  static final String EXAMPLE = Arrays.stream(new String[] {
+  static final String EXAMPLE = String.join(
+      "\n",
       "<h1 id='foo'>Header</h1>",
       "<p onclick='alert(42)'>Paragraph 1<script>evil()</script></p>",
       ("<p><a href='java\0script:bad()'>Click</a> <a href='foo.html'>me</a>"
@@ -56,12 +54,14 @@ public class HtmlPolicyBuilderTest extends TestCase {
       "          /* direction: ltr */; font-weight: bold'>Stylish Para 1</p>",
       "<p style='color: red; font-weight; expression(foo());",
       "          direction: rtl; font-weight: bold'>Stylish Para 2</p>",
-      ""}).collect(Collectors.joining("\n"));
+      "");
 
   @Test
-  public static final void testTextFilter() {
+  public final void testTextFilter() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
+
             "Header",
             "Paragraph 1",
             "Click me out",
@@ -69,14 +69,15 @@ public static final void testTextFilter() {
             "Fancy with soupy tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()));
   }
 
   @Test
-  public static final void testCannedFormattingTagFilter() {
+  public final void testCannedFormattingTagFilter() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             "Click me out",
@@ -84,15 +85,16 @@ public static final void testCannedFormattingTagFilter() {
             "<b>Fancy</b> with <i><b>soupy</b></i><b> tags</b>.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowCommonInlineFormattingElements()));
   }
 
   @Test
-  public static final void testCannedFormattingTagFilterNoItalics() {
+  public final void testCannedFormattingTagFilterNoItalics() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             "Click me out",
@@ -100,16 +102,17 @@ public static final void testCannedFormattingTagFilterNoItalics() {
             "<b>Fancy</b> with <b>soupy</b><b> tags</b>.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowCommonInlineFormattingElements()
               .disallowElements("I")));
   }
 
   @Test
-  public static final void testSimpleTagFilter() {
+  public final void testSimpleTagFilter() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "<h1>Header</h1>",
             "Paragraph 1",
             "Click me out",
@@ -117,15 +120,16 @@ public static final void testSimpleTagFilter() {
             "Fancy with <i>soupy</i> tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowElements("h1", "i")));
   }
 
   @Test
-  public static final void testLinksAllowed() {
+  public final void testLinksAllowed() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             // We haven't allowed any protocols so only relative URLs are OK.
@@ -134,16 +138,17 @@ public static final void testLinksAllowed() {
             "Fancy with soupy tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowElements("a")
               .allowAttributes("href").onElements("a")));
   }
 
   @Test
-  public static final void testExternalLinksAllowed() {
+  public final void testExternalLinksAllowed() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             "Click <a href=\"foo.html\">me</a>"
@@ -152,7 +157,7 @@ public static final void testExternalLinksAllowed() {
             "Fancy with soupy tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowElements("a")
               // Allows http.
@@ -161,9 +166,10 @@ public static final void testExternalLinksAllowed() {
   }
 
   @Test
-  public static final void testLinksWithNofollow() {
+  public final void testLinksWithNofollow() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             "Click <a href=\"foo.html\" rel=\"nofollow\">me</a> out",
@@ -171,7 +177,7 @@ public static final void testLinksWithNofollow() {
             "Fancy with soupy tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowElements("a")
               // Allows http.
@@ -180,7 +186,7 @@ public static final void testLinksWithNofollow() {
   }
 
   @Test
-  public static final void testLinksWithNofollowAlreadyPresent() {
+  public final void testLinksWithNofollowAlreadyPresent() {
     assertEquals(
         "html <a href=\"/\" rel=\"nofollow\">link</a>",
         apply(
@@ -192,9 +198,10 @@ public static final void testLinksWithNofollowAlreadyPresent() {
   }
 
   @Test
-  public static final void testImagesAllowed() {
+  public final void testImagesAllowed() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             "Click me out",
@@ -203,7 +210,7 @@ public static final void testImagesAllowed() {
             "Fancy with soupy tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowElements("img")
               .allowAttributes("src", "alt").onElements("img")
@@ -211,9 +218,10 @@ public static final void testImagesAllowed() {
   }
 
   @Test
-  public static final void testStyleFiltering() {
+  public final void testStyleFiltering() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "<h1>Header</h1>",
             "<p>Paragraph 1</p>",
             "<p>Click me out</p>",
@@ -223,7 +231,7 @@ public static final void testStyleFiltering() {
              + "Stylish Para 1</p>"),
             ("<p style=\"color:red;direction:rtl;font-weight:bold\">"
              + "Stylish Para 2</p>"),
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowCommonInlineFormattingElements()
               .allowCommonBlockElements()
@@ -234,7 +242,8 @@ public static final void testStyleFiltering() {
   @Test
   public void testSpecificStyleFilterung() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "<h1>Header</h1>",
             "<p>Paragraph 1</p>",
             "<p>Click me out</p>",
@@ -242,19 +251,20 @@ public void testSpecificStyleFilterung() {
             "<p><b>Fancy</b> with <i><b>soupy</b></i><b> tags</b>.",
             "</p><p style=\"text-align:center\">Stylish Para 1</p>",
             "<p style=\"color:red\">Stylish Para 2</p>",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowCommonInlineFormattingElements()
               .allowCommonBlockElements()
               .allowStyling(CssSchema.withProperties(
-                  List.of("color", "text-align", "font-size")))
+                  j8().listOf("color", "text-align", "font-size")))
               .allowStandardUrlProtocols()));
   }
 
   @Test
   public void testCustomPropertyStyleFiltering() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "<h1>Header</h1>",
             "<p>Paragraph 1</p>",
             "<p>Click me out</p>",
@@ -262,23 +272,25 @@ public void testCustomPropertyStyleFiltering() {
             "<p><b>Fancy</b> with <i><b>soupy</b></i><b> tags</b>.",
             "</p><p style=\"text-align:center\">Stylish Para 1</p>",
             "<p>Stylish Para 2</p>",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowCommonInlineFormattingElements()
               .allowCommonBlockElements()
               .allowStyling(
                   CssSchema.withProperties(
-                      Map.of("text-align",
-                          new CssSchema.Property(0,
-                              Set.of("center"),
-                              Collections.emptyMap()))))
+                      j8().mapOfEntries(
+                          j8().mapEntry("text-align",
+                              new CssSchema.Property(0,
+                                  j8().setOf("center"),
+                                  j8().mapOfEntries())))))
               .allowStandardUrlProtocols()));
   }
 
   @Test
   public void testUnionStyleFiltering() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "<h1>Header</h1>",
             "<p>Paragraph 1</p>",
             "<p>Click me out</p>",
@@ -286,21 +298,22 @@ public void testUnionStyleFiltering() {
             "<p><b>Fancy</b> with <i><b>soupy</b></i><b> tags</b>.",
             "</p><p style=\"text-align:center\">Stylish Para 1</p>",
             "<p style=\"color:red\">Stylish Para 2</p>",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowCommonInlineFormattingElements()
               .allowCommonBlockElements()
               .allowStyling(CssSchema.withProperties(
-                  List.of("color", "text-align")))
+                  j8().listOf("color", "text-align")))
               .allowStyling( // union allowed style properties
-                   CssSchema.withProperties(List.of("font-size")))
+                   CssSchema.withProperties(j8().listOf("font-size")))
               .allowStandardUrlProtocols()));
   }
 
   @Test
   public void testCustomPropertyStyleFilteringDisallowed() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "<h1>Header</h1>",
             "<p>Paragraph 1</p>",
             "<p>Click me out</p>",
@@ -308,23 +321,25 @@ public void testCustomPropertyStyleFilteringDisallowed() {
             "<p><b>Fancy</b> with <i><b>soupy</b></i><b> tags</b>.",
             "</p><p>Stylish Para 1</p>",
             "<p>Stylish Para 2</p>",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowCommonInlineFormattingElements()
               .allowCommonBlockElements()
               .allowStyling(
                       CssSchema.withProperties(
-                          Map.of("text-align",
-                              new CssSchema.Property(0,
-                                  Set.of("left", "right"),
-                                  Collections.emptyMap()))))
+                          j8().mapOfEntries(
+                              j8().mapEntry("text-align",
+                                  new CssSchema.Property(0,
+                                      j8().setOf("left", "right"),
+                                      j8().mapOfEntries())))))
               .allowStandardUrlProtocols()));
   }
 
   @Test
-  public static final void testElementTransforming() {
+  public final void testElementTransforming() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "<div class=\"header-h1\">Header</div>",
             "<p>Paragraph 1</p>",
             "<p>Click me out</p>",
@@ -332,40 +347,35 @@ public static final void testElementTransforming() {
             "<p>Fancy with soupy tags.",
             "</p><p>Stylish Para 1</p>",
             "<p>Stylish Para 2</p>",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
               .allowElements("h1", "p", "div")
               .allowElements(
-                  new ElementPolicy() {
-                    public String apply(
-                        String elementName, List<String> attrs) {
-                      attrs.add("class");
-                      attrs.add("header-" + elementName);
-                      return "div";
-                    }
-                  }, "h1")));
+                  (elementName, attrs) -> {
+                    attrs.add("class");
+                    attrs.add("header-" + elementName);
+                    return "div";
+                  },
+                  "h1")));
   }
 
   @Test
-  public static final void testBodyTransforming() {
+  public final void testBodyTransforming() {
     assertEquals(
         "<div>foo</div>",
         apply(
             new HtmlPolicyBuilder()
             .allowElements(
-                new ElementPolicy() {
-                  public String apply(String elementName, List<String> attrs) {
-                    return "div";
-                  }
-                },
+                (elementName, attrs) -> "div",
                 "body")
             .allowElements("div"),
             "<body>foo</body>"));
   }
   @Test
-  public static final void testAllowUrlProtocols() {
+  public final void testAllowUrlProtocols() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             "Click me out",
@@ -374,7 +384,7 @@ public static final void testAllowUrlProtocols() {
             "Fancy with soupy tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
             .allowElements("img")
             .allowAttributes("src", "alt").onElements("img")
@@ -382,9 +392,10 @@ public static final void testAllowUrlProtocols() {
   }
 
   @Test
-  public static final void testDisallowUrlProtocols() {
+  public final void testDisallowUrlProtocols() {
     assertEquals(
-        Arrays.stream(new String[] {
+        String.join(
+            "\n",
             "Header",
             "Paragraph 1",
             "Click me out",
@@ -392,7 +403,7 @@ public static final void testDisallowUrlProtocols() {
             "Fancy with soupy tags.",
             "Stylish Para 1",
             "Stylish Para 2",
-            ""}).collect(Collectors.joining("\n")),
+            ""),
         apply(new HtmlPolicyBuilder()
             .allowElements("img")
             .allowAttributes("src", "alt").onElements("img")
@@ -401,7 +412,7 @@ public static final void testDisallowUrlProtocols() {
   }
 
   @Test
-  public static final void testPossibleFalloutFromIssue5() {
+  public final void testPossibleFalloutFromIssue5() {
     assertEquals(
         "Bad",
         apply(
@@ -414,7 +425,7 @@ public static final void testPossibleFalloutFromIssue5() {
   }
 
   @Test
-  public static final void testTextInOption() {
+  public final void testTextInOption() {
     assertEquals(
         "<select><option>1</option><option>2</option></select>",
         apply(
@@ -425,7 +436,7 @@ public static final void testTextInOption() {
   }
 
   @Test
-  public static final void testEntities() {
+  public final void testEntities() {
     assertEquals(
         "(Foo)\u00a0(Bar)\u2666\u2666\u2666\u2666(Baz)"
         + "&#x14834;&#x14834;&#x14834;(Boo)",
@@ -436,7 +447,7 @@ public static final void testEntities() {
   }
 
   @Test
-  public static final void testImageTag() {
+  public final void testImageTag() {
     assertEquals(
         ""
         + "<img src=\"http://example.com/foo.png\" />"
@@ -463,7 +474,7 @@ public String apply(String elementName, List<String> attrs) {
   }
 
   @Test
-  public static final void testImgSrcsetSyntax() {
+  public final void testImgSrcsetSyntax() {
     assertEquals(
         ""
         + "<img srcset=\"http://example.com/foo.png\" />\n"
@@ -523,7 +534,7 @@ public static final void testImgSrcsetSyntax() {
   }
 
   @Test
-  public static final void testUrlChecksLayer() {
+  public final void testUrlChecksLayer() {
     assertEquals(
         ""
         + "<img src=\"http://example.com/OK.png\" />\n"
@@ -546,7 +557,7 @@ public static final void testUrlChecksLayer() {
   }
 
   @Test
-  public static final void testDuplicateAttributesDoNotReachElementPolicy() {
+  public final void testDuplicateAttributesDoNotReachElementPolicy() {
     final int[] idCount = new int[1];
     assertEquals(
         // The id that is emitted is the first that passes the attribute
@@ -584,7 +595,7 @@ public String apply(
   }
 
   @Test
-  public static final void testPreprocessors() {
+  public final void testPreprocessors() {
     String input =
         "<h1 title='foo'>one</h1> <h2>Two!</h2> <h3>three</h3>"
         + " <h4>Four</h4> <h5>5</h5> <h6>seis</h6>";
@@ -654,7 +665,7 @@ public String toString() {
 
 
   @Test
-  public static final void testPostprocessors() {
+  public final void testPostprocessors() {
     String input =
         "<h1 title='foo'>one</h1> <h2>TWO!</h2> <h3>three</h3>"
         + " <h4>Four</h4> <h5>5</h5> <h6>seis</h6>";
@@ -732,7 +743,7 @@ public String toString() {
   }
 
   @Test
-  public static final void testBackgroundImageWithUrl() {
+  public final void testBackgroundImageWithUrl() {
     PolicyFactory policy = new HtmlPolicyBuilder()
         .allowStandardUrlProtocols()
         .allowStyling()
@@ -756,7 +767,7 @@ public static final void testBackgroundImageWithUrl() {
   }
 
   @Test
-  public static final void testBackgroundImageWithImageFunction() {
+  public final void testBackgroundImageWithImageFunction() {
     PolicyFactory policy = new HtmlPolicyBuilder()
         .allowStandardUrlProtocols()
         .allowStyling()
@@ -780,7 +791,7 @@ public static final void testBackgroundImageWithImageFunction() {
   }
 
   @Test
-  public static final void testBackgroundWithUrls() {
+  public final void testBackgroundWithUrls() {
     HtmlPolicyBuilder builder = new HtmlPolicyBuilder()
         .allowStandardUrlProtocols()
         .allowStyling()
@@ -803,7 +814,7 @@ public static final void testBackgroundWithUrls() {
   }
 
   @Test
-  public static final void testBackgroundsThatViolateGlobalUrlPolicy() {
+  public final void testBackgroundsThatViolateGlobalUrlPolicy() {
     PolicyFactory policy = new HtmlPolicyBuilder()
         .allowStandardUrlProtocols()
         .allowStyling()
@@ -820,7 +831,7 @@ public static final void testBackgroundsThatViolateGlobalUrlPolicy() {
   }
 
   @Test
-  public static final void testSpanTagFilter() {
+  public final void testSpanTagFilter() {
     PolicyFactory policy = new HtmlPolicyBuilder()
         .allowElements("span")
         .allowWithoutAttributes("span")
@@ -834,7 +845,7 @@ public static final void testSpanTagFilter() {
   }
 
   @Test
-  public static final void testLinkRels() {
+  public final void testLinkRels() {
     HtmlPolicyBuilder b = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href").onElements("a")
@@ -883,7 +894,7 @@ public static final void testLinkRels() {
   }
 
   @Test
-  public static final void testLinkRelsWhenRelPresent() {
+  public final void testLinkRelsWhenRelPresent() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href").onElements("a")
@@ -925,7 +936,7 @@ public final void testRelLinksWhenRelIsPartOfData() {
   }
 
   @Test
-  public static final void testRelLinksWithDuplicateRels() {
+  public final void testRelLinksWithDuplicateRels() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href").onElements("a")
@@ -937,7 +948,7 @@ public static final void testRelLinksWithDuplicateRels() {
   }
 
   @Test
-  public static final void testRelLinksWithDuplicateRelsRequired() {
+  public final void testRelLinksWithDuplicateRelsRequired() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href").onElements("a")
@@ -950,7 +961,7 @@ public static final void testRelLinksWithDuplicateRelsRequired() {
   }
 
   @Test
-  public static final void testFailFastOnSpaceSeparatedStrings() {
+  public final void testFailFastOnSpaceSeparatedStrings() {
     boolean failed;
     try {
       // Should be ("nofollow", "noreferrer")
@@ -970,7 +981,7 @@ public static final void testFailFastOnSpaceSeparatedStrings() {
   }
 
   @Test
-  public static final void testEmptyDefaultLinkRelsSet() {
+  public final void testEmptyDefaultLinkRelsSet() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href", "target").onElements("a")
@@ -984,7 +995,7 @@ public static final void testEmptyDefaultLinkRelsSet() {
   }
 
   @Test
-  public static final void testRequireAndSkipRels() {
+  public final void testRequireAndSkipRels() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href", "target").onElements("a")
@@ -1007,7 +1018,7 @@ public static final void testRequireAndSkipRels() {
   }
 
   @Test
-  public static final void testSkipAndRequireRels() {
+  public final void testSkipAndRequireRels() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href", "target").onElements("a")
@@ -1030,10 +1041,10 @@ public static final void testSkipAndRequireRels() {
   }
 
   @Test
-  public static final void testOverflowWrap() {
+  public final void testOverflowWrap() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("span")
-        .allowStyling(CssSchema.union(CssSchema.DEFAULT, CssSchema.withProperties(List.of("overflow-wrap"))))
+        .allowStyling(CssSchema.union(CssSchema.DEFAULT, CssSchema.withProperties(j8().listOf("overflow-wrap"))))
         .toFactory();
 
     assertEquals(
@@ -1050,7 +1061,7 @@ public static final void testOverflowWrap() {
   }
 
   @Test
-  public static final void testOverflowWrapNotAllowed() {
+  public final void testOverflowWrapNotAllowed() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("span")
         .allowStyling()
@@ -1062,7 +1073,7 @@ public static final void testOverflowWrapNotAllowed() {
   }
 
   @Test
-  public static final void testExplicitRelsSkip() {
+  public final void testExplicitRelsSkip() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("a")
         .allowAttributes("href", "target", "rel").onElements("a")
@@ -1088,7 +1099,7 @@ public static final void testExplicitRelsSkip() {
   }
 
   @Test
-  public static final void testScopingExitInNoContent() {
+  public final void testScopingExitInNoContent() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("table", "tr", "td", "noscript")
         .toFactory();
@@ -1100,7 +1111,7 @@ public static final void testScopingExitInNoContent() {
   }
 
   @Test
-  public static final void testIssue80() {
+  public final void testIssue80() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("table", "tr", "td", "tbody")
         .toFactory();
@@ -1117,7 +1128,7 @@ public static final void testIssue80() {
   }
 
   @Test
-  public static final void testDirLi() {
+  public final void testDirLi() {
     assertEquals(
         "<dir compact=\"compact\"><li>something</li></dir>",
         apply(
@@ -1186,25 +1197,23 @@ public void testCreativeCSSStyling() {
   }
 
   @Test
-  public static void testScriptTagWithCommentBlockContainingHtmlCommentEnd() {
+  public final void testScriptTagWithCommentBlockContainingHtmlCommentEnd() {
     PolicyFactory scriptSanitizer = new HtmlPolicyBuilder()
         // allow scripts of type application/json
         .allowElements(
-            new ElementPolicy() {
-              public String apply(String elementName, List<String> attrs) {
-                int typeIndex = attrs.indexOf("type");
-                if (typeIndex < 0 || attrs.size() < typeIndex + 1
-                    || !attrs.get(typeIndex + 1).equals("application/json")) {
-                  return null;
-                }
-                return elementName;
+            (elementName, attrs) -> {
+              int typeIndex = attrs.indexOf("type");
+              if (typeIndex < 0 || attrs.size() < typeIndex + 1
+                  || !attrs.get(typeIndex + 1).equals("application/json")) {
+                return null;
               }
+              return elementName;
             },
             "script")
         // allow contents in this script tag
         .allowTextIn("script")
         // keep type attribute in application/json script tag
-        .allowAttributes("type").matching(true, Set.of("application/json")).onElements("script")
+        .allowAttributes("type").matching(true, j8().setOf("application/json")).onElements("script")
         .toFactory();
 
     String mismatchedHtmlComments = "<script type=\"application/json\">\n" +
@@ -1227,7 +1236,7 @@ public String apply(String elementName, List<String> attrs) {
   }
 
   @Test
-  public static final void testNoscriptInAttribute() {
+  public final void testNoscriptInAttribute() {
     PolicyFactory pf = new HtmlPolicyBuilder()
         .allowElements("img", "p", "noscript")
         .allowAttributes("title").globally()
@@ -1244,7 +1253,7 @@ public static final void testNoscriptInAttribute() {
   }
 
   @Test
-  public static final void testTableStructure() {
+  public final void testTableStructure() {
     String input =
         "<TABLE>"
         + "<TR><TD>Foo<TD>Bar"
@@ -1261,7 +1270,7 @@ public static final void testTableStructure() {
   }
 
   @Test
-  public static final void testSvgNames() {
+  public final void testSvgNames() {
     PolicyFactory policyFactory = new HtmlPolicyBuilder()
             .allowElements("svg", "animateColor")
             .allowAttributes("viewBox").onElements("svg")
@@ -1271,7 +1280,7 @@ public static final void testSvgNames() {
   }
 
   @Test
-  public static final void testTextareaIsNotTextArea() {
+  public final void testTextareaIsNotTextArea() {
     String input = "<textarea>x</textarea><textArea>y</textArea>";
     PolicyFactory textareaPolicy = new HtmlPolicyBuilder().allowElements("textarea").toFactory();
     PolicyFactory textAreaPolicy = new HtmlPolicyBuilder().allowElements("textArea").toFactory();
@@ -1280,33 +1289,32 @@ public static final void testTextareaIsNotTextArea() {
   }
 
   @Test
-  public static final void testHtmlPolicyBuilderDefinitionWithNoAttributesDefinedGlobally() {
+  public final void testHtmlPolicyBuilderDefinitionWithNoAttributesDefinedGlobally() {
     // Does not crash with a runtime exception
     new HtmlPolicyBuilder().allowElements().allowAttributes().globally().toFactory();
   }
 
   @Test
-  public static final void testCSSFontSize() {
-	 HtmlPolicyBuilder builder = new HtmlPolicyBuilder();
- 	 PolicyFactory factory = builder.allowElements("span")
- 	 .allowAttributes("style").onElements("span").allowStyling()
- 	.toFactory();
- 	 String toSanitizeXXXLarge = "the <span style=\"font-size:xxx-large\">large</span> formatting issue with chrome";
- 	 assertEquals(toSanitizeXXXLarge, factory.sanitize(toSanitizeXXXLarge)); 
- 	 
- 	 String toSanitizeMedium = "the <span style=\"font-size:medium\">medium</span> formatting issue with chrome";
- 	 assertEquals(toSanitizeMedium, factory.sanitize(toSanitizeMedium)); 
+  public final void testCSSFontSize() {
+    HtmlPolicyBuilder builder = new HtmlPolicyBuilder();
+    PolicyFactory factory = builder.allowElements("span")
+        .allowAttributes("style").onElements("span").allowStyling()
+        .toFactory();
+    String toSanitizeXXXLarge = "the <span style=\"font-size:xxx-large\">large</span> formatting issue with chrome";
+    assertEquals(toSanitizeXXXLarge, factory.sanitize(toSanitizeXXXLarge));
+
+    String toSanitizeMedium = "the <span style=\"font-size:medium\">medium</span> formatting issue with chrome";
+    assertEquals(toSanitizeMedium, factory.sanitize(toSanitizeMedium));
   }
 
   @Test
-  public static final void testCSSChildCombinator() {
+  public final void testCSSChildCombinator() {
 	  HtmlPolicyBuilder builder = new HtmlPolicyBuilder();
-	 
+
  	  PolicyFactory factory = builder.allowElements("span","style","h1").allowTextIn("style","h1")
  	    .allowAttributes("type").onElements("style").allowStyling()
  	    .toFactory();
- 	
- 	 
+
  	  String toSanitize = "<style type=\"text/css\">\n"
  	 	  + "<!--\n"
  	 	  + ".hdg-1 {\n"
@@ -1341,8 +1349,6 @@ private static String apply(HtmlPolicyBuilder b) {
   private static String apply(HtmlPolicyBuilder b, String src) {
     return b.toFactory().sanitize(
         src, null,
-        new Handler<String>() {
-          public void handle(String x) { fail(x); }
-        });
+        (Handler<String>) TestCase::fail);
   }
 }
diff --git a/src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java
diff --git a/src/test/java/org/owasp/html/HtmlSanitizerTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlSanitizerTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/HtmlSanitizerTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlSanitizerTest.java
diff --git a/src/test/java/org/owasp/html/HtmlStreamRendererTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlStreamRendererTest.java
similarity index 90%
rename from src/test/java/org/owasp/html/HtmlStreamRendererTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlStreamRendererTest.java
index 52b2bc5b..949f68cd 100644
--- a/src/test/java/org/owasp/html/HtmlStreamRendererTest.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/HtmlStreamRendererTest.java
@@ -35,6 +35,8 @@
 
 import junit.framework.TestCase;
 
+import static org.owasp.shim.Java8Shim.j8;
+
 @SuppressWarnings("javadoc")
 public class HtmlStreamRendererTest extends TestCase {
 
@@ -99,11 +101,11 @@ public final void testCdataNotEscaped() throws Exception {
 
   public final void testIllegalElementName() throws Exception {
     renderer.openDocument();
-    renderer.openTag(":svg", List.<String>of());
-    renderer.openTag("svg:", List.<String>of());
-    renderer.openTag("-1", List.<String>of());
-    renderer.openTag("svg::svg", List.<String>of());
-    renderer.openTag("a@b", List.<String>of());
+    renderer.openTag(":svg", j8().listOf());
+    renderer.openTag("svg:", j8().listOf());
+    renderer.openTag("-1", j8().listOf());
+    renderer.openTag("svg::svg", j8().listOf());
+    renderer.openTag("a@b", j8().listOf());
     renderer.closeDocument();
 
     String output = rendered.toString();
@@ -122,11 +124,11 @@ public final void testIllegalElementName() throws Exception {
 
   public final void testIllegalAttributeName() throws Exception {
     renderer.openDocument();
-    renderer.openTag("div", List.of(":svg", "x"));
-    renderer.openTag("div", List.of("svg:", "x"));
-    renderer.openTag("div", List.of("-1", "x"));
-    renderer.openTag("div", List.of("svg::svg", "x"));
-    renderer.openTag("div", List.of("a@b", "x"));
+    renderer.openTag("div", j8().listOf(":svg", "x"));
+    renderer.openTag("div", j8().listOf("svg:", "x"));
+    renderer.openTag("div", j8().listOf("-1", "x"));
+    renderer.openTag("div", j8().listOf("svg::svg", "x"));
+    renderer.openTag("div", j8().listOf("a@b", "x"));
     renderer.closeDocument();
 
     String output = rendered.toString();
@@ -145,7 +147,7 @@ public final void testIllegalAttributeName() throws Exception {
 
   public final void testCdataContainsEndTag1() throws Exception {
     renderer.openDocument();
-    renderer.openTag("script", List.of("type", "text/javascript"));
+    renderer.openTag("script", j8().listOf("type", "text/javascript"));
     renderer.text("document.write('<SCRIPT>alert(42)</SCRIPT>')");
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -160,7 +162,7 @@ public final void testCdataContainsEndTag1() throws Exception {
 
   public final void testCdataContainsEndTag2() throws Exception {
     renderer.openDocument();
-    renderer.openTag("style", List.of("type", "text/css"));
+    renderer.openTag("style", j8().listOf("type", "text/css"));
     renderer.text("/* </St");
     // Split into two text chunks, and insert NULs.
     renderer.text("\0yle> */");
@@ -177,7 +179,7 @@ public final void testCdataContainsEndTag2() throws Exception {
 
   public final void testRcdataContainsEndTag() throws Exception {
     renderer.openDocument();
-    renderer.openTag("textarea", List.<String>of());
+    renderer.openTag("textarea", j8().listOf());
     renderer.text("<textarea></textarea>");
     renderer.closeTag("textarea");
     renderer.closeDocument();
@@ -204,7 +206,7 @@ public final void testHtml51SemanticsScriptingExample5Part1() throws Exception {
         + "  console.log(example);\n";
 
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text(js);
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -222,7 +224,7 @@ public final void testHtml51SemanticsScriptingExample5Part2() throws Exception {
     String js = "if (x<!--y) { ... }\n";
 
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text(js);
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -240,7 +242,7 @@ public final void testMoreUnbalancedHtmlCommentsInScripts() throws Exception {
     String js = "if (x-->y) { ... }\n";
 
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text(js);
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -259,7 +261,7 @@ public final void testShortHtmlCommentInScript() throws Exception {
     String js = "// <!----> <!--->";
 
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text(js);
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -278,7 +280,7 @@ public final void testHtml51SemanticsScriptingExample5Part3() throws Exception {
     String js = "<!-- if ( player<script ) { ... } -->";
 
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text(js);
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -302,7 +304,7 @@ public final void testHtml51SemanticsScriptingExample5Part4() throws Exception {
         + "-->";
 
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text(js);
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -322,10 +324,10 @@ public final void testHtmlCommentInRcdata() throws Exception {
     String str = "// <!----> <!---> <!--";
 
     renderer.openDocument();
-    renderer.openTag("title", List.<String>of());
+    renderer.openTag("title", j8().listOf());
     renderer.text(str);
     renderer.closeTag("title");
-    renderer.openTag("textarea", List.<String>of());
+    renderer.openTag("textarea", j8().listOf());
     renderer.text(str);
     renderer.closeTag("textarea");
     renderer.closeDocument();
@@ -338,9 +340,9 @@ public final void testHtmlCommentInRcdata() throws Exception {
 
   public final void testTagInCdata() throws Exception {
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text("alert('");
-    renderer.openTag("b", List.<String>of());
+    renderer.openTag("b", j8().listOf());
     renderer.text("foo");
     renderer.closeTag("b");
     renderer.text("')");
@@ -359,7 +361,7 @@ public final void testTagInCdata() throws Exception {
 
   public final void testUnclosedEscapingTextSpan() throws Exception {
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text("<!--alert('</script>')");
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -373,7 +375,7 @@ public final void testUnclosedEscapingTextSpan() throws Exception {
 
   public final void testAlmostCompleteEndTag() throws Exception {
     renderer.openDocument();
-    renderer.openTag("script", List.<String>of());
+    renderer.openTag("script", j8().listOf());
     renderer.text("//</scrip");
     renderer.closeTag("script");
     renderer.closeDocument();
@@ -383,7 +385,7 @@ public final void testAlmostCompleteEndTag() throws Exception {
 
   public final void testBalancedCommentInNoscript() throws Exception {
     renderer.openDocument();
-    renderer.openTag("noscript", List.<String>of());
+    renderer.openTag("noscript", j8().listOf());
     renderer.text("<!--<script>foo</script>-->");
     renderer.closeTag("noscript");
     renderer.closeDocument();
@@ -395,10 +397,10 @@ public final void testBalancedCommentInNoscript() throws Exception {
 
   public final void testUnbalancedCommentInNoscript() throws Exception {
     renderer.openDocument();
-    renderer.openTag("noscript", List.<String>of());
+    renderer.openTag("noscript", j8().listOf());
     renderer.text("<!--<script>foo</script>--");
     renderer.closeTag("noscript");
-    renderer.openTag("noscript", List.<String>of());
+    renderer.openTag("noscript", j8().listOf());
     renderer.text("<script>foo</script>-->");
     renderer.closeTag("noscript");
     renderer.closeDocument();
@@ -422,7 +424,7 @@ public final void testSupplementaryCodepoints() throws Exception {
 
   public final void testPreSubstitutes1() throws Exception {
     renderer.openDocument();
-    renderer.openTag("Xmp", List.<String>of());
+    renderer.openTag("Xmp", j8().listOf());
     renderer.text("<form>Hello, World</form>");
     renderer.closeTag("Xmp");
     renderer.closeDocument();
@@ -433,7 +435,7 @@ public final void testPreSubstitutes1() throws Exception {
 
   public final void testPreSubstitutes2() throws Exception {
     renderer.openDocument();
-    renderer.openTag("xmp", List.<String>of());
+    renderer.openTag("xmp", j8().listOf());
     renderer.text("<form>Hello, World</form>");
     renderer.closeTag("xmp");
     renderer.closeDocument();
@@ -444,7 +446,7 @@ public final void testPreSubstitutes2() throws Exception {
 
   public final void testPreSubstitutes3() throws Exception {
     renderer.openDocument();
-    renderer.openTag("LISTING", List.<String>of());
+    renderer.openTag("LISTING", j8().listOf());
     renderer.text("<form>Hello, World</form>");
     renderer.closeTag("LISTING");
     renderer.closeDocument();
@@ -455,7 +457,7 @@ public final void testPreSubstitutes3() throws Exception {
 
   public final void testPreSubstitutes4() throws Exception {
     renderer.openDocument();
-    renderer.openTag("plaintext", List.<String>of());
+    renderer.openTag("plaintext", j8().listOf());
     renderer.text("<form>Hello, World</form>");
     renderer.closeDocument();
 
diff --git a/src/test/java/org/owasp/html/IntVectorTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/IntVectorTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/IntVectorTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/IntVectorTest.java
diff --git a/src/test/java/org/owasp/html/PolicyFactoryTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/PolicyFactoryTest.java
similarity index 99%
rename from src/test/java/org/owasp/html/PolicyFactoryTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/PolicyFactoryTest.java
index b2871812..a497668f 100644
--- a/src/test/java/org/owasp/html/PolicyFactoryTest.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/PolicyFactoryTest.java
@@ -123,7 +123,7 @@ public static void testAnd() {
       final StringBuilder out = new StringBuilder();
 
       // A noisy listener that logs.
-      HtmlChangeListener<Object> listener = new HtmlChangeListener<>() {
+      HtmlChangeListener<Object> listener = new HtmlChangeListener<Object>() {
 
         public void discardedTag(Object ctx, String elementName) {
           assertEquals(context, ctx);
@@ -141,7 +141,7 @@ public void discardedAttributes(
 
       };
 
-      Handler<IOException> ioHandler = new Handler<>() {
+      Handler<IOException> ioHandler = new Handler<IOException>() {
 
         public void handle(IOException x) {
           log.append("Handled IOException " + x.getMessage() + "\n");
@@ -150,7 +150,7 @@ public void handle(IOException x) {
       };
 
       // Should not be called.
-      Handler<String> badHtmlHandler = new Handler<>() {
+      Handler<String> badHtmlHandler = new Handler<String>() {
 
         public void handle(String x) {
           throw new AssertionError(x);
diff --git a/src/test/java/org/owasp/html/SanitizersTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/SanitizersTest.java
similarity index 99%
rename from src/test/java/org/owasp/html/SanitizersTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/SanitizersTest.java
index bce8f537..5ad6f501 100644
--- a/src/test/java/org/owasp/html/SanitizersTest.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/SanitizersTest.java
@@ -584,7 +584,7 @@ private static class Permutations<T> implements Iterable<List<T>> {
     }
 
     public Iterator<List<T>> iterator() {
-      return new Iterator<>() {
+      return new Iterator<List<T>>() {
         private int i;
         private final int limit;
         private final BitSet mask;
diff --git a/src/test/java/org/owasp/html/StringsTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/StringsTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/StringsTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/StringsTest.java
diff --git a/src/test/java/org/owasp/html/StylingPolicyTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/StylingPolicyTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/StylingPolicyTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/StylingPolicyTest.java
diff --git a/src/test/java/org/owasp/html/TagBalancingHtmlStreamRendererTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/TagBalancingHtmlStreamRendererTest.java
similarity index 77%
rename from src/test/java/org/owasp/html/TagBalancingHtmlStreamRendererTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/TagBalancingHtmlStreamRendererTest.java
index 7a48d6ce..53c05bc1 100644
--- a/src/test/java/org/owasp/html/TagBalancingHtmlStreamRendererTest.java
+++ b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/TagBalancingHtmlStreamRendererTest.java
@@ -39,6 +39,7 @@
 
 import junit.framework.TestCase;
 
+import static org.owasp.shim.Java8Shim.j8;
 
 @SuppressWarnings("javadoc")
 public class TagBalancingHtmlStreamRendererTest extends TestCase {
@@ -46,7 +47,7 @@ public class TagBalancingHtmlStreamRendererTest extends TestCase {
   StringBuilder htmlOutputBuffer;
   TagBalancingHtmlStreamEventReceiver balancer;
 
-  @Before @Override protected void setUp() throws Exception {
+  @Before @Override public void setUp() throws Exception {
     super.setUp();
     htmlOutputBuffer = new StringBuilder();
     balancer = new TagBalancingHtmlStreamEventReceiver(
@@ -60,17 +61,17 @@ public void handle(String x) {
   @Test
   public final void testTagBalancing() {
     balancer.openDocument();
-	balancer.openTag("html", List.<String>of());
-	balancer.openTag("head", List.<String>of());
-	balancer.openTag("title", List.<String>of());
+	balancer.openTag("html", j8().listOf());
+	balancer.openTag("head", j8().listOf());
+	balancer.openTag("title", j8().listOf());
     balancer.text("Hello, <<World>>!");
     // TITLE closed with case-sensitively different name.
     balancer.closeTag("TITLE");
     balancer.closeTag("head");
-	balancer.openTag("body", List.<String>of());
-	balancer.openTag("p", List.of("id", "p'0"));
+	balancer.openTag("body", j8().listOf());
+	balancer.openTag("p", j8().listOf("id", "p'0"));
     balancer.text("Hello,");
-	balancer.openTag("Br", List.<String>of());
+	balancer.openTag("Br", j8().listOf());
     balancer.text("<<World>>!");
     // HTML, P, and BODY unclosed, but BR not.
     balancer.closeDocument();
@@ -85,9 +86,9 @@ public final void testTagBalancing() {
   @Test
   public final void testTagSoupIronedOut() {
     balancer.openDocument();
-	balancer.openTag("i", List.<String>of());
+	balancer.openTag("i", j8().listOf());
     balancer.text("x");
-	balancer.openTag("b", List.<String>of());
+	balancer.openTag("b", j8().listOf());
     balancer.text("y");
     balancer.closeTag("i");
     balancer.text("z");
@@ -101,12 +102,12 @@ public final void testTagSoupIronedOut() {
   @Test
   public final void testListInListDirectly() {
     balancer.openDocument();
-	balancer.openTag("ul", List.<String>of());
-	balancer.openTag("li", List.<String>of());
+	balancer.openTag("ul", j8().listOf());
+	balancer.openTag("li", j8().listOf());
     balancer.text("foo");
     balancer.closeTag("li");
-	balancer.openTag("ul", List.<String>of());
-	balancer.openTag("li", List.<String>of());
+	balancer.openTag("ul", j8().listOf());
+	balancer.openTag("li", j8().listOf());
     balancer.text("bar");
     balancer.closeTag("li");
     balancer.closeTag("ul");
@@ -121,28 +122,28 @@ public final void testListInListDirectly() {
   @Test
   public final void testTextContent() {
     balancer.openDocument();
-	balancer.openTag("title", List.<String>of());
+	balancer.openTag("title", j8().listOf());
     balancer.text("Hello, World!");
     balancer.closeTag("title");
     balancer.text("Hello, ");
-	balancer.openTag("b", List.<String>of());
+	balancer.openTag("b", j8().listOf());
     balancer.text("World!");
     balancer.closeTag("b");
-	balancer.openTag("p", List.<String>of());
+	balancer.openTag("p", j8().listOf());
     balancer.text("Hello, ");
-	balancer.openTag("textarea", List.<String>of());
+	balancer.openTag("textarea", j8().listOf());
     balancer.text("World!");
     balancer.closeTag("textarea");
     balancer.closeTag("p");
-	balancer.openTag("h1", List.<String>of());
+	balancer.openTag("h1", j8().listOf());
     balancer.text("Hello");
-	balancer.openTag("style", List.<String>of("type", "text/css"));
+	balancer.openTag("style", j8().listOf("type", "text/css"));
     balancer.text("\n.World {\n  color: blue\n}\n");
     balancer.closeTag("style");
     balancer.closeTag("h1");
-	balancer.openTag("ul", List.<String>of());
+	balancer.openTag("ul", j8().listOf());
     balancer.text("\n  ");
-	balancer.openTag("li", List.<String>of());
+	balancer.openTag("li", j8().listOf());
     balancer.text("Hello,");
     balancer.closeTag("li");
     balancer.text("\n  ");
@@ -170,20 +171,20 @@ public final void testTextContent() {
   @Test
   public final void testMismatchedHeaders() {
     balancer.openDocument();
-	balancer.openTag("H1", List.<String>of());
+	balancer.openTag("H1", j8().listOf());
     balancer.text("header");
     balancer.closeTag("h1");
     balancer.text("body");
-	balancer.openTag("H2", List.<String>of());
+	balancer.openTag("H2", j8().listOf());
     balancer.text("sub-header");
     balancer.closeTag("h3");
     balancer.text("sub-body");
-	balancer.openTag("h3", List.<String>of());
+	balancer.openTag("h3", j8().listOf());
     balancer.text("sub-sub-");
     balancer.closeTag("hr"); // hr is not a header tag so does not close an h3.
     balancer.text("header");
     // <h3> is not allowed in h3.
-	balancer.openTag("h3", List.<String>of());
+	balancer.openTag("h3", j8().listOf());
     balancer.closeTag("h3");
     balancer.text("sub-sub-body");
     balancer.closeTag("H4");
@@ -201,10 +202,10 @@ public final void testMismatchedHeaders() {
   @Test
   public final void testListNesting() {
     balancer.openDocument();
-	balancer.openTag("ul", List.<String>of());
-	balancer.openTag("li", List.<String>of());
-	balancer.openTag("ul", List.<String>of());
-	balancer.openTag("li", List.<String>of());
+	balancer.openTag("ul", j8().listOf());
+	balancer.openTag("li", j8().listOf());
+	balancer.openTag("ul", j8().listOf());
+	balancer.openTag("li", j8().listOf());
     balancer.text("foo");
     balancer.closeTag("li");
     // Does not closes the second <ul> since only </ol> and </ul> can close a
@@ -212,8 +213,8 @@ public final void testListNesting() {
     // tree building algo.
     balancer.closeTag("li");
     // This would append inside a list, not an item.  We insert an <li>.
-	balancer.openTag("ul", List.<String>of());
-	balancer.openTag("li", List.<String>of());
+	balancer.openTag("ul", j8().listOf());
+	balancer.openTag("li", j8().listOf());
     balancer.text("bar");
     balancer.closeDocument();
 
@@ -225,18 +226,18 @@ public final void testListNesting() {
   @Test
   public final void testTableNesting() {
     balancer.openDocument();
-	balancer.openTag("table", List.<String>of());
-	balancer.openTag("tbody", List.<String>of());
-	balancer.openTag("tr", List.<String>of());
-	balancer.openTag("td", List.<String>of());
+	balancer.openTag("table", j8().listOf());
+	balancer.openTag("tbody", j8().listOf());
+	balancer.openTag("tr", j8().listOf());
+	balancer.openTag("td", j8().listOf());
     balancer.text("foo");
     balancer.closeTag("td");
     // Chrome does not insert a td to contain this mis-nested table.
     // Instead, it ends one table and starts another.
-	balancer.openTag("table", List.<String>of());
-	balancer.openTag("tbody", List.<String>of());
-	balancer.openTag("tr", List.<String>of());
-	balancer.openTag("th", List.<String>of());
+	balancer.openTag("table", j8().listOf());
+	balancer.openTag("tbody", j8().listOf());
+	balancer.openTag("tr", j8().listOf());
+	balancer.openTag("th", j8().listOf());
     balancer.text("bar");
     balancer.closeTag("table");
     balancer.closeTag("table");
@@ -257,7 +258,7 @@ public final void testNestingLimits() {
 
     balancer.setNestingLimit(10);
     balancer.openDocument();
-	List<String> attrs = List.<String>of();
+	List<String> attrs = j8().listOf();
     for (int i = 20000; --i >= 0;) {
       balancer.openTag("div", attrs);
     }
@@ -273,29 +274,29 @@ public final void testNestingLimits() {
   public final void testTablesGuarded() {
     // Derived from issue 12.
     balancer.openDocument();
-	balancer.openTag("html", List.<String>of());
-	balancer.openTag("head", List.<String>of());
-	balancer.openTag("meta", List.<String>of());
+	balancer.openTag("html", j8().listOf());
+	balancer.openTag("head", j8().listOf());
+	balancer.openTag("meta", j8().listOf());
     balancer.closeTag("head");
-	balancer.openTag("body", List.<String>of());
-	balancer.openTag("p", List.<String>of());
+	balancer.openTag("body", j8().listOf());
+	balancer.openTag("p", j8().listOf());
     balancer.text("Hi");
     balancer.closeTag("p");
-	balancer.openTag("p", List.<String>of());
+	balancer.openTag("p", j8().listOf());
     balancer.text("How are you");
     balancer.closeTag("p");
     balancer.text("\n");
-	balancer.openTag("ul", List.<String>of());
-	balancer.openTag("li", List.<String>of());
-	balancer.openTag("table", List.<String>of());
-	balancer.openTag("tbody", List.<String>of());
-	balancer.openTag("tr", List.<String>of());
+	balancer.openTag("ul", j8().listOf());
+	balancer.openTag("li", j8().listOf());
+	balancer.openTag("table", j8().listOf());
+	balancer.openTag("tbody", j8().listOf());
+	balancer.openTag("tr", j8().listOf());
     for (int i = 2; --i >= 0;) {
-		balancer.openTag("td", List.<String>of());
-		balancer.openTag("b", List.<String>of());
-		balancer.openTag("font", List.<String>of());
-		balancer.openTag("font", List.<String>of());
-		balancer.openTag("p", List.<String>of());
+		balancer.openTag("td", j8().listOf());
+		balancer.openTag("b", j8().listOf());
+		balancer.openTag("font", j8().listOf());
+		balancer.openTag("font", j8().listOf());
+		balancer.openTag("p", j8().listOf());
       balancer.text("Cell");
       balancer.closeTag("p");
       balancer.closeTag("font");
@@ -309,7 +310,7 @@ public final void testTablesGuarded() {
     balancer.closeTag("table");
     balancer.closeTag("ul");
     balancer.text("\n");
-	balancer.openTag("p", List.<String>of());
+	balancer.openTag("p", j8().listOf());
     balancer.text("x");
     balancer.closeTag("p");
     balancer.closeTag("body");
@@ -330,7 +331,7 @@ public final void testTablesGuarded() {
   }
 
   @Test
-  public static final void testIsInterElementWhitespace() {
+  public final void testIsInterElementWhitespace() {
     assertFalse(isInterElementWhitespace("foo"));
     assertTrue(isInterElementWhitespace(""));
     assertTrue(isInterElementWhitespace(" "));
@@ -348,11 +349,11 @@ public static final void testIsInterElementWhitespace() {
 
   @Test
   public final void testAnchorTransparentToBlock() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
-		balancer.openTag("div", List.<String>of());
+		balancer.openTag("div", j8().listOf());
     balancer.openTag("a", hrefOnly);
-		balancer.openTag("div", List.<String>of());
+		balancer.openTag("div", j8().listOf());
     balancer.text("...");
     balancer.closeTag("div");
     balancer.closeTag("a");
@@ -367,11 +368,11 @@ public final void testAnchorTransparentToBlock() {
 
   @Test
   public final void testAnchorTransparentToSpans() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
-		balancer.openTag("span", List.<String>of());
+		balancer.openTag("span", j8().listOf());
     balancer.openTag("a", hrefOnly);
-		balancer.openTag("span", List.<String>of());
+		balancer.openTag("span", j8().listOf());
     balancer.text("...");
     balancer.closeTag("span");
     balancer.closeTag("a");
@@ -386,11 +387,11 @@ public final void testAnchorTransparentToSpans() {
 
   @Test
   public final void testAnchorWithInlineInBlock() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
-		balancer.openTag("div", List.<String>of());
+		balancer.openTag("div", j8().listOf());
     balancer.openTag("a", hrefOnly);
-		balancer.openTag("span", List.<String>of());
+		balancer.openTag("span", j8().listOf());
     balancer.text("...");
     balancer.closeTag("span");
     balancer.closeTag("a");
@@ -404,9 +405,9 @@ public final void testAnchorWithInlineInBlock() {
 
   @Test
   public final void testDirectlyNestedAnchor() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
-		balancer.openTag("span", List.<String>of());
+		balancer.openTag("span", j8().listOf());
     balancer.openTag("a", hrefOnly);
     balancer.openTag("a", hrefOnly);
     balancer.text("...");
@@ -423,11 +424,11 @@ public final void testDirectlyNestedAnchor() {
 
   @Test
   public final void testAnchorClosedWhenBlockInInline() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
-		balancer.openTag("span", List.<String>of());
+		balancer.openTag("span", j8().listOf());
     balancer.openTag("a", hrefOnly);
-		balancer.openTag("div", List.<String>of());
+		balancer.openTag("div", j8().listOf());
     balancer.text("...");
     balancer.closeTag("div");
     balancer.closeTag("a");
@@ -446,11 +447,11 @@ public final void testAnchorClosedWhenBlockInInline() {
   @Test
   @Ignore
   public final void failingtestAnchorInAnchorIndirectly() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
-		balancer.openTag("div", List.<String>of());
+		balancer.openTag("div", j8().listOf());
     balancer.openTag("a", hrefOnly);
-		balancer.openTag("div", List.<String>of());
+		balancer.openTag("div", j8().listOf());
     balancer.openTag("a", hrefOnly);
     balancer.text("...");
     balancer.closeTag("a");
@@ -466,12 +467,12 @@ public final void failingtestAnchorInAnchorIndirectly() {
 
   @Test
   public final void testInteractiveInAnchorIndirectly() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
-		balancer.openTag("div", List.<String>of());
+		balancer.openTag("div", j8().listOf());
     balancer.openTag("a", hrefOnly);
-		balancer.openTag("div", List.<String>of());
-		balancer.openTag("video", List.<String>of());
+		balancer.openTag("div", j8().listOf());
+		balancer.openTag("video", j8().listOf());
     balancer.closeTag("video");
     balancer.closeTag("div");
     balancer.closeTag("a");
@@ -484,10 +485,10 @@ public final void testInteractiveInAnchorIndirectly() {
 
   @Test
   public final void testAnchorWithBlockAtTopLevel() {
-		List<String> hrefOnly = List.of("href", "");
+		List<String> hrefOnly = j8().listOf("href", "");
     balancer.openDocument();
     balancer.openTag("a", hrefOnly);
-	balancer.openTag("div", List.<String>of());
+	balancer.openTag("div", j8().listOf());
     balancer.text("...");
     balancer.closeTag("div");
     balancer.closeTag("a");
@@ -500,11 +501,11 @@ public final void testAnchorWithBlockAtTopLevel() {
   @Test
   public final void testResumedElementsAllowedWhereResumed() {
     balancer.openDocument();
-	balancer.openTag("a", List.<String>of());
-	balancer.openTag("b", List.<String>of());
+	balancer.openTag("a", j8().listOf());
+	balancer.openTag("b", j8().listOf());
     balancer.text("foo");
-	balancer.openTag("i", List.<String>of());
-	balancer.openTag("a", List.<String>of());
+	balancer.openTag("i", j8().listOf());
+	balancer.openTag("a", j8().listOf());
     balancer.text("bar");
     balancer.closeTag("a");
     balancer.closeTag("i");
@@ -520,11 +521,11 @@ public final void testResumedElementsAllowedWhereResumed() {
   public final void testMenuItemNesting() {
     // issue 96
     balancer.openDocument();
-	balancer.openTag("div", List.<String>of());
-	balancer.openTag("menu", List.<String>of());
-	balancer.openTag("menuitem", List.<String>of());
+	balancer.openTag("div", j8().listOf());
+	balancer.openTag("menu", j8().listOf());
+	balancer.openTag("menuitem", j8().listOf());
     balancer.closeTag("menuitem");
-	balancer.openTag("menuitem", List.<String>of());
+	balancer.openTag("menuitem", j8().listOf());
     balancer.closeTag("menuitem");
     balancer.closeTag("menu");
     balancer.closeTag("div");
diff --git a/src/test/java/org/owasp/html/UrlTextExampleTest.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/UrlTextExampleTest.java
similarity index 100%
rename from src/test/java/org/owasp/html/UrlTextExampleTest.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/UrlTextExampleTest.java
diff --git a/src/test/java/org/owasp/html/VerboseTestRunner.java b/owasp-java-html-sanitizer/src/test/java/org/owasp/html/VerboseTestRunner.java
similarity index 100%
rename from src/test/java/org/owasp/html/VerboseTestRunner.java
rename to owasp-java-html-sanitizer/src/test/java/org/owasp/html/VerboseTestRunner.java
diff --git a/src/test/resources/benchmark-data/Yahoo!.html b/owasp-java-html-sanitizer/src/test/resources/benchmark-data/Yahoo!.html
similarity index 100%
rename from src/test/resources/benchmark-data/Yahoo!.html
rename to owasp-java-html-sanitizer/src/test/resources/benchmark-data/Yahoo!.html
diff --git a/src/test/resources/org/owasp/html/htmllexergolden1.txt b/owasp-java-html-sanitizer/src/test/resources/org/owasp/html/htmllexergolden1.txt
similarity index 100%
rename from src/test/resources/org/owasp/html/htmllexergolden1.txt
rename to owasp-java-html-sanitizer/src/test/resources/org/owasp/html/htmllexergolden1.txt
diff --git a/src/test/resources/org/owasp/html/htmllexerinput1.html b/owasp-java-html-sanitizer/src/test/resources/org/owasp/html/htmllexerinput1.html
similarity index 100%
rename from src/test/resources/org/owasp/html/htmllexerinput1.html
rename to owasp-java-html-sanitizer/src/test/resources/org/owasp/html/htmllexerinput1.html
diff --git a/src/test/resources/osgi-integration-verification.xml b/owasp-java-html-sanitizer/src/test/resources/osgi-integration-verification.xml
similarity index 100%
rename from src/test/resources/osgi-integration-verification.xml
rename to owasp-java-html-sanitizer/src/test/resources/osgi-integration-verification.xml
diff --git a/parent/pom.xml b/parent/pom.xml
deleted file mode 100644
index 968711c2..00000000
--- a/parent/pom.xml
+++ /dev/null
@@ -1,301 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
-  <artifactId>parent</artifactId>
-  <version>20220608.2-SNAPSHOT</version>
-
-  <packaging>pom</packaging>
-
-  <name>OWASP Java HTML Sanitizer Project Parent</name>
-  <description>
-A fast and easy to configure HTML Sanitizer written in Java which
-lets you include HTML authored by third-parties in your web
-application while protecting against XSS.
-  </description>
-  <url>https://github.com/OWASP/java-html-sanitizer</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <connection>scm:git:git://github.com/OWASP/java-html-sanitizer.git</connection>
-    <developerConnection>scm:git:git://github.com/OWASP/java-html-sanitizer.git</developerConnection>
-    <url>https://github.com/OWASP/java-html-sanitizer</url>
-  </scm>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/OWASP/java-html-sanitizer/issues</url>
-  </issueManagement>
-
-  <organization>
-    <name>OWASP</name>
-    <url>https://owasp.org</url>
-  </organization>
-
-  <developers>
-    <developer>
-      <id>mikesamuel</id>
-      <name>Mike Samuel</name>
-      <email>mikesamuel@gmail.com</email>
-    </developer>
-  </developers>
-
-  <mailingLists>
-    <mailingList>
-      <name>User Support List</name>
-      <subscribe>owasp-java-html-sanitizer-support+subscribe@googlegroups.com</subscribe>
-      <unsubscribe>owasp-java-html-sanitizer-support+unsubscribe@googlegroups.com</unsubscribe>
-      <archive>https://groups.google.com/forum/#!forum/owasp-java-html-sanitizer-support</archive>
-    </mailingList>
-  </mailingLists>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>com.github.spotbugs</groupId>
-        <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>3.1.12.2</version>
-        <configuration>
-          <!--
-            Enables analysis which takes more memory but finds more bugs.
-            If you run out of memory, changes the value of the effort element
-            to 'Low'.
-          -->
-          <effort>Max</effort>
-          <!-- Reports all bugs (other values are medium and max) -->
-          <threshold>Low</threshold>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>9</maven.compiler.source>
-    <maven.compiler.target>9</maven.compiler.target>
-    <maven.compiler.release>9</maven.compiler.release>
-  </properties>
-
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>external.atlassian.jgitflow</groupId>
-          <artifactId>jgitflow-maven-plugin</artifactId>
-          <version>1.0-m5.1</version>
-          <configuration>
-            <pushReleases>true</pushReleases>
-            <enableSshAgent>true</enableSshAgent>
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-            <updateDependencies>true</updateDependencies>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>1.6.3</version>
-          <extensions>true</extensions>
-          <configuration>
-            <serverId>ossrh</serverId>
-            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-            <!-- This staging profile ID gleaned by logging in to
-                 oss.sonatype.org, clicking "Staging Profiles" on the left,
-                 selecting "com.googlecode.owasp-java-html-sanitizer",
-                 and extracting the most hexy looking bit from the URL which
-                 looks like
-                 https://oss.sonatype.org/#stagingProfiles;5fd62edf6679f6
-            -->
-            <stagingProfileId>199eb0ec1ec380</stagingProfileId>
-            <executions>
-              <execution>
-                <id>default-deploy</id>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>deploy</goal>
-                </goals>
-              </execution>
-            </executions>
-          </configuration>
-        </plugin>
-        <!-- For building the source jar. -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.2.1</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- For building the javadoc jar. -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.2.0</version>
-          <executions>
-            <execution>
-              <id>attach-javadocs</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <nohelp>true</nohelp>
-            <show>public</show>
-            <charset>UTF-8</charset>
-            <doctitle>OWASP HTML Sanitizer</doctitle>
-            <excludePackageNames>*.example</excludePackageNames>
-            <!-- The Javadoc that ships with JDK 8 is spammy.
-                 http://docs.oracle.com/javase/8/docs/technotes/tools/unix/javadoc.html#BEJEFABE -->
-            <additionalOptions>-Xdoclint:-missing -html5</additionalOptions>
-            <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
-            <javaApiLinks>
-              <property>
-                <name>foo</name>
-                <value>bar</value>
-              </property>
-            </javaApiLinks>
-            <source>6</source>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
-          <configuration>
-            <source>9</source>
-            <target>9</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.9</version>
-        </plugin>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eluder.coveralls</groupId>
-          <artifactId>coveralls-maven-plugin</artifactId>
-          <version>4.3.0</version>
-
-          <dependencies>
-            <dependency>
-              <!-- https://github.com/trautonen/coveralls-maven-plugin/issues/112#issuecomment-343114987 -->
-              <groupId>javax.xml.bind</groupId>
-              <artifactId>jaxb-api</artifactId>
-              <version>2.2.3</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
-          <version>3.5.0</version>
-        </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-verifier-plugin</artifactId>
-            <version>1.1</version>
-          </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>[1.15,)</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>[2.0.1,)</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>annotations</artifactId>
-        <version>[2.0.1,)</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>3.16.3</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.1</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <profiles>
-    <profile>
-      <id>release-sign-artifact</id>
-      <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/pom.xml b/pom.xml
index 78532102..94bce32c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,123 +1,78 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>owasp-java-html-sanitizer</artifactId>
-  <packaging>bundle</packaging>
-  <parent>
-    <relativePath>parent</relativePath>
-    <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
-    <artifactId>parent</artifactId>
-    <version>20220608.2-SNAPSHOT</version>
-  </parent>
+  <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+  <artifactId>parent</artifactId>
+  <version>20220608.2-SNAPSHOT</version>
 
-  <name>OWASP Java HTML Sanitizer</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>java8-shim</module>
+    <module>java10-shim</module>
+    <module>owasp-java-html-sanitizer</module>
+  </modules>
+
+  <name>OWASP Java HTML Sanitizer Project Parent</name>
   <description>
-    Takes third-party HTML and produces HTML that is safe to embed in
-    your web application.
-    Fast and easy to configure.
+A fast and easy to configure HTML Sanitizer written in Java which
+lets you include HTML authored by third-parties in your web
+application while protecting against XSS.
   </description>
+  <url>https://github.com/OWASP/java-html-sanitizer</url>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
-  <build>
-    <plugins>
-      <!-- http://www.javaworld.com/article/2074515/core-java/
-           unit-test-code-coverage-with-maven-and-jacoco.html -->
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <!--configuration>
-          <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
-          <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
-        </configuration-->
-        <executions>
-          <execution>
-            <id>jacoco-initialize</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>jacoco-site</id>
-            <phase>package</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>report</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eluder.coveralls</groupId>
-        <artifactId>coveralls-maven-plugin</artifactId>
-        <configuration>
-          <repoToken>TENYw0IKRulLOXgkyzjGqNi0hQyhBiSiU</repoToken>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>org.owasp.html</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-verifier-plugin</artifactId>
-          <configuration>
-            <verificationFile>src/test/resources/osgi-integration-verification.xml</verificationFile>
-          </configuration>
-          <executions>
-            <execution>
-              <id>main</id>
-              <phase>verify</phase>
-              <goals>
-                <goal>verify</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-    </plugins>
-  </build>
+  <scm>
+    <connection>scm:git:git://github.com/OWASP/java-html-sanitizer.git</connection>
+    <developerConnection>scm:git:git://github.com/OWASP/java-html-sanitizer.git</developerConnection>
+    <url>https://github.com/OWASP/java-html-sanitizer</url>
+  </scm>
 
-  <dependencies>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>nu.validator.htmlparser</groupId>
-      <artifactId>htmlparser</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+    <repository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+  </distributionManagement>
+
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/OWASP/java-html-sanitizer/issues</url>
+  </issueManagement>
+
+  <organization>
+    <name>OWASP</name>
+    <url>https://owasp.org</url>
+  </organization>
+
+  <developers>
+    <developer>
+      <id>mikesamuel</id>
+      <name>Mike Samuel</name>
+      <email>mikesamuel@gmail.com</email>
+    </developer>
+  </developers>
+
+  <mailingLists>
+    <mailingList>
+      <name>User Support List</name>
+      <subscribe>owasp-java-html-sanitizer-support+subscribe@googlegroups.com</subscribe>
+      <unsubscribe>owasp-java-html-sanitizer-support+unsubscribe@googlegroups.com</unsubscribe>
+      <archive>https://groups.google.com/forum/#!forum/owasp-java-html-sanitizer-support</archive>
+    </mailingList>
+  </mailingLists>
 
   <reporting>
     <plugins>
-      <!-- `mvn compile site` will generate target/site/findbugs.html -->
-      <!-- http://gleclaire.github.io/findbugs-maven-plugin/dependency-info.html -->
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
@@ -135,4 +90,232 @@
       </plugin>
     </plugins>
   </reporting>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <release.version>8</release.version>
+    <source.version>1.8</source.version>
+    <target.version>1.8</target.version>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>external.atlassian.jgitflow</groupId>
+          <artifactId>jgitflow-maven-plugin</artifactId>
+          <version>1.0-m5.1</version>
+          <configuration>
+            <pushReleases>true</pushReleases>
+            <enableSshAgent>true</enableSshAgent>
+            <autoVersionSubmodules>true</autoVersionSubmodules>
+            <updateDependencies>true</updateDependencies>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.sonatype.plugins</groupId>
+          <artifactId>nexus-staging-maven-plugin</artifactId>
+          <version>1.6.3</version>
+          <extensions>true</extensions>
+          <configuration>
+            <serverId>ossrh</serverId>
+            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+            <!-- This staging profile ID gleaned by logging in to
+                 oss.sonatype.org, clicking "Staging Profiles" on the left,
+                 selecting "com.googlecode.owasp-java-html-sanitizer",
+                 and extracting the most hexy looking bit from the URL which
+                 looks like
+                 https://oss.sonatype.org/#stagingProfiles;5fd62edf6679f6
+            -->
+            <stagingProfileId>199eb0ec1ec380</stagingProfileId>
+            <executions>
+              <execution>
+                <id>default-deploy</id>
+                <phase>deploy</phase>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+              </execution>
+            </executions>
+          </configuration>
+        </plugin>
+        <!-- For building the source jar. -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.2.1</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- For building the javadoc jar. -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.2.0</version>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <nohelp>true</nohelp>
+            <show>public</show>
+            <charset>UTF-8</charset>
+            <doctitle>OWASP HTML Sanitizer</doctitle>
+            <excludePackageNames>*.example</excludePackageNames>
+            <!-- The Javadoc that ships with JDK 8 is spammy.
+                 http://docs.oracle.com/javase/8/docs/technotes/tools/unix/javadoc.html#BEJEFABE -->
+            <additionalOptions>-Xdoclint:-missing -html5</additionalOptions>
+            <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+            <javaApiLinks>
+              <property>
+                <name>foo</name>
+                <value>bar</value>
+              </property>
+            </javaApiLinks>
+            <source>${source.version}</source>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.13.0</version>
+          <configuration>
+            <source>${source.version}</source>
+            <target>${target.version}</target>
+            <release>${release.version}</release>
+            <!--compilerArgs>
+              <arg>-profile</arg>
+              <arg>${release.version}</arg>
+            </compilerArgs-->
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.9</version>
+        </plugin>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.8.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eluder.coveralls</groupId>
+          <artifactId>coveralls-maven-plugin</artifactId>
+          <version>4.3.0</version>
+
+          <dependencies>
+            <dependency>
+              <!-- https://github.com/trautonen/coveralls-maven-plugin/issues/112#issuecomment-343114987 -->
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+              <version>2.2.3</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <extensions>true</extensions>
+          <version>3.5.0</version>
+        </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-verifier-plugin</artifactId>
+            <version>1.1</version>
+          </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+        <artifactId>java8-shim</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+        <artifactId>java10-shim</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>[1.15,)</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>[2.0.1,)</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>annotations</artifactId>
+        <version>[2.0.1,)</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>3.16.3</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13.1</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <profiles>
+    <profile>
+      <id>release-sign-artifact</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.5</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>