diff --git a/README.md b/README.md
index 15405b77..fa534de8 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ networkless build.
 First, grab the sources:
 
 ```bash
-wget https://archive.apache.org/dist/commons/collections/source/commons-collections4-4.4-src.tar.gz
+wget https://archive.apache.org/dist/commons/collections/source/commons-collections4-4.5.0-M2-src.tar.gz
 ```
 
 Second, create a new `tetra` project named `commons-collections` based on those sources:
diff --git a/lib/tetra.rb b/lib/tetra.rb
index da304f70..a858a382 100644
--- a/lib/tetra.rb
+++ b/lib/tetra.rb
@@ -35,6 +35,7 @@
 require "tetra/facades/tar"
 
 # main internal classes
+require "tetra/constants"
 require "tetra/version"
 require "tetra/project_initer"
 require "tetra/project"
diff --git a/lib/tetra/constants.rb b/lib/tetra/constants.rb
new file mode 100644
index 00000000..fc022ab8
--- /dev/null
+++ b/lib/tetra/constants.rb
@@ -0,0 +1,6 @@
+# encoding: UTF-8
+
+# base module for tetra
+module Tetra
+  CCOLLECTIONS = "commons-collections4-4.5.0-M2-src".freeze
+end
diff --git a/spec/data/commons-collections4-4.4-src.tar.gz b/spec/data/commons-collections4-4.4-src.tar.gz
deleted file mode 100644
index 39108e10..00000000
Binary files a/spec/data/commons-collections4-4.4-src.tar.gz and /dev/null differ
diff --git a/spec/data/commons-collections4-4.4-src.zip b/spec/data/commons-collections4-4.4-src.zip
deleted file mode 100644
index ae7e8539..00000000
Binary files a/spec/data/commons-collections4-4.4-src.zip and /dev/null differ
diff --git a/spec/data/commons-collections4-4.5.0-M2-src.tar.gz b/spec/data/commons-collections4-4.5.0-M2-src.tar.gz
new file mode 100644
index 00000000..dba8cf29
Binary files /dev/null and b/spec/data/commons-collections4-4.5.0-M2-src.tar.gz differ
diff --git a/spec/data/commons-collections4-4.5.0-M2-src.zip b/spec/data/commons-collections4-4.5.0-M2-src.zip
new file mode 100644
index 00000000..1c0df1a1
Binary files /dev/null and b/spec/data/commons-collections4-4.5.0-M2-src.zip differ
diff --git a/spec/data/commons-logging/commons-logging-1.1.1.jar b/spec/data/commons-logging/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef144..00000000
Binary files a/spec/data/commons-logging/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/spec/data/commons-logging/commons-logging-1.3.4.jar b/spec/data/commons-logging/commons-logging-1.3.4.jar
new file mode 100644
index 00000000..b6339bb0
Binary files /dev/null and b/spec/data/commons-logging/commons-logging-1.3.4.jar differ
diff --git a/spec/data/commons-logging/parent_pom.xml b/spec/data/commons-logging/parent_pom.xml
index 3fa23e72..06168da0 100644
--- a/spec/data/commons-logging/parent_pom.xml
+++ b/spec/data/commons-logging/parent_pom.xml
@@ -17,68 +17,347 @@
    limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>4</version>
+    <version>27</version>
   </parent>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-parent</artifactId>
+  <version>54-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <!-- TODO: dummy version. In Maven 2.1, this will be auto-versioned being a generic parent -->
-  <version>5</version>
-  <name>Commons Parent</name>
-  <url>http://commons.apache.org/</url>
-  <inceptionYear>2001</inceptionYear>
+  <name>Apache Commons Parent</name>
+  <description>The Apache Commons Parent POM provides common settings for all Apache Commons components.</description>
+  <!--
+  To avoid propagation to components, do not define the inceptionYear here
+  <inceptionYear>2006</inceptionYear>
+  -->
+  <url>https://commons.apache.org/commons-parent-pom.html</url>
 
-  <ciManagement>
-    <system>continuum</system>
-    <url>http://vmbuild.apache.org/continuum/</url>
-    <notifiers>
-      <notifier>
-        <type>mail</type>
-        <configuration>
-          <address>dev@commons.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
+  <!--
+    In release 31, the maven.compile.* properties were corrected to maven.compiler.*
+    [See COMMONSSITE-69]
+    If updating from a previous version, please check the property definitions
+
+    Starting with version 22, the RAT plugin has changed Maven group and id, so any existing configuration
+    needs to be updated.
+    To fix component POMs, please change any occurrences of:
+    <groupId>org.codehaus.mojo</groupId>
+    <artifactId>rat-maven-plugin</artifactId>
+    to the new values:
+    <groupId>org.apache.rat</groupId>
+    <artifactId>apache-rat-plugin</artifactId>
+
+    Site deployment
+    ===============
+    Cannot define this here at present, see https://issues.apache.org/jira/browse/COMMONSSITE-26.
+
+    The following should be added to the component POM:
+
+    <distributionManagement>
+    <site>
+    <id>commons.site</id>
+    <name>Apache Commons Site SVN</name>
+    <url>scm:svn:${commons.scmPubUrl}</url>
+    </site>
+    </distributionManagement>
+
+    Alternatively you can map the component's existing site id to the
+    commons.scmPubServer property.
+
+    Coverage tool selection
+    =======================
+    Starting with release 30, there are optional profiles for both Cobertura and JaCoCo.
+    These can be enabled independently on the command-line:
+
+    mvn site -Pcobertura -Pjacoco
+
+    Or the component can define a default coverage tool by creating either (or both) of the following files:
+
+    src/site/resources/profile.cobertura
+    src/site/resources/profile.jacoco
 
-  <distributionManagement>
+    These can later be overridden by cancelling the profile:
+
+    mvn site -P!jacoco
+
+  -->
+
+
+  <properties>
+    <!-- Minimum Maven version required by the plugins -->
+    <minimalMavenBuildVersion>3.3.9</minimalMavenBuildVersion>
+    <!-- configuration bits for cutting a release candidate, must be overridden by components -->
+    <!-- TODO How can we make project.build.outputTimestamp and changes.xml's release data the same? -->
+    <project.build.outputTimestamp>2022-04-06T22:10:39Z</project.build.outputTimestamp>
+    <commons.release.version>${project.version}</commons.release.version>
+    <commons.rc.version>RC1</commons.rc.version>
+    <commons.jira.id>COMMONSSITE</commons.jira.id>
+
+    <!-- Default configuration for compiler source and target JVM -->
+    <!-- Do NOT change this; it must remain as 1.3 -->
     <!--
-      This POM's parent POM (the Apache root POM) provides repositories. Unfortunately,
-      this allows for accidental deployments. So we disable them here by providing
-      a dummy repository. Use "mvn -Prc deploy" (Apache snapshot repository) or
-      "mvn -Prelease deploy" (Apache release repository), if you really want to deploy.
+      It's important that child POMs don't need to change when the parent POM is updated.
+      At the time when these properties were introduced, the default Java version was 1.3.
+      Thus components that failed to define the version would not be affected by updates
+      to the Commons Parent or its parent the Apache pom.
+      Of course most if not all components now define the properties.
+      However it's still important to keep the properties as they effectively
+      force child poms to define the Java version they require.
     -->
-    <repository>
-      <id>dummy</id>
-      <name>Dummy to avoid accidental deploys</name>
-      <url />
-    </repository>
-  </distributionManagement>
+    <maven.compiler.source>1.3</maven.compiler.source>
+    <maven.compiler.target>1.3</maven.compiler.target>
 
-  <!--
-    This section *must* be overwritten by subprojects. It is only to allow
-    a release of the commons-parent POM.
-  -->
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-5</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-5</developerConnection>
-    <url>http://svn.apache.org/viewvc/commons/proper/commons-parent/tags/commons-parent-5</url>
-  </scm>
+    <!-- compiler and surefire plugin settings for "java" profiles -->
+    <commons.compiler.fork>false</commons.compiler.fork>
+    <commons.compiler.compilerVersion />
+    <commons.compiler.javac />
+    <commons.compiler.javadoc />
+
+    <!-- plugin versions (allows same value in reporting and build sections; also allows easy override) -->
+    <commons.animal-sniffer.version>1.21</commons.animal-sniffer.version>
+    <!-- Almost all signatures use version 1.0. Allow override just in case -->
+    <commons.animal-sniffer.signature.version>1.0</commons.animal-sniffer.signature.version>
+    <commons.assembly-plugin.version>3.4.2</commons.assembly-plugin.version>
+    <commons.build-helper.version>3.3.0</commons.build-helper.version>
+    <commons.build-plugin.version>1.12</commons.build-plugin.version>
+    <commons.changes.version>2.12.1</commons.changes.version>
+    <commons.checkstyle-plugin.version>3.1.2</commons.checkstyle-plugin.version>
+    <commons.checkstyle.version>9.3</commons.checkstyle.version>
+    <commons.clirr.version>2.8</commons.clirr.version>
+    <commons.cobertura.version>2.7</commons.cobertura.version>
+    <commons.compiler.version>3.10.1</commons.compiler.version>
+    <commons.coveralls.version>4.3.0</commons.coveralls.version>
+    <commons.coveralls.timestampFormat>EpochMillis</commons.coveralls.timestampFormat>
+    <commons.failsafe.version>2.22.2</commons.failsafe.version>
+    <commons.felix.version>5.1.7</commons.felix.version>
+    <commons.findbugs.version>3.0.5</commons.findbugs.version>
+    <commons.jacoco.version>0.8.8</commons.jacoco.version>
+    <commons.japicmp.version>0.15.7</commons.japicmp.version>
+    <commons.jar-plugin.version>3.2.2</commons.jar-plugin.version>
+    <commons.javadoc.version>3.4.0</commons.javadoc.version>
+    <commons.jxr.version>3.2.0</commons.jxr.version>
+    <commons.pmd.version>3.17.0</commons.pmd.version>
+    <commons.pmd-impl.version>6.47.0</commons.pmd-impl.version>
+    <commons.project-info.version>3.4.0</commons.project-info.version>
+    <commons.rat.version>0.14</commons.rat.version>
+    <commons.release-plugin.version>1.8.0</commons.release-plugin.version>
+    <commons.scm-publish.version>1.1</commons.scm-publish.version>
+    <commons.enforcer-plugin.version>3.1.0</commons.enforcer-plugin.version>
+    <commons.buildnumber-plugin.version>3.0.0</commons.buildnumber-plugin.version>
+    <commons.biz.aQute.bndlib.version>6.3.1</commons.biz.aQute.bndlib.version>
+
+    <!--
+      Note: Maven site plugin 3.5.1 is the latest version but is not a direct replacement:
+
+      https://maven.apache.org/plugins/maven-site-plugin/migrate.html
+
+      In particular, adding CDATA to header and footer sections is not backwards compatible.
+      I.e. these have to be updated at the same time.
+
+      Also it causes the following errors:
+
+      [ERROR] Failed to execute goal org.apache.maven.plugins:maven-site-plugin:3.5.1:site (default-site) on project commons-parent:
+      Execution default-site of goal org.apache.maven.plugins:maven-site-plugin:3.5.1:site failed:
+      A required class was missing while executing org.apache.maven.plugins:maven-site-plugin:3.5.1:site: org/apache/maven/doxia/sink/impl/XhtmlBaseSink
+
+      This is because Apache POM 17 forces an older version of Doxia core:
+      https://mail-archives.apache.org/mod_mbox/maven-users/201602.mbox/%3C2337255.xU7aS9G1qr@herve-desktop%3E
+
+      The same error applies when running with version 3.5.
+
+      Since the version is defined as a property, the CP version can be overridden as follows if necessary:
+
+      mvn site -Dcommons.site-plugin.version=3.5.1
+
+      You will also need to add a dependency on Doxia core:
+      <artifactId>maven-site-plugin</artifactId>
+      <dependencies>
+      <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-core</artifactId>
+      <version>1.8</version>
+      </dependency>
+      </dependencies>
+
+    -->
+    <!--
+    Warning: site-plugin 3.9.0 causes the following error:
+    An API incompatibility was encountered while executing
+     org.apache.maven.plugins:maven-site-plugin:3.9.0:site:
+     java.lang.NoSuchMethodError: org.codehaus.plexus.util.xml.Xpp3Dom.getInputLocation()Ljava/lang/Object;
+    -->
+    <commons.site-plugin.version>3.12.0</commons.site-plugin.version>
+    <commons.source-plugin.version>3.2.1</commons.source-plugin.version>
+    <commons.spotbugs.plugin.version>4.7.1.0</commons.spotbugs.plugin.version>
+    <commons.spotbugs.impl.version>4.7.1</commons.spotbugs.impl.version>
+    <commons.surefire-report.version>2.22.2</commons.surefire-report.version>
+    <commons.surefire.version>2.22.2</commons.surefire.version>
+    <commons.wagon-ssh.version>3.5.2</commons.wagon-ssh.version>
+
+    <!-- Default values for the download-page generation by commons-build-plugin -->
+    <commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name>
+    <commons.release.desc />
+    <commons.binary.suffix>-bin</commons.binary.suffix>
+    <commons.release.2.name>${project.artifactId}-${commons.release.2.version}</commons.release.2.name>
+    <commons.release.2.desc />
+    <commons.release.2.binary.suffix>-bin</commons.release.2.binary.suffix>
+    <commons.release.3.name>${project.artifactId}-${commons.release.3.version}</commons.release.3.name>
+    <commons.release.3.desc />
+    <commons.release.3.binary.suffix>-bin</commons.release.3.binary.suffix>
+    <commons.release.4.desc />
+    <commons.release.4.binary.suffix>-bin</commons.release.4.binary.suffix>
+
+    <!-- Default values for the jacoco-maven-plugin reports -->
+    <commons.jacoco.classRatio>1.00</commons.jacoco.classRatio>
+    <commons.jacoco.instructionRatio>0.90</commons.jacoco.instructionRatio>
+    <commons.jacoco.methodRatio>0.95</commons.jacoco.methodRatio>
+    <commons.jacoco.branchRatio>0.85</commons.jacoco.branchRatio>
+    <commons.jacoco.complexityRatio>0.85</commons.jacoco.complexityRatio>
+    <commons.jacoco.lineRatio>0.90</commons.jacoco.lineRatio>
+    <commons.jacoco.haltOnFailure>false</commons.jacoco.haltOnFailure>
+
+    <!-- The Commons component id is used on the distribution server, for example:
+         - Use dbcp instead of dbcp2.
+         - Use collections instead of collections4.
+         - Use lang instead of lang3.
+         - Use pool instead of pool2.
+         - and so on...
+    -->
+    <commons.componentid>${project.artifactId}</commons.componentid>
+
+    <!-- The package id is substring of the package name from o.a.commons.(.*)., for example:
+         - Use dbcp2 instead of dbcp.
+         - Use collections4 instead of collections.
+         - Use lang3 instead of lang.
+         - Use pool2 instead of pool.
+         - and so on...
+    -->
+    <commons.packageId>${project.artifactId}</commons.packageId>
+
+    <!-- Configuration properties for the OSGi maven-bundle-plugin -->
+    <commons.osgi.symbolicName>org.apache.commons.${commons.packageId}</commons.osgi.symbolicName>
+    <commons.osgi.export>org.apache.commons.*;version=${project.version};-noimport:=true</commons.osgi.export>
+    <commons.osgi.import>*</commons.osgi.import>
+    <commons.osgi.dynamicImport />
+    <commons.osgi.private />
+    <commons.osgi.excludeDependencies>true</commons.osgi.excludeDependencies>
+
+    <!-- location of any manifest file used by maven-jar-plugin -->
+    <commons.manifestfile>${project.build.directory}/osgi/MANIFEST.MF</commons.manifestfile>
+
+    <!--
+      Make the deployment protocol pluggable. This allows to switch to
+      other protocols like scpexe, which some users prefer over scp.
+    -->
+    <commons.deployment.protocol>scp</commons.deployment.protocol>
+
+    <!--
+      Encoding of Java source files: ensures that the compiler and
+      the javadoc generator use the right encoding. Subprojects may
+      overwrite this, if they are using another encoding.
+    -->
+    <commons.encoding>iso-8859-1</commons.encoding>
+    <!-- used in this pom to provide the Javadoc HTML file encoding -->
+    <commons.docEncoding>${commons.encoding}</commons.docEncoding>
+    <!-- Define source encoding for filtering; used by general plugins -->
+    <project.build.sourceEncoding>${commons.encoding}</project.build.sourceEncoding>
+    <!-- This is used by reporting plugins -->
+    <project.reporting.outputEncoding>${commons.encoding}</project.reporting.outputEncoding>
+
+    <!-- Javadoc link to Java API. Default is Java 1.7; components can override to other versions -->
+    <commons.javadoc6.java.link>https://docs.oracle.com/javase/6/docs/api/</commons.javadoc6.java.link>
+    <commons.javadoc7.java.link>https://docs.oracle.com/javase/7/docs/api/</commons.javadoc7.java.link>
+    <commons.javadoc8.java.link>https://docs.oracle.com/javase/8/docs/api/</commons.javadoc8.java.link>
+    <commons.javadoc9.java.link>https://docs.oracle.com/javase/9/docs/api/</commons.javadoc9.java.link>
+    <commons.javadoc10.java.link>https://docs.oracle.com/javase/10/docs/api/</commons.javadoc10.java.link>
+    <commons.javadoc11.java.link>https://docs.oracle.com/en/java/javase/11/docs/api/</commons.javadoc11.java.link>
+    <commons.javadoc12.java.link>https://docs.oracle.com/en/java/javase/12/docs/api/</commons.javadoc12.java.link>
+    <commons.javadoc13.java.link>https://docs.oracle.com/en/java/javase/13/docs/api/</commons.javadoc13.java.link>
+    <commons.javadoc14.java.link>https://docs.oracle.com/en/java/javase/14/docs/api/</commons.javadoc14.java.link>
+    <commons.javadoc15.java.link>https://docs.oracle.com/en/java/javase/15/docs/api/</commons.javadoc15.java.link>
+    <commons.javadoc16.java.link>https://docs.oracle.com/en/java/javase/16/docs/api/</commons.javadoc16.java.link>
+    <commons.javadoc17.java.link>https://docs.oracle.com/en/java/javase/17/docs/api/</commons.javadoc17.java.link>
+    <commons.javadoc18.java.link>https://docs.oracle.com/en/java/javase/18/docs/api/</commons.javadoc18.java.link>
+
+    <commons.javadoc.java.link>${commons.javadoc7.java.link}</commons.javadoc.java.link>
+
+    <commons.javadoc.javaee5.link>https://docs.oracle.com/javaee/5/api/</commons.javadoc.javaee5.link>
+    <commons.javadoc.javaee6.link>https://docs.oracle.com/javaee/6/api/</commons.javadoc.javaee6.link>
+    <commons.javadoc.javaee7.link>https://docs.oracle.com/javaee/7/api/</commons.javadoc.javaee7.link>
+
+    <commons.javadoc.javaee.link>${commons.javadoc.javaee6.link}</commons.javadoc.javaee.link>
+
+    <!-- build meta inf -->
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
+    <implementation.build>${scmBranch}@r${buildNumber}; ${maven.build.timestamp}</implementation.build>
+
+    <!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->
+    <minSeverity>info</minSeverity>
+
+    <!-- Control number of issues retrieved from JIRA with changes plugin -->
+    <commons.changes.maxEntries>100</commons.changes.maxEntries>
+
+    <!-- Allow surefire-report aggregation to be easily configured for multi-module projects -->
+    <commons.surefire-report.aggregate>false</commons.surefire-report.aggregate>
+
+    <!-- Allow changes Jira report to be restricted to just the current version (plugin default is false) -->
+    <commons.changes.onlyCurrentVersion>false</commons.changes.onlyCurrentVersion>
+    <!-- Allow changes Jira report maxEntries to be overridden (plugin default 100) -->
+    <commons.changes.maxEntries>100</commons.changes.maxEntries>
+    <!-- Allow changes Jira report runOnlyAtExecutionRoot to be overridden (plugin default is false) -->
+    <commons.changes.runOnlyAtExecutionRoot>false</commons.changes.runOnlyAtExecutionRoot>
+
+    <!-- scm publish plugin configuration -->
+    <commons.site.cache>${user.home}/commons-sites</commons.site.cache>
+    <!-- value modules can override it -->
+    <commons.site.path>${commons.componentid}</commons.site.path>
+
+    <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-${commons.componentid}</commons.scmPubUrl>
+    <commons.scmPubCheckoutDirectory>${commons.site.cache}/${commons.site.path}</commons.scmPubCheckoutDirectory>
+    <commons.scmPubServer>commons.site</commons.scmPubServer>
+
+    <!-- allow japicmp's breakBuildOnBinaryIncompatibleModifications
+      to be overridden, plugin's default is false -->
+    <commons.japicmp.breakBuildOnBinaryIncompatibleModifications>true</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
+    <commons.japicmp.breakBuildOnSourceIncompatibleModifications>false</commons.japicmp.breakBuildOnSourceIncompatibleModifications>
+    <commons.japicmp.ignoreMissingClasses>false</commons.japicmp.ignoreMissingClasses>
+
+    <!-- Commons Release plugin: dist dev site -->
+    <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
+
+    <!-- Commons Release plugin: release manager -->
+    <commons.releaseManagerName>${user.name}</commons.releaseManagerName>
+    <commons.releaseManagerKey>DEADBEEF</commons.releaseManagerKey>
+
+    <sonar.host.url>https://analysis.apache.org/</sonar.host.url>
+
+    <!-- allow override of changes.announcementFile and directory -->
+    <changes.announcementDirectory>.</changes.announcementDirectory>
+    <changes.announcementFile>RELEASE-NOTES.txt</changes.announcementFile>
+
+  </properties>
 
   <mailingLists>
