Skip to content

Commit

Permalink
Pull in pull request #65, modify to make it work the way I want it to…
Browse files Browse the repository at this point in the history 
… work, and check it in.

There are a number of ToDo's left for test case creation and JavaDocs needed for new methods.
  • Loading branch information
@davewichers
davewichers committed Jan 25, 2021
1 parent eadb658 commit 64416f1
Show file tree
Hide file tree
Showing 6 changed files with 337 additions and 109 deletions.
61 changes: 41 additions & 20 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,9 @@

<dependencies>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<!-- Note that there is a 2.0.2 version of this, but it is actually much older than 1.4.01. -->
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-css</artifactId>
<version>1.14</version>
<exclusions>
<!-- exclude this as batik-css has a dependency that uses an older commons-logging and we want to eliminate the convergence mismatch -->
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
Expand All @@ -101,15 +88,48 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<!-- 2.12.1 is the last release that supports Java 7, so we can upgrade to newer versions. -->
<version>2.12.1</version>
<exclusions>
<!-- exclude this as we've imported a newer version directly and want to eliminate the convergence mismatch -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-css</artifactId>
<version>1.14</version>
<exclusions>
<!-- exclude this as batik-css has a dependency that uses an older commons-logging and we want to eliminate the convergence mismatch -->
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<!-- While Java 7+ includes Xerces in the JRE, it apparently doesn't include all of it as
AntiSamy has compilation errors if we don't import it directly. -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<!-- Note that there is a 2.0.2 version of this, but it is actually much older than 1.4.01. -->
<version>1.4.01</version>
</dependency>

<!-- SpotBugs dependencies -->
Expand Down Expand Up @@ -137,6 +157,7 @@
</dependencies>

<build>

<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -165,6 +186,7 @@
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -369,4 +391,3 @@
</plugins>
</reporting>
</project>

Loading

0 comments on commit 64416f1

Please sign in to comment.