+    <!-- N.B. commons-site now uses the Apache POM so has its own copy of the mailing list definitions -->
+    <!--
+      Components should normally override the default mailing list report by using the comnand
+      mvn commons-build:mail-page
+      This generates the file src/site/xdoc/mail-lists.xml which when processed will replace the PIR version.
+    -->
+    <!-- Changes to this list should be synchronised with the commons build plugin -->
     <mailingList>
-      <name>Commons Commits List</name>
-      <subscribe>commits-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>commits-unsubscribe@commons.apache.org</unsubscribe>
-      <post>commits@commons.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-commits/</archive>
+      <name>Commons User List</name>
+      <subscribe>user-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
+      <post>user@commons.apache.org</post>
+      <archive>https://mail-archives.apache.org/mod_mbox/commons-user/</archive>
       <otherArchives>
-        <otherArchive>http://www.mail-archive.com/commits@commons.apache.org/</otherArchive>
+        <otherArchive>https://markmail.org/list/org.apache.commons.users/</otherArchive>
+        <otherArchive>https://www.mail-archive.com/user@commons.apache.org/</otherArchive>
       </otherArchives>
     </mailingList>
     <mailingList>
@@ -86,83 +365,547 @@
       <subscribe>dev-subscribe@commons.apache.org</subscribe>
       <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
       <post>dev@commons.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
+      <archive>https://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
       <otherArchives>
-        <otherArchive>http://www.mail-archive.com/dev@commons.apache.org/</otherArchive>
-        <otherArchive>http://www.nabble.com/Commons---Dev-f317.html</otherArchive>
+        <otherArchive>https://markmail.org/list/org.apache.commons.dev/</otherArchive>
+        <otherArchive>https://www.mail-archive.com/dev@commons.apache.org/</otherArchive>
       </otherArchives>
     </mailingList>
     <mailingList>
       <name>Commons Issues List</name>
       <subscribe>issues-subscribe@commons.apache.org</subscribe>
       <unsubscribe>issues-unsubscribe@commons.apache.org</unsubscribe>
-      <post>issues@commons.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-issues/</archive>
+      <archive>https://mail-archives.apache.org/mod_mbox/commons-issues/</archive>
       <otherArchives>
-        <otherArchive>http://www.mail-archive.com/issues@commons.apache.org/</otherArchive>
-        <otherArchive>http://www.nabble.com/Commons---Issues-f25499.html</otherArchive>
+        <otherArchive>https://markmail.org/list/org.apache.commons.issues/</otherArchive>
+        <otherArchive>https://www.mail-archive.com/issues@commons.apache.org/</otherArchive>
       </otherArchives>
     </mailingList>
     <mailingList>
-      <name>Commons User List</name>
-      <subscribe>user-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
-      <post>user@commons.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
+      <name>Commons Commits List</name>
+      <subscribe>commits-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@commons.apache.org</unsubscribe>
+      <archive>https://mail-archives.apache.org/mod_mbox/commons-commits/</archive>
+      <otherArchives>
+        <otherArchive>https://markmail.org/list/org.apache.commons.commits/</otherArchive>
+        <otherArchive>https://www.mail-archive.com/commits@commons.apache.org/</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Apache Announce List</name>
+      <subscribe>announce-subscribe@apache.org</subscribe>
+      <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
+      <archive>https://mail-archives.apache.org/mod_mbox/www-announce/</archive>
       <otherArchives>
-        <otherArchive>http://www.mail-archive.com/user@commons.apache.org/</otherArchive>
-        <otherArchive>http://www.nabble.com/Commons---User-f319.html</otherArchive>
+        <otherArchive>https://markmail.org/list/org.apache.announce/</otherArchive>
+        <otherArchive>https://www.mail-archive.com/announce@apache.org/</otherArchive>
       </otherArchives>
     </mailingList>
   </mailingLists>
+
+  <!--
+    This section *must* be overwritten by subprojects. It is only to allow
+    a release of the commons-parent POM.
+  -->
+  <scm>
+    <connection>scm:git:http://gitbox.apache.org/repos/asf/commons-parent.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-parent.git</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf?p=commons-parent.git</url>
+  </scm>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/COMMONSSITE</url>
+  </issueManagement>
+
+  <ciManagement>
+    <system>jenkins</system>
+    <url>https://builds.apache.org/</url>
+  </ciManagement>
+
   <build>
+    <!-- TODO find a better way to add N&L files to jars and test jars
+      See also maven-remote-resources-plugin configuration below.
+    -->
+    <defaultGoal>clean apache-rat:check package site</defaultGoal>
+    <resources>
+      <!-- This is the default setting from the super-pom -->
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <!-- hack to ensure the N&L appear in jars -->
+      <resource>
+        <directory>${basedir}</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+          <include>LICENSE.txt</include>
+          <include>NOTICE</include>
+          <include>LICENSE</include>
+        </includes>
+      </resource>
+    </resources>
+    <!-- ensure test jars also get NOTICE & LICENSE files -->
+    <testResources>
+      <!-- This is the default setting from the super-pom -->
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+      <!-- hack to ensure the N&L appear in jars -->
+      <testResource>
+        <directory>${basedir}</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+          <include>LICENSE.txt</include>
+          <include>NOTICE</include>
+          <include>LICENSE</include>
+        </includes>
+      </testResource>
+    </testResources>
     <pluginManagement>
       <plugins>
+        <!-- org.apache.maven.plugins, alpha order by artifact id -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${commons.compiler.version}</version>
+          <configuration>
+            <source>${maven.compiler.source}</source>
+            <target>${maven.compiler.target}</target>
+            <encoding>${commons.encoding}</encoding>
+            <!--
+              fork is set true by the java-1.x profiles
+              This allows the use of a different version of the compiler from the
+              JDK being used to run Maven
+            -->
+            <fork>${commons.compiler.fork}</fork>
+            <!-- the following are only needed if fork is true -->
+            <compilerVersion>${commons.compiler.compilerVersion}</compilerVersion>
+            <executable>${commons.compiler.javac}</executable>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.0-alpha-3</version>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>${commons.assembly-plugin.version}</version>
         </plugin>
+        <!-- Apache parent includes docck -->
+        <!-- Apache parent: invoker -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.1</version>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${commons.javadoc.version}</version>
+          <configuration>
+            <!-- Keep only errors and warnings -->
+            <quiet>true</quiet>
+            <source>${maven.compiler.source}</source>
+            <javadocExecutable>${commons.compiler.javadoc}</javadocExecutable>
+            <encoding>${commons.encoding}</encoding>
+            <docencoding>${commons.docEncoding}</docencoding>
+            <!-- Prevent too many SCM changes -->
+            <notimestamp>true</notimestamp>
+            <linksource>true</linksource>
+            <links>
+              <link>${commons.javadoc.java.link}</link>
+              <link>${commons.javadoc.javaee.link}</link>
+            </links>
+            <archive>
+              <manifest>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              </manifest>
+            </archive>
+          </configuration>
         </plugin>
         <plugin>
+          <!-- TODO see above - find better way to add N&L files to jars and test jars -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.0-alpha-6</version>
+          <configuration>
+            <!--
+              Apache parent POM automatically adds "LICENSE" and "NOTICE" files
+              to jars - duplicating the "LICENSE.txt" and "NOTICE.txt"
+              files that components already have.
+            -->
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- Apache parent: scm -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>${commons.site-plugin.version}</version>
+          <configuration>
+            <!-- don't deploy site with maven-site-plugin -->
+            <skipDeploy>true</skipDeploy>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <!-- add support for ssh/scp -->
+              <groupId>org.apache.maven.wagon</groupId>
+              <artifactId>wagon-ssh</artifactId>
+              <version>${commons.wagon-ssh.version}</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <id>attach-descriptor</id>
+              <goals>
+                <goal>attach-descriptor</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>2.0.4</version>
+          <version>${commons.source-plugin.version}</version>
+          <configuration>
+            <archive>
+              <manifest>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              </manifest>
+            </archive>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.3</version>
+          <version>${commons.surefire.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-1</version>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${commons.failsafe.version}</version>
+        </plugin>
+        <!-- Other plugins, alpha order by groupId and artifactId -->
+        <plugin>
+          <groupId>com.github.siom79.japicmp</groupId>
+          <artifactId>japicmp-maven-plugin</artifactId>
+          <version>${commons.japicmp.version}</version>
+          <configuration>
+            <oldVersion>
+              <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>${project.artifactId}</artifactId>
+                <version>${commons.bc.version}</version>
+                <type>jar</type>
+              </dependency>
+            </oldVersion>
+            <newVersion>
+              <file>
+                <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+              </file>
+            </newVersion>
+            <parameter>
+              <onlyModified>true</onlyModified>
+              <breakBuildOnBinaryIncompatibleModifications>${commons.japicmp.breakBuildOnBinaryIncompatibleModifications}</breakBuildOnBinaryIncompatibleModifications>
+              <breakBuildOnSourceIncompatibleModifications>${commons.japicmp.breakBuildOnSourceIncompatibleModifications}</breakBuildOnSourceIncompatibleModifications>
+              <!-- skip japicmp on "mvn site" - use "mvn package site" to include report -->
+              <ignoreMissingNewVersion>true</ignoreMissingNewVersion>
+              <reportOnlyFilename>true</reportOnlyFilename>
+              <skipPomModules>true</skipPomModules>
+              <ignoreMissingClasses>${commons.japicmp.ignoreMissingClasses}</ignoreMissingClasses>
+              <overrideCompatibilityChangeParameters>
+                <overrideCompatibilityChangeParameter>
+                  <compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
+                  <binaryCompatible>true</binaryCompatible>
+                  <sourceCompatible>true</sourceCompatible>
+                  <semanticVersionLevel>PATCH</semanticVersionLevel>
+                </overrideCompatibilityChangeParameter>
+              </overrideCompatibilityChangeParameters>
+            </parameter>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-build-plugin</artifactId>
+          <version>${commons.build-plugin.version}</version>
+          <configuration>
+            <commons.release.name>${commons.release.name}</commons.release.name>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-release-plugin</artifactId>
+          <version>${commons.release-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>${commons.felix.version}</version>
+          <inherited>true</inherited>
+          <dependencies>
+            <dependency>
+              <!-- Fixes https://github.com/bndtools/bnd/issues/3903 seen with Commons CSV. -->
+              <groupId>biz.aQute.bnd</groupId>
+              <artifactId>biz.aQute.bndlib</artifactId>
+              <version>${commons.biz.aQute.bndlib.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>${commons.rat.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>${commons.build-helper.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>buildnumber-maven-plugin</artifactId>
+          <version>${commons.buildnumber-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>clirr-maven-plugin</artifactId>
+          <version>${commons.clirr.version}</version>
+          <configuration>
+            <minSeverity>${minSeverity}</minSeverity>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>versions-maven-plugin</artifactId>
+          <!-- Version 2.2 causes an NPE with Maven 3.3.9 -->
+          <version>2.11.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>${commons.jacoco.version}</version>
+          <!-- Note that since JaCoCo relies on an agent to perform tests,
+            it changes the surefire arguments line. If a component also
+            needs to change the argument line of maven-surefire-plugin,
+            then it must add ${argLine} property (which is set by JaCoCo)
+            in the argLine configuration element of maven-surefire-plugin
+            to preserve JaCoCo settings. -->
+          <executions>
+            <execution>
+              <id>prepare-agent</id>
+              <phase>process-test-classes</phase>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>report</id>
+              <phase>site</phase>
+              <goals>
+                <goal>report</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>check</id>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <configuration>
+                <rules>
+                  <rule>
+                    <element>BUNDLE</element>
+                    <limits>
+                      <limit>
+                        <counter>CLASS</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${commons.jacoco.classRatio}</minimum>
+                      </limit>
+                      <limit>
+                        <counter>INSTRUCTION</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${commons.jacoco.instructionRatio}</minimum>
+                      </limit>
+                      <limit>
+                        <counter>METHOD</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${commons.jacoco.methodRatio}</minimum>
+                      </limit>
+                      <limit>
+                        <counter>BRANCH</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${commons.jacoco.branchRatio}</minimum>
+                      </limit>
+                      <limit>
+                        <counter>LINE</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${commons.jacoco.lineRatio}</minimum>
+                      </limit>
+                      <limit>
+                        <counter>COMPLEXITY</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${commons.jacoco.complexityRatio}</minimum>
+                      </limit>
+                    </limits>
+                  </rule>
+                </rules>
+                <haltOnFailure>${commons.jacoco.haltOnFailure}</haltOnFailure>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>${commons.project-info.version}</version>
+          <dependencies>
+            <!-- Fix org.apache.bcel.classfile.ClassFormatException: Invalid byte tag in constant pool: 19 -->
+            <dependency>
+              <groupId>org.apache.bcel</groupId>
+              <artifactId>bcel</artifactId>
+              <version>6.5.0</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>${commons.checkstyle-plugin.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>com.puppycrawl.tools</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>${commons.checkstyle.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>com.github.spotbugs</groupId>
+          <artifactId>spotbugs-maven-plugin</artifactId>
+          <version>${commons.spotbugs.plugin.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>com.github.spotbugs</groupId>
+              <artifactId>spotbugs</artifactId>
+              <version>${commons.spotbugs.impl.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>${commons.pmd.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>net.sourceforge.pmd</groupId>
+              <artifactId>pmd-core</artifactId>
+              <version>${commons.pmd-impl.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>net.sourceforge.pmd</groupId>
+              <artifactId>pmd-java</artifactId>
+              <version>${commons.pmd-impl.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>net.sourceforge.pmd</groupId>
+              <artifactId>pmd-javascript</artifactId>
+              <version>${commons.pmd-impl.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>net.sourceforge.pmd</groupId>
+              <artifactId>pmd-jsp</artifactId>
+              <version>${commons.pmd-impl.version}</version>
+            </dependency>
+          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
-      <!-- TODO: later use toolchain support to do compilation on an external JDK 1.3+ compiler -->
+      <!-- org.apache.maven.plugins, alpha order by artifact id -->
+      <plugin>
+        <!-- Parent POM is released, so needs source archive for ASF mirrors -->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!--
+          - Copy LICENSE.txt and NOTICE.txt so that they are included
+          - in the -javadoc jar file for the component.
+        -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>javadoc.resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy todir="${project.build.directory}/apidocs/META-INF">
+                  <fileset dir="${basedir}">
+                    <include name="LICENSE.txt" />
+                    <include name="NOTICE.txt" />
+                    <include name="LICENSE" />
+                    <include name="NOTICE" />
+                  </fileset>
+                </copy>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <!-- Unfortunately the much simpler
+        <prerequisites><maven>3.0</maven></prerequisites>
+        is not inherited so we have to use the enforcer plugin
+      -->
+      <plugin>
+        <inherited>true</inherited>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>${commons.enforcer-plugin.version}</version>
         <configuration>
-          <source>${maven.compile.source}</source>
-          <target>${maven.compile.target}</target>
+          <rules>
+            <requireMavenVersion>
+              <version>3.5.0</version>
+            </requireMavenVersion>
+            <requireJavaVersion>
+              <version>${maven.compiler.target}</version>
+            </requireJavaVersion>
+          </rules>
+          <fail>true</fail>
         </configuration>
+        <executions>
+          <execution>
+            <id>enforce-maven-3</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>${commons.jar-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <!-- Avoids an error when releasing the parent pom -->
+              <skipIfEmpty>true</skipIfEmpty>
+            </configuration>
+          </execution>
+        </executions>
         <configuration>
           <archive>
+            <manifestFile>${commons.manifestfile}</manifestFile>
             <manifestEntries>
               <Specification-Title>${project.name}</Specification-Title>
               <Specification-Version>${project.version}</Specification-Version>
@@ -171,46 +914,239 @@
               <Implementation-Version>${project.version}</Implementation-Version>
               <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-              <X-Compile-Target-JDK>${maven.compile.source}</X-Compile-Target-JDK>
+              <Implementation-Build>${implementation.build}</Implementation-Build>
+              <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+              <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
             </manifestEntries>
           </archive>
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-idea-plugin</artifactId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-source-jar</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+              <goal>test-jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!--
+            commons.surefire.java is normally empty.
+            It is defined by the java-1.x profiles to change the JVM used by Surefire
+          -->
+          <jvm>${commons.surefire.java}</jvm>
+        </configuration>
+      </plugin>
+      <!-- Other plugins, alpha order by groupId and artifactId -->
+      <plugin>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-build-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <!--
+            dummy entry to stop bundle plugin from picking up jar config and reporting
+            WARNING: Duplicate name in Manifest
+            See http://markmail.org/message/mpkl24wk3jrjhhjg
+          -->
+          <archive>
+            <forced>true</forced>
+          </archive>
+          <excludeDependencies>${commons.osgi.excludeDependencies}</excludeDependencies>
+          <manifestLocation>${project.build.directory}/osgi</manifestLocation>
+          <instructions>
+            <!-- stops the "uses" clauses being added to "Export-Package" manifest entry -->
+            <_nouses>true</_nouses>
+            <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->
+            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME,JAVA_1_8_HOME,JAVA_1_9_HOME</_removeheaders>
+            <Bundle-SymbolicName>${commons.osgi.symbolicName}</Bundle-SymbolicName>
+            <Export-Package>${commons.osgi.export}</Export-Package>
+            <Private-Package>${commons.osgi.private}</Private-Package>
+            <Import-Package>${commons.osgi.import}</Import-Package>
+            <DynamicImport-Package>${commons.osgi.dynamicImport}</DynamicImport-Package>
+            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check -->
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <!-- Should agree with config in reporting section -->
         <configuration>
-          <jdkLevel>${maven.compile.source}</jdkLevel>
+          <!--
+            If you wish to override this list in the component (child) pom, ensure you use
+            <excludes combine.children="merge">
+            so that the child pom entries replace the parent entries
+          -->
+          <excludes combine.children="append">
+            <exclude>site-content/**</exclude>
+            <exclude>.checkstyle</exclude>
+            <exclude>.fbprefs</exclude>
+            <exclude>.pmd</exclude>
+            <exclude>.asf.yaml</exclude>
+            <exclude>src/site/resources/download_*.cgi</exclude>
+            <exclude>src/site/resources/profile.*</exclude>
+            <exclude>profile.*</exclude>
+            <!-- Exclude Eclipse local files and folders -->
+            <exclude>maven-eclipse.xml</exclude>
+            <exclude>.externalToolBuilders/**</exclude>
+            <!-- Visual Studio code files -->
+            <exclude>.vscode/**</exclude>
+          </excludes>
         </configuration>
+        <executions>
+          <execution>
+            <id>rat-check</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <configuration>
+          <content>${project.reporting.outputDirectory}</content>
+          <pubScmUrl>scm:svn:${commons.scmPubUrl}</pubScmUrl>
+          <checkoutDirectory>${commons.scmPubCheckoutDirectory}</checkoutDirectory>
+          <serverId>${commons.scmPubServer}</serverId>
+          <tryUpdate>true</tryUpdate>
+        </configuration>
+        <executions>
+          <execution>
+            <id>scm-publish</id>
+            <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+            <goals>
+              <goal>publish-scm</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
 
   <reporting>
+    <!-- N.B. plugins defined here in the <reporting> section ignore what's defined in <pluginManagement>
+      in the <build> section above, so we have to define the versions here. -->
     <plugins>
+      <!-- org.apache.maven.plugins, alpha order by artifact id -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changes-plugin</artifactId>
+        <version>${commons.changes.version}</version>
+        <configuration>
+          <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
+          <columnNames>Fix Version,Key,Component,Summary,Type,Resolution,Status</columnNames>
+          <!-- Sort cols in natural order when using JQL for JIRA 5.1 -->
+          <sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>
+          <resolutionIds>Fixed</resolutionIds>
+          <statusIds>Resolved,Closed</statusIds>
+          <!-- Don't include sub-task -->
+          <typeIds>Bug,New Feature,Task,Improvement,Wish,Test</typeIds>
+          <!-- For JIRA >= 5.1 -->
+          <useJql>true</useJql>
+          <onlyCurrentVersion>${commons.changes.onlyCurrentVersion}</onlyCurrentVersion>
+          <maxEntries>${commons.changes.maxEntries}</maxEntries>
+          <runOnlyAtExecutionRoot>${commons.changes.runOnlyAtExecutionRoot}</runOnlyAtExecutionRoot>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+              <report>jira-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.2</version>
-        <configuration> 
-          <aggregate>true</aggregate>
-        </configuration> 
+        <version>${commons.javadoc.version}</version>
+        <!-- Suppress test Javadocs -->
+        <reportSets>
+          <reportSet>
+            <id>default</id>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
-        <configuration> 
-          <aggregate>true</aggregate>
-        </configuration> 
+        <version>${commons.jxr.version}</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>${commons.project-info.version}</version>
+        <!--
+          Unfortunately it does not appear to be possible to override
+          reports configured in a parent POM.
+          See https://issues.apache.org/jira/browse/MPIR-241
+          and https://issues.apache.org/jira/browse/MPOM-32
+          So we define here all those reports that are suitable for
+          all components.
+          Components can add extra reports if they wish, but cannot disable any.
+        -->
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+              <report>summary</report>
+              <report>modules</report>
+              <!-- <report>license</report> site must link to ASF page instead -->
+              <report>team</report>
+              <report>scm</report>
+              <report>issue-management</report>
+              <report>mailing-lists</report>
+              <report>dependency-info</report>
+              <report>dependency-management</report>
+              <report>dependencies</report>
+              <report>dependency-convergence</report>
+              <report>ci-management</report>
+              <!-- <report>plugin-management</report> not very useful for end users -->
+              <!-- <report>plugins</report> not very useful for end users -->
+              <report>distribution-management</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
+        <version>${commons.site-plugin.version}</version>
         <configuration>
           <!-- Exclude the navigation file for Maven 1 sites
-               and the changes file used by the changes-plugin,
-               as they interfere with the site generation. -->
+            and the changes file used by the changes-plugin,
+            as they interfere with the site generation. -->
           <moduleExcludes>
             <xdoc>navigation.xml,changes.xml</xdoc>
           </moduleExcludes>
@@ -219,133 +1155,395 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jdepend-maven-plugin</artifactId>
-        <version>2.0-beta-1</version>
+        <version>${commons.surefire-report.version}</version>
+        <configuration>
+          <aggregate>${commons.surefire-report.aggregate}</aggregate>
+        </configuration>
       </plugin>
+      <!-- Other plugins, alpha order by groupId and artifactId -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>${commons.rat.version}</version>
+        <!-- Should agree with config in build section -->
+        <configuration>
+          <!--
+            If you wish to override this list in the component (child) pom, ensure you use
+            <excludes combine.children="merge">
+            so that the child pom entries replace the parent entries
+          -->
+          <excludes combine.children="append">
+            <exclude>site-content/**</exclude>
+            <exclude>.checkstyle</exclude>
+            <exclude>.fbprefs</exclude>
+            <exclude>.pmd</exclude>
+            <exclude>.asf.yaml</exclude>
+            <exclude>src/site/resources/download_*.cgi</exclude>
+            <exclude>src/site/resources/profile.*</exclude>
+            <exclude>profile.*</exclude>
+            <!-- Exclude Eclipse local files and folders -->
+            <exclude>maven-eclipse.xml</exclude>
+            <exclude>.externalToolBuilders/**</exclude>
+            <!-- Visual Studio code files -->
+            <exclude>.vscode/**</exclude>
+          </excludes>
+        </configuration>
       </plugin>
     </plugins>
   </reporting>
 
   <profiles>
     <profile>
-      <id>ci</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-
-    <profile>
-      <id>release</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.releases</id>
-          <name>Apache Release Distribution Repository</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-        </repository>
-      </distributionManagement>
+      <id>svn</id>
+      <activation>
+        <file>
+          <exists>.svn</exists>
+        </file>
+      </activation>
       <build>
         <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
           <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>buildnumber-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
+                <phase>validate</phase>
                 <goals>
-                  <goal>sign</goal>
+                  <goal>create</goal>
                 </goals>
               </execution>
             </executions>
+            <configuration>
+              <!-- Use committed revision so it does not change every time svn update is run -->
+              <useLastCommittedRevision>true</useLastCommittedRevision>
+              <!-- default revision number if unavailable -->
+              <revisionOnScmFailure>??????</revisionOnScmFailure>
+              <!-- svnjava works even if an svn command-line client is not on the path -->
+              <providerImplementations>
+                <svn>javasvn</svn>
+              </providerImplementations>
+            </configuration>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <!--
+        Add an automatic module name to the manifest if the file
+        'profile.module-name' exists. The name must be provided in the property
+        'commons.module.name'.
+      -->
+      <id>module-name</id>
+      <activation>
+        <file>
+          <exists>profile.module-name</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
           <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>create-source-jar</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <archive combine.children="append">
+                <manifestEntries>
+                  <Automatic-Module-Name>${commons.module.name}</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <!--
+        Make the version parts of the maven.compiler.target property
+        available as separate properties, so that they can be used to define
+        the java signature artifactId used by animal-sniffer etc.
+      -->
+      <id>parse-target-version</id>
+      <activation>
+        <property>
+          <!--
+            This property should always be defined.
+            The intention is to ensure that the profile is always enabled.
+            (activeByDefault only applies if other profiles are not enabled)
+          -->
+          <name>user.home</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
           <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>create-javadoc-jar</id>
+                <id>parse-version</id>
+                <!-- default is: <phase>validate</phase> -->
                 <goals>
-                  <goal>jar</goal>
+                  <goal>parse-version</goal>
                 </goals>
                 <configuration>
-                  <source>${maven.compile.source}</source>
+                  <propertyPrefix>javaTarget</propertyPrefix>
+                  <versionString>${maven.compiler.target}</versionString>
                 </configuration>
               </execution>
             </executions>
           </plugin>
-          <!-- We want to package license resources into the JARs -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-remote-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>process</goal>
-                </goals>
-                <configuration>
-                  <resourceBundles>
-                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
-                  </resourceBundles>
-                </configuration>
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+      Runs the Animal Sniffer plugin to check that generated code does not included references
+      to methods/classes etc that are not present in the standard Java runtime for the defined target version.
+      To bypass the checks, define "animal.sniffer.skip" as true, or create the file "src/site/resources/profile.noanimal"
+    -->
+
+    <profile>
+      <id>animal-sniffer</id>
+      <activation>
+        <!-- active unless the file is found -->
+        <file>
+          <missing>src/site/resources/profile.noanimal</missing>
+        </file>
+      </activation>
+
+      <properties>
+        <!-- define this as a property to allow command-line override -->
+        <animal-sniffer.signature>java${javaTarget.majorVersion}${javaTarget.minorVersion}</animal-sniffer.signature>
+      </properties>
+
+      <build>
+        <plugins>
+
+          <!-- Run the Animal Sniffer checks -->
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>animal-sniffer-maven-plugin</artifactId>
+            <version>${commons.animal-sniffer.version}</version>
+            <executions>
+              <execution>
+                <id>checkAPIcompatibility</id>
+                <!-- default is: <phase>process-classes</phase> -->
+                <!-- Note: if the plugin is ever enhanced to check test classes
+                  it will presumably need to be bound to process-test-classes instead
+                -->
+                <goals>
+                  <goal>check</goal>
+                </goals>
               </execution>
             </executions>
+            <configuration>
+              <signature>
+                <groupId>org.codehaus.mojo.signature</groupId>
+                <artifactId>${animal-sniffer.signature}</artifactId>
+                <version>${commons.animal-sniffer.signature.version}</version>
+              </signature>
+            </configuration>
           </plugin>
+
         </plugins>
       </build>
     </profile>
 
     <profile>
-      <id>rc</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-      </distributionManagement>
+      <id>jacoco</id>
+      <activation>
+        <!--
+          N.B. in spite of what the Maven docs may say,
+          activation conditions are ORed together, see:
+          https://issues.apache.org/jira/browse/MNG-4565
+          Fairly useless, but that's what was done in
+          https://issues.apache.org/jira/browse/MNG-3106
+
+          So we cannot also check for Java 1.5+
+          This should not be a problem now as the profile is optional.
+          Components that still target Java 1.4 or earlier
+          just need to ensure they don't use JaCoCo by default.
+        -->
+        <file>
+          <exists>src/site/resources/profile.jacoco</exists>
+        </file>
+      </activation>
       <build>
         <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
           <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>${commons.jacoco.version}</version>
+          </plugin>
+        </plugins>
+      </build>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>${commons.jacoco.version}</version>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <!-- select non-aggregate reports -->
+                  <report>report</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+
+    <profile>
+      <id>cobertura</id>
+      <activation>
+        <file>
+          <exists>src/site/resources/profile.cobertura</exists>
+        </file>
+      </activation>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>${commons.cobertura.version}</version>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+
+    <profile>
+      <id>clirr</id>
+      <activation>
+        <file>
+          <exists>src/site/resources/profile.clirr</exists>
+        </file>
+      </activation>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>clirr-maven-plugin</artifactId>
+            <version>${commons.clirr.version}</version>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+
+    <!-- alternative to clirr, will fail build if binary compatibility is broken -->
+    <profile>
+      <id>japicmp</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+        <file>
+          <exists>src/site/resources/profile.japicmp</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.siom79.japicmp</groupId>
+            <artifactId>japicmp-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>cmp</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>com.github.siom79.japicmp</groupId>
+            <artifactId>japicmp-maven-plugin</artifactId>
+            <version>${commons.japicmp.version}</version>
+            <configuration>
+              <parameter>
+                <onlyModified>true</onlyModified>
+                <breakBuildOnBinaryIncompatibleModifications>${commons.japicmp.breakBuildOnBinaryIncompatibleModifications}</breakBuildOnBinaryIncompatibleModifications>
+                <breakBuildOnSourceIncompatibleModifications>${commons.japicmp.breakBuildOnSourceIncompatibleModifications}</breakBuildOnSourceIncompatibleModifications>
+                <!-- skip japicmp on "mvn site" - use "mvn package site" to include report -->
+                <ignoreMissingNewVersion>true</ignoreMissingNewVersion>
+                <reportOnlyFilename>true</reportOnlyFilename>
+                <skipPomModules>true</skipPomModules>
+                <ignoreMissingClasses>${commons.japicmp.ignoreMissingClasses}</ignoreMissingClasses>
+                <overrideCompatibilityChangeParameters>
+                  <overrideCompatibilityChangeParameter>
+                    <compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
+                    <binaryCompatible>true</binaryCompatible>
+                    <sourceCompatible>true</sourceCompatible>
+                    <semanticVersionLevel>PATCH</semanticVersionLevel>
+                  </overrideCompatibilityChangeParameter>
+                </overrideCompatibilityChangeParameters>
+              </parameter>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+
+    <!--
+      Profile for Commons releases via Nexus.
+      Assembles artifacts, creates source and javadoc jars, signs them and adds hashes.
+    -->
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-install-plugin</artifactId>
             <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
+              <createChecksum>true</createChecksum>
             </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-release-plugin</artifactId>
+            <configuration>
+              <!-- Pass these arguments to the deploy plugin. -->
+              <arguments>-Prelease</arguments>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>create-javadoc-jar</id>
+                <goals>
+                  <goal>javadoc</goal>
+                  <goal>jar</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <source>${maven.compiler.source}</source>
+              <javadocExecutable>${commons.compiler.javadoc}</javadocExecutable>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>${commons.assembly-plugin.version}</version>
+            <inherited>true</inherited>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <!-- COMMONSSITE-87 Ensure this runs after all package phase plugins -->
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+          <plugin>
+            <artifactId>maven-gpg-plugin</artifactId>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -357,64 +1555,441 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-source-plugin</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-release-plugin</artifactId>
             <executions>
               <execution>
-                <id>create-source-jar</id>
+                <id>clean-staging</id>
+                <phase>clean</phase>
                 <goals>
-                  <goal>jar</goal>
+                  <goal>clean-staging</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>detatch-distributions</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>detach-distributions</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>stage-distributions</id>
+                <phase>deploy</phase>
+                <goals>
+                  <goal>stage-distributions</goal>
                 </goals>
               </execution>
             </executions>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+      profile to update the Apache parent pom profile of the same name
+      to better suit the requirements of Apache Commons.
+      [Requires further work]
+    -->
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-release-plugin</artifactId>
+            <configuration>
+              <releaseProfiles>apache-release</releaseProfiles>
+            </configuration>
+          </plugin>
           <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
             <executions>
               <execution>
-                <id>create-javadoc-jar</id>
+                <id>attach-test-sources</id>
                 <goals>
-                  <goal>jar</goal>
+                  <goal>test-jar</goal>
                 </goals>
-                <configuration>
-                  <source>${maven.compile.source}</source>
-                </configuration>
               </execution>
             </executions>
           </plugin>
-          <!-- We want to package license resources into the JARs -->
+          <plugin>
+            <artifactId>maven-install-plugin</artifactId>
+            <configuration>
+              <createChecksum>true</createChecksum>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-remote-resources-plugin</artifactId>
+            <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
                 <goals>
-                  <goal>process</goal>
+                  <goal>test-jar</goal>
                 </goals>
-                <configuration>
-                  <resourceBundles>
-                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
-                  </resourceBundles>
-                </configuration>
               </execution>
             </executions>
           </plugin>
         </plugins>
       </build>
     </profile>
-  </profiles>
 
-  <properties>
+    <!--
+      Profile for running the build using JDK 1.3
+      (JAVA_1_3_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.3</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.3</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_3_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_3_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_3_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
 
-    <!-- Default configuration for compiler source and target JVM -->
-    <maven.compile.source>1.3</maven.compile.source>
-    <maven.compile.target>1.3</maven.compile.target>
+    <!--
+      Profile for running the build using JDK 1.4
+      (JAVA_1_4_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.4</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.4</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_4_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_4_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_4_HOME}/bin/java</commons.surefire.java>
+        <!-- later versions of surefire don't support Java 1.4 -->
+        <commons.surefire.version>2.11</commons.surefire.version>
+      </properties>
+    </profile>
 
     <!--
-      Make the deployment protocol pluggable. This allows to switch to
-      other protocols like scpexe, which some users prefer over scp.
+      Profile for running the build using JDK 1.5
+      (JAVA_1_5_HOME needs to be defined, e.g. in settings.xml or an environment variable)
     -->
-    <commons.deployment.protocol>scp</commons.deployment.protocol>
+    <profile>
+      <id>java-1.5</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.5</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_5_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_5_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_5_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
 
-  </properties>
+    <!--
+      Profile for running the build using JDK 1.6
+      (JAVA_1_6_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.6</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.6</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_6_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_6_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_6_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!--
+      Profile for running the build using JDK 7
+      (JAVA_1_7_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.7</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.7</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_7_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_7_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_7_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!--
+      Profile for running the build using JDK 8
+      (JAVA_1_8_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.8</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.8</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_8_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_8_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_8_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!--
+      Profile for running the build using JDK 9
+      (JAVA_1_9_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.9</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.9</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_9_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_9_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_9_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!--
+      Profile for running the build using JDK 10
+      (JAVA_1_10_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.10</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.10</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_10_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_10_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_10_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!--
+      Profile for running the build using JDK 11
+      (JAVA_1_11_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.11</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.11</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_11_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_11_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_11_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!--
+      Profile for running the build using JDK 12
+      (JAVA_1_12_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.12</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.12</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_12_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_12_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_12_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!--
+      Profile for running the build using JDK 13
+      (JAVA_1_13_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+    -->
+    <profile>
+      <id>java-1.13</id>
+      <properties>
+        <commons.compiler.fork>true</commons.compiler.fork>
+        <commons.compiler.compilerVersion>1.13</commons.compiler.compilerVersion>
+        <commons.compiler.javac>${JAVA_1_13_HOME}/bin/javac</commons.compiler.javac>
+        <commons.compiler.javadoc>${JAVA_1_13_HOME}/bin/javadoc</commons.compiler.javadoc>
+        <commons.surefire.java>${JAVA_1_13_HOME}/bin/java</commons.surefire.java>
+      </properties>
+    </profile>
+
+    <!-- N.B. when adding new java profiles, be sure to update
+      the _removeheaders list in the maven_bundle_plugin configuration -->
+
+    <!--
+      | Profile to allow testing of deploy phase
+      | e.g.
+      | mvn deploy -Ptest-deploy -Prelease -Dgpg.skip
+    -->
+    <profile>
+      <id>test-deploy</id>
+      <properties>
+        <altDeploymentRepository>id::default::file:target/deploy</altDeploymentRepository>
+        <commons.release.dryRun>true</commons.release.dryRun>
+      </properties>
+    </profile>
+
+    <profile>
+      <!--
+        Generate release notes in top-level directory from src/changes/changes.xml
+        Usage:
+        mvn changes:announcement-generate -Prelease-notes [-Dchanges.version=nnn]
+
+        Defining changes.version allows one to create the RN without first removing the SNAPSHOT suffix.
+
+        Requires file src/changes/release-notes.vm.
+        A sample template is available from:
+        https://gitbox.apache.org/repos/asf?p=commons-parent.git;a=blob_plain;f=src/changes/release-notes.vm;hb=HEAD
+      -->
+      <id>release-notes</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-changes-plugin</artifactId>
+            <version>${commons.changes.version}</version>
+            <configuration>
+              <template>release-notes.vm</template>
+              <templateDirectory>src/changes</templateDirectory>
+              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+              <announcementDirectory>${changes.announcementDirectory}</announcementDirectory>
+              <announcementFile>${changes.announcementFile}</announcementFile>
+              <announceParameters>
+                <releaseVersion>${commons.release.version}</releaseVersion>
+              </announceParameters>
+            </configuration>
+            <executions>
+              <execution>
+                <id>create-release-notes</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>announcement-generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+      Automatically run the buildnumber plugin unless the buildNumber.skip property is defined as true
+    -->
+    <profile>
+      <id>svn-buildnumber</id>
+      <activation>
+        <property>
+          <name>!buildNumber.skip</name>
+          <value>!true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>buildnumber-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>create</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <!-- Use committed revision so it does not change every time svn update is run -->
+              <useLastCommittedRevision>true</useLastCommittedRevision>
+              <!-- default revision number if unavailable -->
+              <revisionOnScmFailure>??????</revisionOnScmFailure>
+              <doCheck>false</doCheck>
+              <doUpdate>false</doUpdate>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- optional profile to use javasvn instead of the SVN CLI for the buildNumber plugin -->
+    <profile>
+      <id>javasvn</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>buildnumber-maven-plugin</artifactId>
+            <configuration>
+              <providerImplementations>
+                <svn>javasvn</svn>
+              </providerImplementations>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- profile to allow the use of plugin versions that require Java 7 -->
+    <profile>
+      <id>jdk7-plugin-fix-version</id>
+      <activation>
+        <jdk>[1.7,1.8)</jdk>
+      </activation>
+      <properties>
+        <commons.felix.version>3.5.1</commons.felix.version>
+        <commons.animal-sniffer.version>1.17</commons.animal-sniffer.version>
+        <commons.biz.aQute.bndlib.version>3.5.0</commons.biz.aQute.bndlib.version>
+      </properties>
+    </profile>
+
+    <!-- allow simple creation of the site without any optional reports -->
+    <profile>
+      <id>site-basic</id>
+      <properties>
+        <skipTests>true</skipTests>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <cobertura.skip>true</cobertura.skip>
+        <findbugs.skip>true</findbugs.skip>
+        <spotbugs.skip>true</spotbugs.skip>
+        <checkstyle.skip>true</checkstyle.skip>
+        <clirr.skip>true</clirr.skip>
+        <changes.jira.skip>true</changes.jira.skip>
+        <rat.skip>true</rat.skip> <!-- from version 0.12 -->
+        <jacoco.skip>true</jacoco.skip>
+        <skipSurefireReport>true</skipSurefireReport>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>travis-cobertura</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>${commons.cobertura.version}</version>
+            <configuration>
+              <formats>
+                <format>xml</format>
+              </formats>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.eluder.coveralls</groupId>
+            <artifactId>coveralls-maven-plugin</artifactId>
+            <version>${commons.coveralls.version}</version>
+            <configuration>
+              <timestampFormat>${commons.coveralls.timestampFormat}</timestampFormat>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>travis-jacoco</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>${commons.jacoco.version}</version>
+          </plugin>
+          <plugin>
+            <groupId>org.eluder.coveralls</groupId>
+            <artifactId>coveralls-maven-plugin</artifactId>
+            <version>${commons.coveralls.version}</version>
+            <configuration>
+              <timestampFormat>${commons.coveralls.timestampFormat}</timestampFormat>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
 
 </project>
diff --git a/spec/data/commons-logging/pom.xml b/spec/data/commons-logging/pom.xml
index e4b45031..305b2c15 100644
--- a/spec/data/commons-logging/pom.xml
+++ b/spec/data/commons-logging/pom.xml
@@ -1,504 +1,833 @@
 <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  http://www.apache.org/licenses/LICENSE-2.0
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!--
-    - Note that due to the special requirements of logging unit-tests, most
-    - tests are executed in the "integration-test" phase rather than the
-    - "test" phase. Please run "mvn integration-test" to run the full suite of
-    - available unit tests.
+      Note that due to the special requirements of logging unit-tests, most
+      tests are executed in the "integration-test" phase rather than the
+      "test" phase. Please run "mvn integration-test" to run the full suite of
+      available unit tests.
     -->
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>5</version>
+    <version>72</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-logging</groupId>
   <artifactId>commons-logging</artifactId>
-  <name>Commons Logging</name>
-  <version>1.1.1</version>
-  <description>Commons Logging is a thin adapter allowing configurable bridging to other,
-    well known logging systems.</description>
-  <url>http://commons.apache.org/logging</url>
-
+  <name>Apache Commons Logging</name>
+  <version>1.3.4</version>
+  <description>Apache Commons Logging is a thin adapter allowing configurable bridging to other,
+    well-known logging systems.</description>
+  <url>https://commons.apache.org/proper/commons-logging/</url>
+  <properties>
+    <animal-sniffer.signature>java18</animal-sniffer.signature>
+    <commons.logging.javaversion>1.8</commons.logging.javaversion>
+    <maven.compiler.source>${commons.logging.javaversion}</maven.compiler.source>
+    <maven.compiler.target>${commons.logging.javaversion}</maven.compiler.target>
+    <commons.componentid>logging</commons.componentid>
+    <commons.module.name>org.apache.commons.logging</commons.module.name>
+    <commons.release.version>1.3.4</commons.release.version>
+    <commons.release.next>1.3.5</commons.release.next>
+    <commons.bc.version>1.3.3</commons.bc.version>
+    <commons.release.isDistModule>true</commons.release.isDistModule>
+    <commons.jira.id>LOGGING</commons.jira.id>
+    <commons.jira.pid>12310484</commons.jira.pid>
+    <!-- The RC version used in the staging repository URL. -->
+    <commons.rc.version>RC1</commons.rc.version>
+    <skipSurefireReport>true</skipSurefireReport>
+    <!-- Since version 3.2 additional classpath dependencies are allowed. -->
+    <commons.failsafe.version>3.2.1</commons.failsafe.version>
+    <!-- Allow default test run order to be changed -->
+    <failsafe.runorder>filesystem</failsafe.runorder>
+    <log4j2.version>2.23.1</log4j2.version>
+    <logback.version>1.3.14</logback.version>
+    <slf4j.version>2.0.16</slf4j.version>
+    <findsecbugs.version>1.13.0</findsecbugs.version>
+    <commons.osgi.import>
+      javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional,
+      org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional,
+      org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional,
+      org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional,
+      org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional,
+      org.apache.logging.log4j.spi;version="[2.0, 4.0)";resolution:=optional,
+      org.apache.logging.log4j.util;version="[2.0, 4.0)";resolution:=optional,
+      org.slf4j;version="[1.7, 3)";resolution:=optional,
+      org.slf4j.spi;version="[1.7, 3)";resolution:=optional
+    </commons.osgi.import>
+    <project.build.outputTimestamp>2024-08-16T12:44:34Z</project.build.outputTimestamp>
+    <!-- JaCoCo: Don't make code coverage worse than: -->
+    <commons.jacoco.haltOnFailure>true</commons.jacoco.haltOnFailure>
+    <commons.jacoco.classRatio>0.42</commons.jacoco.classRatio>
+    <commons.jacoco.instructionRatio>0.52</commons.jacoco.instructionRatio>
+    <commons.jacoco.methodRatio>0.61</commons.jacoco.methodRatio>
+    <commons.jacoco.branchRatio>0.34</commons.jacoco.branchRatio>
+    <commons.jacoco.lineRatio>0.44</commons.jacoco.lineRatio>
+    <commons.jacoco.complexityRatio>0.42</commons.jacoco.complexityRatio>
+  </properties>
   <issueManagement>
     <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/LOGGING</url>
+    <url>https://issues.apache.org/jira/browse/LOGGING</url>
   </issueManagement>
-
   <inceptionYear>2001</inceptionYear>
-
-  <developers>
-    <developer>
-      <id>morgand</id>
-      <name>Morgan Delagrange</name>
-      <email>morgand at apache dot org</email>
-      <organization>Apache</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>rwaldhoff</id>
-      <name>Rodney Waldhoff</name>
-      <email>rwaldhoff at apache org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>craigmcc</id>
-      <name>Craig McClanahan</name>
-      <email>craigmcc at apache org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>sanders</id>
-      <name>Scott Sanders</name>
-      <email>sanders at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>donaldp</id>
-      <name>Peter Donald</name>
-      <email>donaldp at apache dot org</email>
-    </developer>
-    <developer>
-      <id>costin</id>
-      <name>Costin Manolache</name>
-      <email>costin at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>rsitze</id>
-      <name>Richard Sitze</name>
-      <email>rsitze at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>baliuka</id>
-      <name>Juozas Baliuka</name>
-      <email>baliuka@apache.org</email>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>skitching</id>
-      <name>Simon Kitching</name>
-      <email>skitching@apache.org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>dennisl</id>
-      <name>Dennis Lundberg</name>
-      <email>dennisl@apache.org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>bstansberry</id>
-      <name>Brian Stansberry</name>
-    </developer>
-  </developers>
-
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1</developerConnection>
-    <url>http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-logging</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf/commons-logging</url>
   </scm>
-
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-
-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <filtering>false</filtering>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </testResource>
-    </testResources>
-
+    <!-- TODO spotbugs:check -->
+    <defaultGoal>clean verify apache-rat:check japicmp:cmp javadoc:javadoc checkstyle:check pmd:check</defaultGoal>
     <plugins>
-
       <!--
-        - The custom test framework requires the unit test code to be
-        - in a jarfile so it can control its place in the classpath.
+          We want to create four jarfiles from this project: normal, tests, api
+          and adapters. The first two are handled by the normal jar:jar and
+          jar:test-jar targets.
+          The jar plugin with some includes/excludes is used to create the other
+          ones.
         -->
-      <plugin>      
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>src/conf/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
         <executions>
           <execution>
-            <id>testjar</id>
+            <!--
+                The custom test framework requires the unit test code to be
+                in a jarfile so it can control its place in the classpath.
+              -->
+            <id>create-test-jar</id>
             <phase>package</phase>
             <goals>
               <goal>test-jar</goal>
             </goals>
-            <configuration>
-              <jarName>commons-logging</jarName>
-            </configuration>
           </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <!--
-          - We want to create four jarfiles from this project: normal, tests, api
-          - and adapters. The first two are handled by the normal jar:jar target.
-          - Alas, the standard jar plugin doesn't have includes/excludes support
-          - in version 2.0, so antrun is used to create the other ones.
-          -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.1</version>
-        <executions>
           <execution>
-            <id>apijar</id>
+            <id>create-api-jar</id>
             <phase>package</phase>
-            <configuration>
-              <tasks>
-                <property name="workdir" value="${project.build.directory}/rejar" />
-                <property name="target" value="${project.artifactId}-api-${project.version}" />
-
-                <delete dir="${workdir}" failonerror="false" />
-                <mkdir dir="${workdir}" />
-
-                <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${workdir}" />
-                <jar basedir="${workdir}" destfile="${project.build.directory}/${target}.jar" manifest="${basedir}/src/conf/MANIFEST.MF">
-                  <exclude name="org/apache/commons/logging/impl/Log4J*" />
-                  <exclude name="org/apache/commons/logging/impl/Avalon*" />
-                  <exclude name="org/apache/commons/logging/impl/Jdk13*" />
-                  <exclude name="org/apache/commons/logging/impl/LogKit*" />
-                  <exclude name="org/apache/commons/logging/impl/Servlet*" />
-                </jar>
-              </tasks>
-            </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>jar</goal>
             </goals>
+            <configuration>
+              <classifier>api</classifier>
+              <includes>
+                <include>org/apache/commons/logging/*.class</include>
+                <include>org/apache/commons/logging/impl/LogFactoryImpl*.class</include>
+                <include>org/apache/commons/logging/impl/WeakHashtable*.class</include>
+                <include>org/apache/commons/logging/impl/SimpleLog*.class</include>
+                <include>org/apache/commons/logging/impl/NoOpLog*.class</include>
+                <include>org/apache/commons/logging/impl/Jdk14Logger.class</include>
+                <include>META-INF/LICENSE.txt</include>
+                <include>META-INF/NOTICE.txt</include>
+              </includes>
+              <excludes>
+                <exclude>**/package.html</exclude>
+              </excludes>
+            </configuration>
           </execution>
           <execution>
-            <id>adaptersjar</id>
+            <id>create-adapters-jar</id>
             <phase>package</phase>
-            <configuration>
-              <tasks>
-                <property name="workdir" value="${project.build.directory}/rejar" />
-                <property name="target" value="${project.artifactId}-adapters-${project.version}" />
-
-                <delete dir="${workdir}" failonerror="false" />
-                <mkdir dir="${workdir}" />
-
-                <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${workdir}" />
-                <jar basedir="${workdir}" destfile="${project.build.directory}/${target}.jar" manifest="${basedir}/src/conf/MANIFEST.MF">
-                  <exclude name="org/apache/commons/logging/*" />
-                  <exclude name="org/apache/commons/logging/impl/WeakHashtable*" />
-                  <exclude name="org/apache/commons/logging/impl/LogFactoryImpl*" />
-                </jar>
-              </tasks>
-            </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>jar</goal>
             </goals>
+            <configuration>
+              <classifier>adapters</classifier>
+              <includes>
+                <include>org/apache/commons/logging/impl/**.class</include>
+                <include>META-INF/LICENSE.txt</include>
+                <include>META-INF/NOTICE.txt</include>
+              </includes>
+              <excludes>
+                <exclude>org/apache/commons/logging/impl/WeakHashtable*.class</exclude>
+                <exclude>org/apache/commons/logging/impl/LogFactoryImpl*.class</exclude>
+              </excludes>
+            </configuration>
           </execution>
+        </executions>
+        <configuration>
+          <archive combine.children="append">
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.commons.logging</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
           <execution>
             <id>site.resources</id>
             <phase>site</phase>
             <configuration>
-              <tasks>
+              <target>
                 <copy todir="${project.reporting.outputDirectory}">
                   <fileset dir="${basedir}">
                     <include name="RELEASE-NOTES.txt" />
                   </fileset>
-                  <!--
-                    - The logo should be moved to
-                    - ${basedir}/src/site/resources/images
-                    - once we can drop support for the Maven 1 site.
-                    - When that is done this section can be removed.
-                    -->
-                  <fileset dir="${basedir}/xdocs">
-                    <include name="images/logo.png" />
-                  </fileset>
                 </copy>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
             </goals>
           </execution>
         </executions>
-      </plugin> 
+      </plugin>
+      <plugin>
+        <!--
+            Many of JCL's tests use tricky techniques to place the generated
+            JCL jarfiles on the classpath in various configurations. This means
+            that those tests must be run *after* the "package" build phase.
 
+            In order to not mess with the Ant build we "disable" the normal test
+            phase. This is done by skipping the execution of the surefire plugin.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <!--
-          - Attach the adapters and api jars to the normal artifact. This way
-          - they will be deployed when the normal artifact is deployed.
+            Many of JCL's tests use tricky techniques to place the generated
+            JCL jarfiles on the classpath in various configurations. This means
+            that those tests must be run *after* the "package" build phase.
+
+            Disable cobertura report generation as this does not work correctly
+            with integration-tests and the normal unit tests are disabled too.
           -->
         <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.0</version>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>${commons.cobertura.version}</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>attach-artifacts</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
+            <id>add-module-infos</id>
             <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar</file>
-                  <type>jar</type>
-                  <classifier>adapters</classifier>
-                </artifact>
-                <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-api-${project.version}.jar</file>
-                  <type>jar</type>
-                  <classifier>api</classifier>
-                </artifact>
-              </artifacts>
+              <module>
+                <moduleInfo>
+                  <requires>
+                    static java.logging;
+                    *;
+                  </requires>
+                </moduleInfo>
+              </module>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-6</version>
-        <configuration>
-          <!--
-            - The site needs to be built prior to deploy,
-            - because it is included in the assembly.
-            -->
-          <goals>site deploy</goals>
-          <!-- Pass these arguments to the deploy plugin. -->
-          <arguments>-Prelease</arguments>
-        </configuration>
-      </plugin>
-
       <plugin>
         <!--
-          - Many of JCL's tests use tricky techniques to place the generated
-          - JCL jarfiles on the classpath in various configurations. This means
-          - that the tests must be run *after* the "package" build phase. The
-          - normal test phase is therefore disabled here, and the test plugin
-          - rebound to the "integration-test" phase instead.
+            Many of JCL's tests use tricky techniques to place the generated
+            JCL jarfiles on the classpath in various configurations. This means
+            that those tests must be run *after* the "package" build phase.
+
+            For this we use the failsafe plugin which is bound to the
+            "integration-test" phase by default.
           -->
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <!-- Span a different JVM per test -->
         <configuration>
-          <includes>
-            <include>**/AvalonLoggerTestCase.java</include>
-          </includes>
+          <reuseForks>false</reuseForks>
         </configuration>
-
         <executions>
           <execution>
             <id>integration-test</id>
-            <phase>integration-test</phase>
             <goals>
-              <goal>test</goal>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
             </goals>
             <configuration>
+              <runOrder>${failsafe.runorder}</runOrder>
+              <classpathDependencyExcludes>
+                <exclude>ch.qos.logback:*</exclude>
+                <exclude>org.apache.logging.log4j:*</exclude>
+                <exclude>org.slf4j:*</exclude>
+              </classpathDependencyExcludes>
+              <excludes>
+                <exclude>org/apache/commons/logging/log4j/log4j12/**</exclude>
+                <exclude>org/apache/commons/logging/log4j2/**</exclude>
+                <exclude>org/apache/commons/logging/slf4j/**</exclude>
+                <exclude>org/apache/commons/logging/serviceloader/**</exclude>
+              </excludes>
               <includes>
                 <include>**/*TestCase.java</include>
               </includes>
-              <systemProperties>
+              <systemPropertyVariables>
                 <!--
-                <property>
-                  <name>org.apache.commons.logging.diagnostics.dest</name>
-                  <value>STDOUT</value>
-                </property>
+                  <org.apache.commons.logging.diagnostics.dest>STDOUT</org.apache.commons.logging.diagnostics.dest>
                 -->
-                <property>
-                  <name>commons-logging</name>
-                  <value>target/${project.build.finalName}.jar</value>
-                </property>
-                <property>
-                  <name>commons-logging-api</name>
-                  <value>target/${project.artifactId}-api-${project.version}.jar</value>
-                </property>
-                <property>
-                  <name>commons-logging-adapters</name>
-                  <value>target/${project.artifactId}-adapters-${project.version}.jar</value>
-                </property>
-                <property>
-                  <name>testclasses</name>
-                  <value>target/commons-logging-tests.jar</value>
-                </property>
-              </systemProperties>
+                <log4j12>${org.apache.logging.log4j:log4j-1.2-api:jar}</log4j12>
+                <log4j-api>${org.apache.logging.log4j:log4j-api:jar}</log4j-api>
+                <logkit>${logkit:logkit:jar}</logkit>
+                <servlet-api>${javax.servlet:javax.servlet-api:jar}</servlet-api>
+                <commons-logging>target/${project.build.finalName}.jar</commons-logging>
+                <commons-logging-api>target/${project.build.finalName}-api.jar</commons-logging-api>
+                <commons-logging-adapters>target/${project.build.finalName}-adapters.jar</commons-logging-adapters>
+                <testclasses>target/${project.build.finalName}-tests.jar</testclasses>
+                <commons-lang3>${org.apache.commons:commons-lang3:jar}</commons-lang3>
+              </systemPropertyVariables>
+            </configuration>
+          </execution>
+          <!--
+              The ServiceLoaderTestCase uses a custom implementation of LogFactory,
+              therefore it requires a separate execution.
+            -->
+          <execution>
+            <id>serviceLoader-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+            <configuration>
+              <additionalClasspathElements>
+                <additionalClasspathElement>${project.build.testOutputDirectory}/serviceloader</additionalClasspathElement>
+              </additionalClasspathElements>
+              <includes>
+                <include>org/apache/commons/logging/serviceloader/*TestCase.java</include>
+              </includes>
+            </configuration>
+          </execution>
+          <!--
+              Tests logging through the Log4j 2 API.
+            -->
+          <execution>
+            <id>log4j-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+            <configuration>
+              <additionalClasspathDependencies>
+                <dependency>
+                  <groupId>org.apache.logging.log4j</groupId>
+                  <artifactId>log4j-core</artifactId>
+                  <version>${log4j2.version}</version>
+                </dependency>
+              </additionalClasspathDependencies>
+              <includes>
+                <include>org/apache/commons/logging/log4j2/*TestCase.java</include>
+              </includes>
+              <systemPropertyVariables>
+                <!-- Due to a bug in `log4j-core-test`,
+                     the default LogEventFactory loses the location info.
+                     We need to force the usage of the reusable version.
+                <log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory>
+                  -->
+                <log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory>
+              </systemPropertyVariables>
+            </configuration>
+          </execution>
+          <!--
+              Tests logging through the Log4j 2 API for 1.2.
+            -->
+          <execution>
+            <id>log4j12-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+            <configuration>
+              <additionalClasspathDependencies>
+                <dependency>
+                  <groupId>org.apache.logging.log4j</groupId>
+                  <artifactId>log4j-1.2-api</artifactId>
+                  <version>${log4j2.version}</version>
+                </dependency>
+                <dependency>
+                  <groupId>org.apache.logging.log4j</groupId>
+                  <artifactId>log4j-api</artifactId>
+                  <version>${log4j2.version}</version>
+                </dependency>
+                <dependency>
+                  <groupId>org.apache.logging.log4j</groupId>
+                  <artifactId>log4j-core</artifactId>
+                  <version>${log4j2.version}</version>
+                </dependency>
+              </additionalClasspathDependencies>
+              <includes>
+                <include>org/apache/commons/logging/log4j/log4j12/*TestCase.java</include>
+              </includes>
+              <systemPropertyVariables>
+                <!-- Due to a bug in `log4j-core-test`,
+                     the default LogEventFactory loses the location info.
+                     We need to force the usage of the reusable version.
+                <log4j2.messageFactory>org.apache.logging.log4j.message.ParameterizedMessageFactory</log4j2.messageFactory>
+                   -->
+                <log4j2.logEventFactory>org.apache.logging.log4j.core.impl.ReusableLogEventFactory</log4j2.logEventFactory>
+                <log4j12>${org.apache.logging.log4j:log4j-1.2-api:jar}</log4j12>
+                <log4j2-api>${org.apache.logging.log4j:log4j-api:jar}</log4j2-api>
+                <log4j2-core>${org.apache.logging.log4j:log4j-core:jar}</log4j2-core>
+                <commons-logging>target/${project.build.finalName}.jar</commons-logging>
+                <commons-logging-api>target/${project.build.finalName}-api.jar</commons-logging-api>
+                <testclasses>target/${project.build.finalName}-tests.jar</testclasses>
+                <!-- Use the Log4j 1.2 version of Log -->
+                <org.apache.commons.logging.LogFactory>org.apache.commons.logging.impl.LogFactoryImpl</org.apache.commons.logging.LogFactory>
+              </systemPropertyVariables>
+            </configuration>
+          </execution>
+          <!--
+              Tests falling back to the SLF4J API, when the Log4j API is absent.
+          -->
+          <execution>
+            <id>slf4j-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+            <configuration>
+              <additionalClasspathDependencies>
+                <dependency>
+                  <groupId>ch.qos.logback</groupId>
+                  <artifactId>logback-classic</artifactId>
+                  <version>${logback.version}</version>
+                  <scope>test</scope>
+                </dependency>
+              </additionalClasspathDependencies>
+              <classpathDependencyExcludes>
+                <exclude>org.apache.logging.log4j:*</exclude>
+              </classpathDependencyExcludes>
+              <includes>
+                <include>org/apache/commons/logging/slf4j/*TestCase.java</include>
+              </includes>
+            </configuration>
+          </execution>
+          <!--
+              Tests falling back to the SLF4J API, when the Log4j API is present, but redirected to SLF4J.
+          -->
+          <execution>
+            <id>log4j-to-slf4j-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+            <configuration>
+              <additionalClasspathDependencies>
+                <dependency>
+                  <groupId>org.apache.logging.log4j</groupId>
+                  <artifactId>log4j-to-slf4j</artifactId>
+                  <version>${log4j2.version}</version>
+                  <!-- Conflicts with the version used by the project -->
+                  <exclusions>
+                    <exclusion>
+                      <groupId>org.slf4j</groupId>
+                      <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                  </exclusions>
+                </dependency>
+              </additionalClasspathDependencies>
+              <classpathDependencyExcludes>
+                <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                <exclude>org.apache.logging.log4j:log4j-core-test</exclude>
+              </classpathDependencyExcludes>
+              <includes>
+                <include>org/apache/commons/logging/slf4j/*TestCase.java</include>
+              </includes>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-1</version>
         <configuration>
-          <appendAssemblyId>false</appendAssemblyId>
-          <!-- Do not deploy the assemblies to the repository. -->
-          <attach>false</attach>
           <descriptors>
-            <descriptor>src/assembly/assembly.xml</descriptor>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
       </plugin>
-
+      <!-- Define properties for referencing dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-5</version>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <configuration>
+          <ignorePathsToDelete>
+            <ignorePathToDelete>javadocs</ignorePathToDelete>
+            <ignorePathToDelete>commons-logging-**</ignorePathToDelete>
+          </ignorePathsToDelete>
+        </configuration>
       </plugin>
-
-    </plugins>
-  </build>
-  
-  <profiles>
-    <!-- This profile can be removed when we update to commons-parent-5 -->
-    <profile>
-      <id>ci</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <!-- Create the assemblies automatically during release. -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.3</version>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <enableRulesSummary>false</enableRulesSummary>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <targetJdk>1.8</targetJdk>
+          <rulesets>
+            <ruleset>${basedir}/src/conf/pmd.xml</ruleset>
+          </rulesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+          <configuration>
+            <excludeFilterFile>src/conf/spotbugs-excludes.xml</excludeFilterFile>
+            <plugins>
+              <plugin>
+                <groupId>com.h3xstream.findsecbugs</groupId>
+                <artifactId>findsecbugs-plugin</artifactId>
+                <version>${findsecbugs.version}</version>
+              </plugin>
+            </plugins>
+          </configuration>
+      </plugin>
+      <!--
+          Ban Commons Logging clones
+        -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ban-jcl-clones</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
             <configuration>
-              <!-- Pick up this configuration from settings.xml. -->
-              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-              <updateReleaseInfo>true</updateReleaseInfo>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>org.slf4j:jcl-over-slf4j</exclude>
+                    <exclude>org.springframework:spring-jcl</exclude>
+                  </excludes>
+                </bannedDependencies>
+              </rules>
             </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <configuration>
+            <instructions>
+              <Require-Capability><![CDATA[
+                osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.commons.logging.LogFactory)";osgi.serviceloader="org.apache.commons.logging.LogFactory";resolution:=optional;cardinality:=multiple
+              ]]></Require-Capability>
+            </instructions>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework</artifactId>
+      <version>4.1.5</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+      <version>${log4j2.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>${log4j2.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>logkit</groupId>
       <artifactId>logkit</artifactId>
-      <version>1.0.1</version>
+      <version>2.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework</artifactId>
-      <version>4.1.3</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>4.0.1</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.16.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j2.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core-test</artifactId>
+      <version>${log4j2.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <!-- Commons Logging clone -->
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jcl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-
   <reporting>
     <plugins>
-      <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>checkstyle.xml</configLocation>
+          <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+          <enableRulesSummary>false</enableRulesSummary>
         </configuration>
       </plugin>
-      -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <version>2.1.1</version>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+          <configuration>
+            <excludeFilterFile>src/conf/spotbugs-excludes.xml</excludeFilterFile>
+              <plugins>
+                <plugin>
+                  <groupId>com.h3xstream.findsecbugs</groupId>
+                  <artifactId>findsecbugs-plugin</artifactId>
+                  <version>${findsecbugs.version}</version>
+                </plugin>
+              </plugins>
+          </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jdepend-maven-plugin</artifactId>
-        <version>2.0-beta-1</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <targetJdk>1.8</targetJdk>
+          <rulesets>
+            <ruleset>${basedir}/src/conf/pmd.xml</ruleset>
+          </rulesets>
+        </configuration>
       </plugin>
     </plugins>
   </reporting>
-
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/logging/</url>
+      <name>Apache Commons Site</name>
+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-logging/</url>
     </site>
   </distributionManagement>
-
-  <properties>
-    <maven.compile.source>1.2</maven.compile.source>
-    <maven.compile.target>1.1</maven.compile.target>
-  </properties>
+  <developers>
+    <developer>
+      <id>baliuka</id>
+      <name>Juozas Baliuka</name>
+      <email>baliuka@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>morgand</id>
+      <name>Morgan Delagrange</name>
+      <email>morgand@apache.org</email>
+      <organization>Apache</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>donaldp</id>
+      <name>Peter Donald</name>
+      <email>donaldp@apache.org</email>
+    </developer>
+    <developer>
+      <id>rdonkin</id>
+      <name>Robert Burrell Donkin</name>
+      <email>rdonkin@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>skitching</id>
+      <name>Simon Kitching</name>
+      <email>skitching@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>dennisl</id>
+      <name>Dennis Lundberg</name>
+      <email>dennisl@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>costin</id>
+      <name>Costin Manolache</name>
+      <email>costin@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>craigmcc</id>
+      <name>Craig McClanahan</name>
+      <email>craigmcc@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>tn</id>
+      <name>Thomas Neidhart</name>
+      <email>tn@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>sanders</id>
+      <name>Scott Sanders</name>
+      <email>sanders@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>rsitze</id>
+      <name>Richard Sitze</name>
+      <email>rsitze@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>bstansberry</id>
+      <name>Brian Stansberry</name>
+    </developer>
+    <developer>
+      <id>rwaldhoff</id>
+      <name>Rodney Waldhoff</name>
+      <email>rwaldhoff@apache.org</email>
+      <organization>The Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>ggregory</id>
+      <name>Gary Gregory</name>
+      <email>ggregory at apache.org</email>
+      <url>https://www.garygregory.com</url>
+      <organization>The Apache Software Foundation</organization>
+      <organizationUrl>https://www.apache.org/</organizationUrl>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+      <properties>
+        <picUrl>https://people.apache.org/~ggregory/img/garydgregory80.png</picUrl>
+      </properties>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Matthew P. Del Buono</name>
+      <roles>
+        <role>Provided patch</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Vince Eagen</name>
+      <email>vince256 at comcast dot net</email>
+      <roles>
+        <role>Lumberjack logging abstraction</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Peter Lawrey</name>
+      <roles>
+        <role>Provided patch</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Berin Loritsch</name>
+      <email>bloritsch at apache dot org</email>
+      <roles>
+        <role>Lumberjack logging abstraction</role>
+        <role>JDK 1.4 logging abstraction</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Philippe Mouawad</name>
+      <roles>
+        <role>Provided patch</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Neeme Praks</name>
+      <email>neeme at apache dot org</email>
+      <roles>
+        <role>Avalon logging abstraction</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Arturo Bernal</name>
+      <email>arturobernalg@yahoo.com</email>
+    </contributor>
+  </contributors>
 </project>
diff --git a/spec/data/struts-apps/pom.xml b/spec/data/struts-apps/pom.xml
index 18ca18a8..bfacd353 100644
--- a/spec/data/struts-apps/pom.xml
+++ b/spec/data/struts-apps/pom.xml
@@ -1,157 +1,239 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * $Id: pom.xml 1462297 2013-03-28 20:51:02Z lukaszlenart $
- *
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  *
  *  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<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 https://maven.apache.org/maven-v4_0_0.xsd">
+
     <parent>
         <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-parent</artifactId>
-        <version>2.3.14</version>
+        <artifactId>struts-master</artifactId>
+        <version>15</version>
     </parent>
-    <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-apps</artifactId>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>struts2-parent</artifactId>
+    <version>6.7.0</version>
     <packaging>pom</packaging>
-    <name>Webapps</name>
-    <modules>
-        <module>blank</module>
-        <module>jboss-blank</module>
-        <module>mailreader</module>
-        <module>portlet</module>
-        <module>showcase</module>
-        <module>rest-showcase</module>
-    </modules>
+    <name>Struts 2</name>
+    <url>https://struts.apache.org/</url>
+    <description>Apache Struts 2</description>
+
+    <inceptionYear>2000</inceptionYear>
+
+    <!--
+    <description>
+        Apache Struts 2 is an elegant, extensible framework,
+        well suited for creating moderate to large-scale Java web
+        applications. The framework is designed to streamline the
+        full development cycle, from building, to deploying,
+        to maintaining applications over time.
+    </description>
+    -->
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps</url>
+        <connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
+        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
+        <url>https://github.com/apache/struts/</url>
+        <tag>STRUTS_6_7_0</tag>
     </scm>
 
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/projects/WW</url>
+    </issueManagement>
+
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>https://builds.apache.org/job/Struts/</url>
+        <notifiers>
+            <notifier>
+                <type>mail</type>
+                <configuration>
+                    <address>dev@struts.apache.org</address>
+                </configuration>
+            </notifier>
+        </notifiers>
+    </ciManagement>
+
+    <distributionManagement>
+        <site>
+            <id>struts-site</id>
+            <name>Apache Struts</name>
+            <url>https://struts.apache.org/maven/</url>
+        </site>
+    </distributionManagement>
+
+    <modules>
+        <module>bom</module>
+        <module>core</module>
+        <module>plugins</module>
+        <module>bundles</module>
+        <module>apps</module>
+    </modules>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments />
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>https://www.apache.org</url>
+    </organization>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.outputTimestamp>2024-11-17T09:51:57Z</project.build.outputTimestamp>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+
+        <!-- dependency versions in alphanumeric order -->
+        <asm.version>9.7.1</asm.version>
+        <jackson.version>2.18.0</jackson.version>
+        <log4j2.version>2.24.1</log4j2.version>
+        <ognl.version>3.3.5</ognl.version>
+        <slf4j.version>2.0.16</slf4j.version>
+        <spring.platformVersion>6.2.1</spring.platformVersion>
+        <tiles.version>3.0.8</tiles.version>
+        <tiles-request.version>1.0.7</tiles-request.version>
+        <maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
+        <hibernate-validator.version>6.2.4.Final</hibernate-validator.version>
+        <freemarker.version>2.3.33</freemarker.version>
+
+        <!-- Site generation -->
+        <fluido-skin.version>1.9</fluido-skin.version>
+
+        <!-- Sonar -->
+        <sonar.organization>apache</sonar.organization>
+        <sonar.projectKey>apache_struts</sonar.projectKey>
+        <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+
+        <argLine>-Duser.language=en -Duser.country=US -Duser.region=US</argLine>
+    </properties>
+
     <profiles>
         <profile>
-            <id>hostedqa</id>
-            <dependencies>
-                <dependency>
-                    <groupId>com.hostedqa</groupId>
-                    <artifactId>hostedqa-remote-ant</artifactId>
-                    <version>1.7</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <repositories>
-                <repository>
-                    <id>codehaus</id>
-                    <name>codehaus</name>
-                    <url>http://repository.codehaus.org</url>
-                </repository>
-                <repository>
-                    <id>maven-hostedqa</id>
-                    <name>maven-hostedqa</name>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                    <url>http://maven.hostedqa.com</url>
-                </repository>
-            </repositories>
+            <id>includeAssembly</id>
+            <activation>
+                <property>
+                    <name>!skipAssembly</name>
+                </property>
+            </activation>
+            <modules>
+                <module>assembly</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>dependency-check</id>
             <build>
-                <resources>
-                    <!-- Include resources under src/main/java in WEB-INF/classes -->
-                    <resource>
-                        <directory>src/main/java</directory>
-                            <includes>
-                                <include>**/*.properties</include>
-                                <include>**/*.xml</include>
-                             </includes>
-                     </resource>
-                </resources>
                 <plugins>
                     <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <groupId>org.apache.maven.plugins</groupId>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
                         <executions>
                             <execution>
-                                <phase>package</phase>
+                                <phase>verify</phase>
                                 <goals>
-                                    <goal>run</goal>
+                                    <goal>check</goal>
                                 </goals>
-                                <configuration>
-                                    <tasks>
-                                        <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath" />
-                                        <upload file="${project.build.directory}/${project.build.finalName}.war" account="struts" email="${email}" password="${password}" resourceId="${resourceId}" />
-
-                                        <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts" email="${email}" password="${password}" />
-                                    </tasks>
-                                </configuration>
                             </execution>
                         </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.hostedqa</groupId>
-                                <artifactId>hostedqa-remote-ant</artifactId>
-                                <version>1.7</version>
-                            </dependency>
-                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>release</id>
+            <id>jdk8</id>
             <activation>
-                <property>
-                    <name>release</name>
-                </property>
+                <jdk>[1.8,)</jdk>
             </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-javadoc-plugin</artifactId>
+                            <configuration>
+                                <doclint>none</doclint>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <argLine>
+                                    --illegal-access=permit
+                                    --add-opens java.base/java.lang=ALL-UNNAMED
+                                    --add-opens java.base/java.util=ALL-UNNAMED
+                                    -Dillegal-access=permit
+                                    @{argLine}
+                                </argLine>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+        <profile>
+            <id>coverage</id>
             <build>
                 <plugins>
                     <plugin>
-                        <inherited>true</inherited>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>rat-maven-plugin</artifactId>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.8.12</version>
                         <executions>
                             <execution>
-                                <phase>verify</phase>
+                                <id>prepare-agent</id>
                                 <goals>
-                                    <goal>check</goal>
+                                    <goal>prepare-agent</goal>
+                                    <goal>prepare-agent-integration</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>report</id>
+                                <goals>
+                                    <goal>report</goal>
+                                    <goal>report-integration</goal>
                                 </goals>
                                 <configuration>
-                                    <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
-                                    <licenseMatchers>
-                                        <classNames>
-                                            <className>rat.analysis.license.ApacheSoftwareLicense20</className>
-                                        </classNames>
-                                    </licenseMatchers>
-                                    <includes>
-                                        <include>pom.xml</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>src/**</exclude>
-                                    </excludes>
+                                    <formats>
+                                        <format>XML</format>
+                                    </formats>
                                 </configuration>
                             </execution>
                         </executions>
@@ -162,67 +244,904 @@
     </profiles>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                    <version>3.7.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit47</artifactId>
+                            <version>${maven-surefire-plugin.version}</version>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <argLine>@{argLine}</argLine>
+                        <includes>
+                            <include>**/*Test.java</include>
+                        </includes>
+                        <excludes>
+                            <exclude>**/TestBean.java</exclude>
+                        </excludes>
+                        <properties>
+                            <property>
+                                <name>junit</name>
+                                <value>false</value>
+                            </property>
+                        </properties>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.4.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>5.1.9</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.8.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.3.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.rat</groupId>
+                    <artifactId>apache-rat-plugin</artifactId>
+                    <version>0.15</version>
+                    <configuration>
+                        <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+                        <useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
+                        <useDefaultExcludes>true</useDefaultExcludes>
+                        <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
+                        <licenses>
+                            <licens implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20" />
+                        </licenses>
+                        <licenseFamilies>
+                            <licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily" />
+                        </licenseFamilies>
+                        <includes>
+                            <include>pom.xml</include>
+                            <include>src/**</include>
+                        </includes>
+                        <excludes>
+                            <exclude>Jenkinsfile</exclude>
+                            <exclude>src/main/groovy/Jenkinsfile.gdsl</exclude>
+                            <exclude>src/main/resources/org/apache/struts2/static/domTT.js</exclude>
+                            <exclude>src/site/resources/tags/**/*.html</exclude>
+                            <exclude>src/main/resources/*LICENSE.txt</exclude>
+                            <exclude>src/test/resources/**/*.txt</exclude>
+                            <exclude>src/main/webapp/**/*.css</exclude>
+                            <exclude>src/main/webapp/**/*.map</exclude>
+                            <exclude>src/main/webapp/**/*.js</exclude>
+                            <exclude>src/main/webapp/**/*.svg</exclude>
+                            <exclude>src/main/webapp/**/*.txt</exclude>
+                            <exclude>src/main/resources/**/docs-urls.txt</exclude>
+                            <exclude>src/etc/header.txt</exclude>
+                            <exclude>src/main/resources/static/css/**/*.css</exclude>
+                            <exclude>src/main/resources/static/js/**/*.js</exclude>
+                            <exclude>src/main/resources/docs.cfg</exclude>
+                            <exclude>src/main/webapp/fonts/**/*</exclude>
+                        </excludes>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>10.0.4</version>
+                    <configuration>
+                        <suppressionFiles>
+                            <suppressionFile>src/etc/project-suppression.xml</suppressionFile>
+                        </suppressionFiles>
+                        <failBuildOnCVSS>7</failBuildOnCVSS>
+                        <skipProvidedScope>true</skipProvidedScope>
+                        <skipRuntimeScope>true</skipRuntimeScope>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.5.0</version>
+                    <executions>
+                        <execution>
+                            <id>enforce</id>
+                            <configuration>
+                                <rules>
+                                    <dependencyConvergence />
+                                </rules>
+                            </configuration>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-wrapper-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
-            <!-- Include source code under WEB-INF/src/java -->
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>3.1.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-sources</id>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <tasks>
-                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
-                                    <fileset dir="${basedir}/src/main/java" />
-                                </copy>
-                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
-                                    <fileset dir="${basedir}/src/main/resources" />
-                                </copy>
-                            </tasks>
-                        </configuration>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>manifest</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.20.0</version>
                 <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>${basedir}/src/main/resources</directory>
-                            <targetPath>META-INF</targetPath>
-                            <includes>
-                                <include>LICENSE.txt</include>
-                                <include>NOTICE.txt</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                    <warSourceExcludes>WEB-INF/classes/LICENSE.txt,WEB-INF/classes/NOTICE.txt</warSourceExcludes>
+                    <relativizeDecorationLinks>false</relativizeDecorationLinks>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-core</artifactId>
+                        <version>2.0.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-module-markdown</artifactId>
+                        <version>1.12.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
 
-        <finalName>${project.artifactId}</finalName>
+        <defaultGoal>install</defaultGoal>
 
     </build>
 
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <configuration>
+                    <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+                <configuration>
+                    <failOnError>false</failOnError>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <name>Dependency Check</name>
+                    <failBuildOnCVSS>11</failBuildOnCVSS>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.17.1</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>dependency-updates-report</report>
+                            <report>plugin-updates-report</report>
+                            <report>property-updates-report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts-annotations</artifactId>
+                <version>1.0.8</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-spring-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-bean-validation-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-cdi-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-portlet-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-dwr-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-portlet-tiles-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-portlet-mocks-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-junit-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-convention-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-tiles-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-osgi-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-javatemplates-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-config-browser-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-jasperreports-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-jfreechart-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-pell-multipart-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-plexus-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-rest-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-sitemesh-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-testng-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-oval-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-json-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-embeddedjsp-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-gxp-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-async-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-osgi-admin-bundle</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-osgi-demo-bundle</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-velocity-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-xslt-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.freemarker</groupId>
+                <artifactId>freemarker</artifactId>
+                <version>${freemarker.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.ben-manes.caffeine</groupId>
+                <artifactId>caffeine</artifactId>
+                <version>2.9.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.framework</artifactId>
+                <version>6.0.3</version>
+                <scope>provided
+                </scope>  <!-- felix-main provides everything in felix-framework (and more), override here to provent both JARs from being included in the build. -->
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.main</artifactId>
+                <version>7.0.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.shell</artifactId>
+                <version>1.4.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.shell.tui</artifactId>
+                <version>1.4.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.directwebremoting</groupId>
+                <artifactId>dwr</artifactId>
+                <version>3.0.2-RELEASE</version>
+            </dependency>
+
+            <dependency>
+                <groupId>opensymphony</groupId>
+                <artifactId>sitemesh</artifactId>
+                <version>2.5.0</version>
+            </dependency>
+
+            <!-- Velocity -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity-engine-core</artifactId>
+                <version>2.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.velocity.tools</groupId>
+                <artifactId>velocity-tools-view</artifactId>
+                <version>3.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.velocity.tools</groupId>
+                <artifactId>velocity-tools-view-jsp</artifactId>
+                <version>3.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>ognl</groupId>
+                <artifactId>ognl</artifactId>
+                <version>${ognl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-digester3</artifactId>
+                <version>3.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>asm</groupId>
+                        <artifactId>asm</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>5.4.0</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>4.2.2</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.1.0</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <artifactId>javax.el</artifactId>
+                <version>3.0.1-b12</version>
+            </dependency>
+
+            <dependency>
+                <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                <version>1.1.2</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                <version>1.2</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jasper</artifactId>
+                <version>8.5.53</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-api</artifactId>
+                <version>8.5.53</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.servlet.jsp</groupId>
+                <artifactId>jsp-api</artifactId>
+                <version>2.1</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>taglibs</groupId>
+                <artifactId>request</artifactId>
+                <version>1.0.1</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-juli</artifactId>
+                <version>8.5.53</version>
+            </dependency>
+
+            <!-- Commons -->
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.3.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>4.4</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.15.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.17.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>1.12.0</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-el</groupId>
+                <artifactId>commons-el</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-jci-fam</artifactId>
+                <version>1.1</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.9.4</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-validator</groupId>
+                <artifactId>commons-validator</artifactId>
+                <version>1.9.0</version>
+            </dependency>
+
+            <!-- Mocks for unit testing (by Spring) -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aspects</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context-support</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${spring.platformVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>mockobjects</groupId>
+                <artifactId>mockobjects-core</artifactId>
+                <version>0.09</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>mockobjects</groupId>
+                <artifactId>mockobjects-jdk1.3</artifactId>
+                <version>0.09</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>mockobjects</groupId>
+                <artifactId>mockobjects-alt-jdk1.3</artifactId>
+                <version>0.09</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>mockobjects</groupId>
+                <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
+                <version>0.09</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>mockobjects</groupId>
+                <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
+                <version>0.09</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>net.sourceforge.htmlunit</groupId>
+                <artifactId>htmlunit</artifactId>
+                <version>2.70.0</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>jmock</groupId>
+                <artifactId>jmock</artifactId>
+                <version>1.2.0</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>3.26.3</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>4.3.1</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>jmock</groupId>
+                <artifactId>jmock-cglib</artifactId>
+                <version>1.2.0</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-jcl</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>1.27.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>7.5.1</version><!-- the latest version supporting Java 1.8 -->
+            </dependency>
+
+            <dependency>
+                <groupId>net.sf.oval</groupId>
+                <artifactId>oval</artifactId>
+                <version>3.2.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>1.4.21</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.github.x-stream</groupId>
+                        <artifactId>mxparser</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.x-stream</groupId>
+                <artifactId>mxparser</artifactId>
+                <version>1.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.persistence</groupId>
+                <artifactId>persistence-api</artifactId>
+                <version>1.0.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty</artifactId>
+                <version>6.1.26</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jsp-2.1</artifactId>
+                <version>6.1.26</version>
+            </dependency>
+
+            <!-- Portlet -->
+            <dependency>
+                <groupId>javax.portlet</groupId>
+                <artifactId>portlet-api</artifactId>
+                <version>2.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-xml</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.juneau</groupId>
+                <artifactId>juneau-marshall</artifactId>
+                <version>8.1.3</version>
+            </dependency>
+
+            <!-- CDI & Weld -->
+            <dependency>
+                <groupId>javax.enterprise</groupId>
+                <artifactId>cdi-api</artifactId>
+                <version>1.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.weld</groupId>
+                <artifactId>weld-core</artifactId>
+                <version>2.4.8.Final</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.weld.se</groupId>
+                <artifactId>weld-se</artifactId>
+                <version>2.4.8.Final</version>
+            </dependency>
+
+            <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>2.12.2</version>
+                <scope>test</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
 
 </project>
diff --git a/spec/data/tomcat/pom.xml b/spec/data/tomcat/pom.xml
index fb2c4709..cd0035c1 100644
--- a/spec/data/tomcat/pom.xml
+++ b/spec/data/tomcat/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
   <artifactId>tomcat</artifactId>
-  <version>7.0.40</version>
+  <version>11.0.2</version>
   <description>Binary distribution of Apache Tomcat</description>
   <url>http://tomcat.apache.org/</url>
   <packaging>pom</packaging>
diff --git a/spec/lib/coarse/generate_all_subcommand_spec.rb b/spec/lib/coarse/generate_all_subcommand_spec.rb
index 19bb4719..0d0fbcc9 100644
--- a/spec/lib/coarse/generate_all_subcommand_spec.rb
+++ b/spec/lib/coarse/generate_all_subcommand_spec.rb
@@ -2,12 +2,12 @@
 
 describe "`tetra generate-all`", type: :aruba do
   it "generates specs and tarballs for a sample package, source archive workflow" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "#{Tetra::CCOLLECTIONS}.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     # init project
     run_simple("tetra init commons-collections commons-collections.zip")
-    cd(File.join("commons-collections", "src", "commons-collections4-4.4-src"))
+    cd(File.join("commons-collections", "src", Tetra::CCOLLECTIONS))
 
     # first dry-run, all normal
     @aruba_timeout_seconds = 240
@@ -58,7 +58,7 @@
   end
 
   it "generates specs and tarballs for a sample package, manual source workflow" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "#{Tetra::CCOLLECTIONS}.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     # init project
@@ -79,7 +79,7 @@
     expect(output_from("tetra change-sources ../commons-collections.zip")).to include("New sources committed")
 
     # second dry-run, all normal
-    cd(File.join("src", "commons-collections4-4.4-src"))
+    cd(File.join("src", Tetra::CCOLLECTIONS))
     @aruba_timeout_seconds = 240
     run_interactive("tetra dry-run")
     type("mvn package -DskipTests")
diff --git a/spec/lib/coarse/generate_spec_subcommand_spec.rb b/spec/lib/coarse/generate_spec_subcommand_spec.rb
index cd3b0884..a44b0d1e 100644
--- a/spec/lib/coarse/generate_spec_subcommand_spec.rb
+++ b/spec/lib/coarse/generate_spec_subcommand_spec.rb
@@ -2,7 +2,7 @@
 
 describe "`tetra generate-spec`", type: :aruba do
   it "outputs a warning if source files are not found" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "#{Tetra::CCOLLECTIONS}.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     run_simple("tetra init --no-archive commons-collections")
@@ -10,7 +10,7 @@
 
     cd("src")
     run_simple("unzip ../../commons-collections.zip")
-    cd("commons-collections4-4.4-src")
+    cd(Tetra::CCOLLECTIONS)
 
     run_simple("tetra change-sources --no-archive")
     expect(output_from("tetra change-sources --no-archive")).to include("New sources committed")
diff --git a/spec/lib/coarse/init_subcommand_spec.rb b/spec/lib/coarse/init_subcommand_spec.rb
index 95117efb..97850ba3 100644
--- a/spec/lib/coarse/init_subcommand_spec.rb
+++ b/spec/lib/coarse/init_subcommand_spec.rb
@@ -32,7 +32,7 @@
   end
 
   it "inits a new project with a zip source file" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.zip"))
+    archive_contents = File.read(File.join("spec", "data", "#{Tetra::CCOLLECTIONS}.zip"))
     write_file("commons-collections.zip", archive_contents)
 
     run_simple("tetra init commons-collections commons-collections.zip")
@@ -48,8 +48,8 @@
     cd("commons-collections")
     check_directory_presence([".git", "kit", "src", "packages"], true)
 
-    check_directory_presence([File.join("src", "commons-collections4-4.4-src")], true)
-    check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true)
+    check_directory_presence([File.join("src", Tetra::CCOLLECTIONS)], true)
+    check_file_presence([File.join("src", Tetra::CCOLLECTIONS, "pom.xml")], true)
 
     check_file_presence([File.join("packages", "commons-collections", "commons-collections.zip")], true)
 
@@ -58,7 +58,7 @@
   end
 
   it "inits a new project with a tar source file" do
-    archive_contents = File.read(File.join("spec", "data", "commons-collections4-4.4-src.tar.gz"))
+    archive_contents = File.read(File.join("spec", "data", "#{Tetra::CCOLLECTIONS}.tar.gz"))
     write_file("commons-collections.tar.gz", archive_contents)
 
     run_simple("tetra init commons-collections commons-collections.tar.gz")
@@ -74,8 +74,8 @@
     cd("commons-collections")
     check_directory_presence([".git", "kit", "src", "packages"], true)
 
-    check_directory_presence([File.join("src", "commons-collections4-4.4-src")], true)
-    check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true)
+    check_directory_presence([File.join("src", Tetra::CCOLLECTIONS)], true)
+    check_file_presence([File.join("src", Tetra::CCOLLECTIONS, "pom.xml")], true)
 
     check_file_presence([File.join("packages", "commons-collections", "commons-collections.tar.gz")], true)
 
diff --git a/spec/lib/fine/pom_getter_spec.rb b/spec/lib/fine/pom_getter_spec.rb
index 70b0f102..68fc4f6a 100644
--- a/spec/lib/fine/pom_getter_spec.rb
+++ b/spec/lib/fine/pom_getter_spec.rb
@@ -8,7 +8,7 @@
   describe "#get_pom" do
     it "gets the pom from a jar" do
       dir_path = File.join("spec", "data", "commons-logging")
-      jar_path = File.join(dir_path, "commons-logging-1.1.1.jar")
+      jar_path = File.join(dir_path, "commons-logging-1.3.4.jar")
       path, status = pom_getter.get_pom(jar_path)
       expect(status).to eq :found_in_jar
       expect(File.exist?(path)).to be_truthy
diff --git a/spec/lib/fine/pom_spec.rb b/spec/lib/fine/pom_spec.rb
index 0da19e17..24b574ee 100644
--- a/spec/lib/fine/pom_spec.rb
+++ b/spec/lib/fine/pom_spec.rb
@@ -11,7 +11,7 @@
     it "reads the group id" do
       expect(commons_pom.group_id).to eq "commons-logging"
       expect(nailgun_pom.group_id).to eq "com.martiansoftware"
-      expect(struts_apps_pom.group_id).to eq "org.apache.struts"
+      expect(struts_apps_pom.group_id).to eq ""
     end
   end
 
@@ -19,31 +19,30 @@
     it "reads the artifact id" do
       expect(commons_pom.artifact_id).to eq "commons-logging"
       expect(nailgun_pom.artifact_id).to eq "nailgun-all"
-      expect(struts_apps_pom.artifact_id).to eq "struts2-apps"
+      expect(struts_apps_pom.artifact_id).to eq "struts2-parent"
     end
   end
 
   describe "#name" do
     it "reads artifact name" do
-      expect(commons_pom.name).to eq "Commons Logging"
+      expect(commons_pom.name).to eq "Apache Commons Logging"
       expect(nailgun_pom.name).to eq "nailgun-all"
-      expect(struts_apps_pom.name).to eq "Webapps"
+      expect(struts_apps_pom.name).to eq "Struts 2"
     end
   end
 
   describe "#version" do
     it "reads the version" do
-      expect(commons_pom.version).to eq "1.1.1"
+      expect(commons_pom.version).to eq "1.3.4"
       expect(nailgun_pom.version).to eq "0.9.1"
-      expect(struts_apps_pom.version).to eq ""
+      expect(struts_apps_pom.version).to eq "6.7.0"
     end
   end
 
   # rubocop:disable Layout/LineLength, Layout/TrailingWhitespace
   describe "#description" do
     it "reads the description" do
-      expect(commons_pom.description).to eq "Commons Logging is a thin adapter allowing configurable bridging to other,
-    well known logging systems."
+      expect(commons_pom.description).to eq "Apache Commons Logging is a thin adapter allowing configurable bridging to other,\n    well-known logging systems."
       expect(nailgun_pom.description).to eq "
         Nailgun is a client, protocol, and server for running Java programs 
         from the command line without incurring the JVM startup overhead. 
@@ -52,16 +51,16 @@
     
         This project contains the server and examples.
     "
-      expect(struts_apps_pom.description).to eq ""
+      expect(struts_apps_pom.description).to eq "Apache Struts 2"
     end
   end
   # rubocop:enable Layout/LineLength, Layout/TrailingWhitespace
 
   describe "#url" do
     it "reads the url" do
-      expect(commons_pom.url).to eq "http://commons.apache.org/logging"
+      expect(commons_pom.url).to eq "https://commons.apache.org/proper/commons-logging/"
       expect(nailgun_pom.url).to eq "http://martiansoftware.com/nailgun"
-      expect(struts_apps_pom.url).to eq ""
+      expect(struts_apps_pom.url).to eq "https://struts.apache.org/"
     end
   end
 
@@ -69,7 +68,7 @@
     it "reads the license name" do
       expect(commons_pom.license_name).to eq ""
       expect(nailgun_pom.license_name).to eq "The Apache Software License, Version 2.0"
-      expect(struts_apps_pom.license_name).to eq ""
+      expect(struts_apps_pom.license_name).to eq "The Apache Software License, Version 2.0"
     end
   end
 
@@ -77,26 +76,23 @@
     it "reads the dependency maven ids" do
       expect(commons_pom.runtime_dependency_ids).to eq []
       expect(nailgun_pom.runtime_dependency_ids).to eq []
-      expect(struts_apps_pom.runtime_dependency_ids).to eq [["org.apache.struts", "struts2-core", "${project.version}"]]
+      expect(struts_apps_pom.runtime_dependency_ids).to eq []
     end
   end
 
   describe "#scm_connection" do
     it "reads the SCM connection address" do
-      expect(commons_pom.scm_connection).to eq "scm:svn:http://svn.apache.org/repos/asf/commons/proper/" \
-        "logging/tags/commons-logging-1.1.1"
+      expect(commons_pom.scm_connection).to eq "scm:git:https://gitbox.apache.org/repos/asf/commons-logging"
       expect(nailgun_pom.scm_connection).to eq "scm:git:git@github.com:martylamb/nailgun.git"
-      expect(struts_apps_pom.scm_connection).to eq "scm:svn:http://svn.apache.org/repos/asf/struts/struts2/" \
-        "tags/STRUTS_2_3_14/apps"
+      expect(struts_apps_pom.scm_connection).to eq "scm:git:https://gitbox.apache.org/repos/asf/struts.git"
     end
   end
 
   describe "#scm_url" do
     it "reads the SCM connection url" do
-      expect(commons_pom.scm_url).to eq "http://svn.apache.org/repos/asf/commons/proper/logging/tags/" \
-        "commons-logging-1.1.1"
+      expect(commons_pom.scm_url).to eq "https://gitbox.apache.org/repos/asf/commons-logging"
       expect(nailgun_pom.scm_url).to eq "scm:git:git@github.com:martylamb/nailgun.git"
-      expect(struts_apps_pom.scm_url).to eq "http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_14/apps"
+      expect(struts_apps_pom.scm_url).to eq "https://github.com/apache/struts/"
     end
   end
 end
diff --git a/spec/lib/fine/tar_spec.rb b/spec/lib/fine/tar_spec.rb
index cef9a54d..2296f3c8 100644
--- a/spec/lib/fine/tar_spec.rb
+++ b/spec/lib/fine/tar_spec.rb
@@ -5,7 +5,7 @@
 describe Tetra::Tar do
   include Tetra::Mockers
 
-  let(:zipfile) { File.join("spec", "data", "commons-collections4-4.4-src.tar.gz") }
+  let(:zipfile) { File.join("spec", "data", "#{Tetra::CCOLLECTIONS}.tar.gz") }
   let(:tar) { Tetra::Tar.new }
 
   describe "#decompress"  do
@@ -15,7 +15,7 @@
 
         files = Find.find(dir).to_a
 
-        expect(files).to include("#{dir}/commons-collections4-4.4-src/DEVELOPERS-GUIDE.html")
+        expect(files).to include("#{dir}/#{Tetra::CCOLLECTIONS}/DEVELOPERS-GUIDE.html")
       end
     end
   end
diff --git a/spec/lib/fine/unzip_spec.rb b/spec/lib/fine/unzip_spec.rb
index aa0f3804..f6df5e57 100644
--- a/spec/lib/fine/unzip_spec.rb
+++ b/spec/lib/fine/unzip_spec.rb
@@ -5,7 +5,7 @@
 describe Tetra::Unzip do
   include Tetra::Mockers
 
-  let(:zipfile) { File.join("spec", "data", "commons-collections4-4.4-src.zip") }
+  let(:zipfile) { File.join("spec", "data", "#{Tetra::CCOLLECTIONS}.zip") }
   let(:unzip) { Tetra::Unzip.new }
 
   describe "#decompress"  do
@@ -15,7 +15,7 @@
 
         files = Find.find(dir).to_a
 
-        expect(files).to include("#{dir}/commons-collections4-4.4-src/DEVELOPERS-GUIDE.html")
+        expect(files).to include("#{dir}/#{Tetra::CCOLLECTIONS}/DEVELOPERS-GUIDE.html")
       end
     end
   end