From dca7622daa4ab05e4941dc8ff9a63f6d6566e147 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Thu, 23 Jun 2022 14:18:27 +0200
Subject: [PATCH 01/23] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e399e28..9249ab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-archiver</artifactId>
-  <version>3.6.0</version>
+  <version>3.6.1-SNAPSHOT</version>
 
   <name>Apache Maven Archiver</name>
   <description>Provides utility methods for creating JARs and other archive files from a Maven project.</description>
@@ -36,14 +36,14 @@
   <properties>
     <mavenVersion>3.2.5</mavenVersion>
     <javaVersion>8</javaVersion>
-    <project.build.outputTimestamp>2022-06-23T12:17:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-06-23T12:18:27Z</project.build.outputTimestamp>
   </properties>
 
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-archiver.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archiver.git</developerConnection>
     <url>https://github.com/apache/maven-archiver/tree/${project.scm.tag}</url>
-    <tag>maven-archiver-3.6.0</tag>
+    <tag>HEAD</tag>
   </scm>
   <issueManagement>
     <system>jira</system>

From 6693cc78b78f77501b9cc4e3077cb2eac60ea148 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sun, 26 Jun 2022 14:00:28 +0200
Subject: [PATCH 02/23] Fix Jenkins url

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9249ab8..5ff0e0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
-    <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-archiver/</url>
+    <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-archiver/</url>
   </ciManagement>
   <distributionManagement>
     <site>

From 0f66795c8d1cbcc9f767b6e23b72e029040481b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Wed, 2 Nov 2022 18:41:39 +0100
Subject: [PATCH 03/23] add Reproducible Builds badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7eebdb1..1ef7faa 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ Contributing to [Apache Maven Archiver](https://maven.apache.org/shared/maven-ar
 [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSHARED.json)][jira]
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
 [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven/maven-archiver.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven/maven-archiver)
+[![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-green?labelColor=blue)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/shared/archiver/README.md)
 [![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-archiver/job/master.svg)][build]
 [![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-archiver/job/master.svg)][test-results]
 

From 670da42432fbfd2d28b29458095716a117d27b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Sol=C3=B3rzano?= <jorsol@gmail.com>
Date: Sun, 26 Mar 2023 13:14:51 +0200
Subject: [PATCH 04/23] Upgrade Parent to 39 (#27)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jorge Solórzano <jorsol@gmail.com>
---
 .github/dependabot.yml                        |   30 +
 pom.xml                                       |   24 +-
 .../maven/archiver/ManifestConfiguration.java |   84 +-
 .../maven/archiver/ManifestSection.java       |   28 +-
 .../archiver/MavenArchiveConfiguration.java   |   99 +-
 .../apache/maven/archiver/MavenArchiver.java  |  660 +++---
 .../maven/archiver/PomPropertiesUtil.java     |   99 +-
 .../archiver/ManifestConfigurationTest.java   |   42 +-
 .../MavenArchiveConfigurationTest.java        |   52 +-
 .../maven/archiver/MavenArchiverTest.java     | 1881 ++++++++---------
 .../apache/maven/archiver/MockArtifact.java   |  222 +-
 11 files changed, 1473 insertions(+), 1748 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..d7c9cd4
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License. 
+
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    ignore:
+      # Ignore Maven Core updates
+      - dependency-name: "org.apache.maven:*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/pom.xml b/pom.xml
index 5ff0e0b..f699db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -22,28 +22,22 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>36</version>
+    <version>39</version>
     <relativePath />
   </parent>
 
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-archiver</artifactId>
-  <version>3.6.1-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
 
   <name>Apache Maven Archiver</name>
   <description>Provides utility methods for creating JARs and other archive files from a Maven project.</description>
 
-  <properties>
-    <mavenVersion>3.2.5</mavenVersion>
-    <javaVersion>8</javaVersion>
-    <project.build.outputTimestamp>2022-06-23T12:18:27Z</project.build.outputTimestamp>
-  </properties>
-
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-archiver.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archiver.git</developerConnection>
-    <url>https://github.com/apache/maven-archiver/tree/${project.scm.tag}</url>
     <tag>HEAD</tag>
+    <url>https://github.com/apache/maven-archiver/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -60,6 +54,12 @@
     </site>
   </distributionManagement>
 
+  <properties>
+    <mavenVersion>3.2.5</mavenVersion>
+    <javaVersion>8</javaVersion>
+    <project.build.outputTimestamp>2022-06-23T12:18:27Z</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
     <!--
       Apache Maven dependencies
@@ -99,13 +99,13 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.23.1</version>
+      <version>3.24.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java b/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
index b34c503..2640b8f 100644
--- a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
+++ b/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
 
 /**
  * Capture common manifest configuration.
@@ -25,8 +24,7 @@
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
 // TODO Is this general enough to be in Plexus Archiver?
-public class ManifestConfiguration
-{
+public class ManifestConfiguration {
     /**
      * The simple layout.
      */
@@ -62,7 +60,6 @@ public class ManifestConfiguration
      */
     private boolean addDefaultEntries = true;
 
-
     /**
      * Add build environment information about Maven, JDK, and OS.
      *
@@ -95,8 +92,7 @@ public class ManifestConfiguration
      *
      * @return mainClass
      */
-    public String getMainClass()
-    {
+    public String getMainClass() {
         return mainClass;
     }
 
@@ -105,8 +101,7 @@ public String getMainClass()
      *
      * @return the package name.
      */
-    public String getPackageName()
-    {
+    public String getPackageName() {
         return packageName;
     }
 
@@ -115,8 +110,7 @@ public String getPackageName()
      *
      * @return if addClasspath true or false.
      */
-    public boolean isAddClasspath()
-    {
+    public boolean isAddClasspath() {
         return addClasspath;
     }
 
@@ -125,8 +119,7 @@ public boolean isAddClasspath()
      *
      * @return {@link #addDefaultEntries}
      */
-    public boolean isAddDefaultEntries()
-    {
+    public boolean isAddDefaultEntries() {
         return addDefaultEntries;
     }
 
@@ -135,8 +128,7 @@ public boolean isAddDefaultEntries()
      *
      * @return {@link #addBuildEnvironmentEntries}
      */
-    public boolean isAddBuildEnvironmentEntries()
-    {
+    public boolean isAddBuildEnvironmentEntries() {
         return addBuildEnvironmentEntries;
     }
 
@@ -145,8 +137,7 @@ public boolean isAddBuildEnvironmentEntries()
      *
      * @return {@link #addDefaultImplementationEntries}
      */
-    public boolean isAddDefaultImplementationEntries()
-    {
+    public boolean isAddDefaultImplementationEntries() {
         return addDefaultImplementationEntries;
     }
 
@@ -155,8 +146,7 @@ public boolean isAddDefaultImplementationEntries()
      *
      * @return {@link #addDefaultSpecificationEntries}
      */
-    public boolean isAddDefaultSpecificationEntries()
-    {
+    public boolean isAddDefaultSpecificationEntries() {
         return addDefaultSpecificationEntries;
     }
 
@@ -165,8 +155,7 @@ public boolean isAddDefaultSpecificationEntries()
      *
      * @return {@link #addExtensions}
      */
-    public boolean isAddExtensions()
-    {
+    public boolean isAddExtensions() {
         return addExtensions;
     }
 
@@ -175,8 +164,7 @@ public boolean isAddExtensions()
      *
      * @param addClasspath turn on addClasspath or off.
      */
-    public void setAddClasspath( boolean addClasspath )
-    {
+    public void setAddClasspath(boolean addClasspath) {
         this.addClasspath = addClasspath;
     }
 
@@ -185,8 +173,7 @@ public void setAddClasspath( boolean addClasspath )
      *
      * @param addDefaultEntries add default entries true/false.
      */
-    public void setAddDefaultEntries( boolean addDefaultEntries )
-    {
+    public void setAddDefaultEntries(boolean addDefaultEntries) {
         this.addDefaultEntries = addDefaultEntries;
     }
 
@@ -195,8 +182,7 @@ public void setAddDefaultEntries( boolean addDefaultEntries )
      *
      * @param addBuildEnvironmentEntries add build environment information true/false.
      */
-    public void setAddBuildEnvironmentEntries( boolean addBuildEnvironmentEntries )
-    {
+    public void setAddBuildEnvironmentEntries(boolean addBuildEnvironmentEntries) {
         this.addBuildEnvironmentEntries = addBuildEnvironmentEntries;
     }
 
@@ -205,8 +191,7 @@ public void setAddBuildEnvironmentEntries( boolean addBuildEnvironmentEntries )
      *
      * @param addDefaultImplementationEntries true to add default implementations false otherwise.
      */
-    public void setAddDefaultImplementationEntries( boolean addDefaultImplementationEntries )
-    {
+    public void setAddDefaultImplementationEntries(boolean addDefaultImplementationEntries) {
         this.addDefaultImplementationEntries = addDefaultImplementationEntries;
     }
 
@@ -215,8 +200,7 @@ public void setAddDefaultImplementationEntries( boolean addDefaultImplementation
      *
      * @param addDefaultSpecificationEntries add default specifications true/false.
      */
-    public void setAddDefaultSpecificationEntries( boolean addDefaultSpecificationEntries )
-    {
+    public void setAddDefaultSpecificationEntries(boolean addDefaultSpecificationEntries) {
         this.addDefaultSpecificationEntries = addDefaultSpecificationEntries;
     }
 
@@ -225,8 +209,7 @@ public void setAddDefaultSpecificationEntries( boolean addDefaultSpecificationEn
      *
      * @param addExtensions true to add extensions false otherwise.
      */
-    public void setAddExtensions( boolean addExtensions )
-    {
+    public void setAddExtensions(boolean addExtensions) {
         this.addExtensions = addExtensions;
     }
 
@@ -235,8 +218,7 @@ public void setAddExtensions( boolean addExtensions )
      *
      * @param classpathPrefix The prefix.
      */
-    public void setClasspathPrefix( String classpathPrefix )
-    {
+    public void setClasspathPrefix(String classpathPrefix) {
         this.classpathPrefix = classpathPrefix;
     }
 
@@ -245,8 +227,7 @@ public void setClasspathPrefix( String classpathPrefix )
      *
      * @param mainClass The main class.
      */
-    public void setMainClass( String mainClass )
-    {
+    public void setMainClass(String mainClass) {
         this.mainClass = mainClass;
     }
 
@@ -255,8 +236,7 @@ public void setMainClass( String mainClass )
      *
      * @param packageName The package name.
      */
-    public void setPackageName( String packageName )
-    {
+    public void setPackageName(String packageName) {
         this.packageName = packageName;
     }
 
@@ -265,12 +245,10 @@ public void setPackageName( String packageName )
      *
      * @return The classpath prefix.
      */
-    public String getClasspathPrefix()
-    {
-        String cpp = classpathPrefix.replaceAll( "\\\\", "/" );
+    public String getClasspathPrefix() {
+        String cpp = classpathPrefix.replaceAll("\\\\", "/");
 
-        if ( cpp.length() != 0 && !cpp.endsWith( "/" ) )
-        {
+        if (cpp.length() != 0 && !cpp.endsWith("/")) {
             cpp += "/";
         }
 
@@ -287,8 +265,7 @@ public String getClasspathPrefix()
      *
      * @return The classpath layout type.
      */
-    public String getClasspathLayoutType()
-    {
+    public String getClasspathLayoutType() {
         return classpathLayoutType;
     }
 
@@ -302,8 +279,7 @@ public String getClasspathLayoutType()
      *
      * @param classpathLayoutType The classpath layout type.
      */
-    public void setClasspathLayoutType( String classpathLayoutType )
-    {
+    public void setClasspathLayoutType(String classpathLayoutType) {
         this.classpathLayoutType = classpathLayoutType;
     }
 
@@ -321,8 +297,7 @@ public void setClasspathLayoutType( String classpathLayoutType )
      *
      * @return The custom classpath layout.
      */
-    public String getCustomClasspathLayout()
-    {
+    public String getCustomClasspathLayout() {
         return customClasspathLayout;
     }
 
@@ -348,8 +323,7 @@ public String getCustomClasspathLayout()
      *
      * @param customClasspathLayout The custom classpath layout.
      */
-    public void setCustomClasspathLayout( String customClasspathLayout )
-    {
+    public void setCustomClasspathLayout(String customClasspathLayout) {
         this.customClasspathLayout = customClasspathLayout;
     }
 
@@ -362,8 +336,7 @@ public void setCustomClasspathLayout( String customClasspathLayout )
      *
      * @return The state of {@link #useUniqueVersions}
      */
-    public boolean isUseUniqueVersions()
-    {
+    public boolean isUseUniqueVersions() {
         return useUniqueVersions;
     }
 
@@ -376,8 +349,7 @@ public boolean isUseUniqueVersions()
      *
      * @param useUniqueVersions true to use unique versions or not.
      */
-    public void setUseUniqueVersions( boolean useUniqueVersions )
-    {
+    public void setUseUniqueVersions(boolean useUniqueVersions) {
         this.useUniqueVersions = useUniqueVersions;
     }
 }
diff --git a/src/main/java/org/apache/maven/archiver/ManifestSection.java b/src/main/java/org/apache/maven/archiver/ManifestSection.java
index 4970651..22dec5d 100644
--- a/src/main/java/org/apache/maven/archiver/ManifestSection.java
+++ b/src/main/java/org/apache/maven/archiver/ManifestSection.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -25,8 +24,7 @@
 /**
  * <p>ManifestSection class.</p>
  */
-public class ManifestSection
-{
+public class ManifestSection {
 
     private String name = null;
 
@@ -38,9 +36,8 @@ public class ManifestSection
      * @param key The key of the manifest entry.
      * @param value The appropriate value.
      */
-    public void addManifestEntry( String key, String value )
-    {
-        manifestEntries.put( key, value );
+    public void addManifestEntry(String key, String value) {
+        manifestEntries.put(key, value);
     }
 
     /**
@@ -48,8 +45,7 @@ public void addManifestEntry( String key, String value )
      *
      * @return The entries.
      */
-    public Map<String, String> getManifestEntries()
-    {
+    public Map<String, String> getManifestEntries() {
         return manifestEntries;
     }
 
@@ -58,8 +54,7 @@ public Map<String, String> getManifestEntries()
      *
      * @return The name.
      */
-    public String getName()
-    {
+    public String getName() {
         return name;
     }
 
@@ -68,8 +63,7 @@ public String getName()
      *
      * @param name the name.
      */
-    public void setName( String name )
-    {
+    public void setName(String name) {
         this.name = name;
     }
 
@@ -78,9 +72,8 @@ public void setName( String name )
      *
      * @param map The map to add.
      */
-    public void addManifestEntries( Map<String, String> map )
-    {
-        manifestEntries.putAll( map );
+    public void addManifestEntries(Map<String, String> map) {
+        manifestEntries.putAll(map);
     }
 
     /**
@@ -88,8 +81,7 @@ public void addManifestEntries( Map<String, String> map )
      *
      * @return true if empty false otherwise.
      */
-    public boolean isManifestEntriesEmpty()
-    {
+    public boolean isManifestEntriesEmpty() {
         return manifestEntries.isEmpty();
     }
 }
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java b/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
index 098616d..e373312 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
 
 import java.io.File;
 import java.util.LinkedHashMap;
@@ -31,8 +30,7 @@
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
 // TODO Is this general enough to be in Plexus Archiver?
-public class MavenArchiveConfiguration
-{
+public class MavenArchiveConfiguration {
     private boolean compress = true;
 
     private boolean recompressAddedZips = true;
@@ -43,7 +41,7 @@ public class MavenArchiveConfiguration
 
     private File manifestFile;
 
-    //TODO: Rename this attribute to manifestConfiguration;
+    // TODO: Rename this attribute to manifestConfiguration;
     private ManifestConfiguration manifest;
 
     private Map<String, String> manifestEntries = new LinkedHashMap<>();
@@ -65,8 +63,7 @@ public class MavenArchiveConfiguration
      *
      * @return {@link #compress}
      */
-    public boolean isCompress()
-    {
+    public boolean isCompress() {
         return compress;
     }
 
@@ -75,8 +72,7 @@ public boolean isCompress()
      *
      * @return {@link #recompressAddedZips}
      */
-    public boolean isRecompressAddedZips()
-    {
+    public boolean isRecompressAddedZips() {
         return recompressAddedZips;
     }
 
@@ -85,8 +81,7 @@ public boolean isRecompressAddedZips()
      *
      * @param recompressAddedZips {@link #recompressAddedZips}
      */
-    public void setRecompressAddedZips( boolean recompressAddedZips )
-    {
+    public void setRecompressAddedZips(boolean recompressAddedZips) {
         this.recompressAddedZips = recompressAddedZips;
     }
 
@@ -95,8 +90,7 @@ public void setRecompressAddedZips( boolean recompressAddedZips )
      *
      * @return {@link #index}
      */
-    public boolean isIndex()
-    {
+    public boolean isIndex() {
         return index;
     }
 
@@ -105,8 +99,7 @@ public boolean isIndex()
      *
      * @return {@link #addMavenDescriptor}
      */
-    public boolean isAddMavenDescriptor()
-    {
+    public boolean isAddMavenDescriptor() {
         return addMavenDescriptor;
     }
 
@@ -115,8 +108,7 @@ public boolean isAddMavenDescriptor()
      *
      * @return {@link #manifestFile}
      */
-    public File getManifestFile()
-    {
+    public File getManifestFile() {
         return manifestFile;
     }
 
@@ -125,11 +117,9 @@ public File getManifestFile()
      *
      * @return {@link #manifest}
      */
-    //TODO: Change the name of this method into getManifestConfiguration()
-    public ManifestConfiguration getManifest()
-    {
-        if ( manifest == null )
-        {
+    // TODO: Change the name of this method into getManifestConfiguration()
+    public ManifestConfiguration getManifest() {
+        if (manifest == null) {
             manifest = new ManifestConfiguration();
         }
         return manifest;
@@ -140,8 +130,7 @@ public ManifestConfiguration getManifest()
      *
      * @param compress set compress to true/false.
      */
-    public void setCompress( boolean compress )
-    {
+    public void setCompress(boolean compress) {
         this.compress = compress;
     }
 
@@ -150,8 +139,7 @@ public void setCompress( boolean compress )
      *
      * @param index set index to true/false.
      */
-    public void setIndex( boolean index )
-    {
+    public void setIndex(boolean index) {
         this.index = index;
     }
 
@@ -160,8 +148,7 @@ public void setIndex( boolean index )
      *
      * @param addMavenDescriptor activate to add maven descriptor or not.
      */
-    public void setAddMavenDescriptor( boolean addMavenDescriptor )
-    {
+    public void setAddMavenDescriptor(boolean addMavenDescriptor) {
         this.addMavenDescriptor = addMavenDescriptor;
     }
 
@@ -170,8 +157,7 @@ public void setAddMavenDescriptor( boolean addMavenDescriptor )
      *
      * @param manifestFile The manifest file.
      */
-    public void setManifestFile( File manifestFile )
-    {
+    public void setManifestFile(File manifestFile) {
         this.manifestFile = manifestFile;
     }
 
@@ -180,8 +166,7 @@ public void setManifestFile( File manifestFile )
      *
      * @param manifest {@link org.apache.maven.archiver.ManifestConfiguration}
      */
-    public void setManifest( ManifestConfiguration manifest )
-    {
+    public void setManifest(ManifestConfiguration manifest) {
         this.manifest = manifest;
     }
 
@@ -191,9 +176,8 @@ public void setManifest( ManifestConfiguration manifest )
      * @param key The key of the entry.
      * @param value The value of the entry.
      */
-    public void addManifestEntry( String key, String value )
-    {
-        manifestEntries.put( key, value );
+    public void addManifestEntry(String key, String value) {
+        manifestEntries.put(key, value);
     }
 
     /**
@@ -201,9 +185,8 @@ public void addManifestEntry( String key, String value )
      *
      * @param map The whole map which should be added.
      */
-    public void addManifestEntries( Map<String, String> map )
-    {
-        manifestEntries.putAll( map );
+    public void addManifestEntries(Map<String, String> map) {
+        manifestEntries.putAll(map);
     }
 
     /**
@@ -211,8 +194,7 @@ public void addManifestEntries( Map<String, String> map )
      *
      * @return are there entries true yes false otherwise.
      */
-    public boolean isManifestEntriesEmpty()
-    {
+    public boolean isManifestEntriesEmpty() {
         return manifestEntries.isEmpty();
     }
 
@@ -221,8 +203,7 @@ public boolean isManifestEntriesEmpty()
      *
      * @return {@link #manifestEntries}
      */
-    public Map<String, String> getManifestEntries()
-    {
+    public Map<String, String> getManifestEntries() {
         return manifestEntries;
     }
 
@@ -231,8 +212,7 @@ public Map<String, String> getManifestEntries()
      *
      * @param manifestEntries {@link #manifestEntries}
      */
-    public void setManifestEntries( Map<String, String> manifestEntries )
-    {
+    public void setManifestEntries(Map<String, String> manifestEntries) {
         this.manifestEntries = manifestEntries;
     }
 
@@ -241,9 +221,8 @@ public void setManifestEntries( Map<String, String> manifestEntries )
      *
      * @param section {@link org.apache.maven.archiver.ManifestSection}
      */
-    public void addManifestSection( ManifestSection section )
-    {
-        manifestSections.add( section );
+    public void addManifestSection(ManifestSection section) {
+        manifestSections.add(section);
     }
 
     /**
@@ -251,9 +230,8 @@ public void addManifestSection( ManifestSection section )
      *
      * @param list Added list of {@link org.apache.maven.archiver.ManifestSection}.
      */
-    public void addManifestSections( List<ManifestSection> list )
-    {
-        manifestSections.addAll( list );
+    public void addManifestSections(List<ManifestSection> list) {
+        manifestSections.addAll(list);
     }
 
     /**
@@ -261,8 +239,7 @@ public void addManifestSections( List<ManifestSection> list )
      *
      * @return if manifestSections is empty or not.
      */
-    public boolean isManifestSectionsEmpty()
-    {
+    public boolean isManifestSectionsEmpty() {
         return manifestSections.isEmpty();
     }
 
@@ -271,8 +248,7 @@ public boolean isManifestSectionsEmpty()
      *
      * @return {@link #manifestSections}
      */
-    public List<ManifestSection> getManifestSections()
-    {
+    public List<ManifestSection> getManifestSections() {
         return manifestSections;
     }
 
@@ -281,8 +257,7 @@ public List<ManifestSection> getManifestSections()
      *
      * @param manifestSections set The list of {@link org.apache.maven.archiver.ManifestSection}.
      */
-    public void setManifestSections( List<ManifestSection> manifestSections )
-    {
+    public void setManifestSections(List<ManifestSection> manifestSections) {
         this.manifestSections = manifestSections;
     }
 
@@ -303,8 +278,7 @@ public void setManifestSections( List<ManifestSection> manifestSections )
      * @return True, if the target archive should always be created; false otherwise
      * @see #setForced(boolean)
      */
-    public boolean isForced()
-    {
+    public boolean isForced() {
         return forced;
     }
 
@@ -325,8 +299,7 @@ public boolean isForced()
      * @param forced True, if the target archive should always be created; false otherwise
      * @see #isForced()
      */
-    public void setForced( boolean forced )
-    {
+    public void setForced(boolean forced) {
         this.forced = forced;
     }
 
@@ -335,8 +308,7 @@ public void setForced( boolean forced )
      *
      * @return "pom.properties" location or null.
      */
-    public File getPomPropertiesFile()
-    {
+    public File getPomPropertiesFile() {
         return pomPropertiesFile;
     }
 
@@ -345,8 +317,7 @@ public File getPomPropertiesFile()
      *
      * @param pomPropertiesFile "pom.properties" location or null.
      */
-    public void setPomPropertiesFile( File pomPropertiesFile )
-    {
+    public void setPomPropertiesFile(File pomPropertiesFile) {
         this.pomPropertiesFile = pomPropertiesFile;
     }
 }
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 5242da7..aa9a1b0 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
 
 import javax.lang.model.SourceVersion;
 
@@ -70,8 +69,7 @@
  * @author kama
  * @version $Id: $Id
  */
-public class MavenArchiver
-{
+public class MavenArchiver {
 
     private static final String CREATED_BY = "Maven Archiver";
 
@@ -79,45 +77,43 @@ public class MavenArchiver
      * The simply layout.
      */
     public static final String SIMPLE_LAYOUT =
-        "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}";
+            "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}";
 
     /**
      * Repository layout.
      */
     public static final String REPOSITORY_LAYOUT =
-        "${artifact.groupIdPath}/${artifact.artifactId}/" + "${artifact.baseVersion}/${artifact.artifactId}-"
-            + "${artifact.version}${dashClassifier?}.${artifact.extension}";
+            "${artifact.groupIdPath}/${artifact.artifactId}/" + "${artifact.baseVersion}/${artifact.artifactId}-"
+                    + "${artifact.version}${dashClassifier?}.${artifact.extension}";
 
     /**
      * simple layout non unique.
      */
     public static final String SIMPLE_LAYOUT_NONUNIQUE =
-        "${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}";
+            "${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}";
 
     /**
      * Repository layout non unique.
      */
     public static final String REPOSITORY_LAYOUT_NONUNIQUE =
-        "${artifact.groupIdPath}/${artifact.artifactId}/" + "${artifact.baseVersion}/${artifact.artifactId}-"
-            + "${artifact.baseVersion}${dashClassifier?}.${artifact.extension}";
+            "${artifact.groupIdPath}/${artifact.artifactId}/" + "${artifact.baseVersion}/${artifact.artifactId}-"
+                    + "${artifact.baseVersion}${dashClassifier?}.${artifact.extension}";
 
-    private static final Instant DATE_MIN = Instant.parse( "1980-01-01T00:00:02Z" );
+    private static final Instant DATE_MIN = Instant.parse("1980-01-01T00:00:02Z");
 
-    private static final Instant DATE_MAX = Instant.parse( "2099-12-31T23:59:59Z" );
+    private static final Instant DATE_MAX = Instant.parse("2099-12-31T23:59:59Z");
 
     private static final List<String> ARTIFACT_EXPRESSION_PREFIXES;
 
-    static
-    {
+    static {
         List<String> artifactExpressionPrefixes = new ArrayList<>();
-        artifactExpressionPrefixes.add( "artifact." );
+        artifactExpressionPrefixes.add("artifact.");
 
         ARTIFACT_EXPRESSION_PREFIXES = artifactExpressionPrefixes;
     }
 
-    static boolean isValidModuleName( String name )
-    {
-        return SourceVersion.isName( name );
+    static boolean isValidModuleName(String name) {
+        return SourceVersion.isName(name);
     }
 
     private JarArchiver archiver;
@@ -127,7 +123,7 @@ static boolean isValidModuleName( String name )
     private String createdBy;
 
     private boolean buildJdkSpecDefaultEntry = true;
-    
+
     /**
      * <p>getManifest.</p>
      *
@@ -138,60 +134,49 @@ static boolean isValidModuleName( String name )
      * @throws org.codehaus.plexus.archiver.jar.ManifestException in case of a failure
      * @throws org.apache.maven.artifact.DependencyResolutionRequiredException resolution failure
      */
-    public Manifest getManifest( MavenSession session, MavenProject project, MavenArchiveConfiguration config )
-        throws ManifestException, DependencyResolutionRequiredException
-    {
+    public Manifest getManifest(MavenSession session, MavenProject project, MavenArchiveConfiguration config)
+            throws ManifestException, DependencyResolutionRequiredException {
         boolean hasManifestEntries = !config.isManifestEntriesEmpty();
-        Map<String, String> entries =
-            hasManifestEntries ? config.getManifestEntries() : Collections.emptyMap();
+        Map<String, String> entries = hasManifestEntries ? config.getManifestEntries() : Collections.emptyMap();
 
-        Manifest manifest = getManifest( session, project, config.getManifest(), entries );
+        Manifest manifest = getManifest(session, project, config.getManifest(), entries);
 
         // any custom manifest entries in the archive configuration manifest?
-        if ( hasManifestEntries )
-        {
+        if (hasManifestEntries) {
 
-            for ( Map.Entry<String, String> entry : entries.entrySet() )
-            {
+            for (Map.Entry<String, String> entry : entries.entrySet()) {
                 String key = entry.getKey();
                 String value = entry.getValue();
-                Manifest.Attribute attr = manifest.getMainSection().getAttribute( key );
-                if ( key.equals( Attributes.Name.CLASS_PATH.toString() ) && attr != null )
-                {
+                Manifest.Attribute attr = manifest.getMainSection().getAttribute(key);
+                if (key.equals(Attributes.Name.CLASS_PATH.toString()) && attr != null) {
                     // Merge the user-supplied Class-Path value with the programmatically
                     // created Class-Path. Note that the user-supplied value goes first
                     // so that resources there will override any in the standard Class-Path.
-                    attr.setValue( value + " " + attr.getValue() );
-                }
-                else
-                {
-                    addManifestAttribute( manifest, key, value );
+                    attr.setValue(value + " " + attr.getValue());
+                } else {
+                    addManifestAttribute(manifest, key, value);
                 }
             }
         }
 
         // any custom manifest sections in the archive configuration manifest?
-        if ( !config.isManifestSectionsEmpty() )
-        {
-            for ( ManifestSection section : config.getManifestSections() )
-            {
+        if (!config.isManifestSectionsEmpty()) {
+            for (ManifestSection section : config.getManifestSections()) {
                 Manifest.Section theSection = new Manifest.Section();
-                theSection.setName( section.getName() );
+                theSection.setName(section.getName());
 
-                if ( !section.isManifestEntriesEmpty() )
-                {
+                if (!section.isManifestEntriesEmpty()) {
                     Map<String, String> sectionEntries = section.getManifestEntries();
 
-                    for ( Map.Entry<String, String> entry : sectionEntries.entrySet() )
-                    {
+                    for (Map.Entry<String, String> entry : sectionEntries.entrySet()) {
                         String key = entry.getKey();
                         String value = entry.getValue();
-                        Manifest.Attribute attr = new Manifest.Attribute( key, value );
-                        theSection.addConfiguredAttribute( attr );
+                        Manifest.Attribute attr = new Manifest.Attribute(key, value);
+                        theSection.addConfiguredAttribute(attr);
                     }
                 }
 
-                manifest.addConfiguredSection( theSection );
+                manifest.addConfiguredSection(theSection);
             }
         }
 
@@ -208,10 +193,9 @@ public Manifest getManifest( MavenSession session, MavenProject project, MavenAr
      * @throws org.apache.maven.artifact.DependencyResolutionRequiredException Dependency resolution exception.
      */
     // TODO Add user attributes list and user groups list
-    public Manifest getManifest( MavenProject project, ManifestConfiguration config )
-        throws ManifestException, DependencyResolutionRequiredException
-    {
-        return getManifest( null, project, config, Collections.emptyMap() );
+    public Manifest getManifest(MavenProject project, ManifestConfiguration config)
+            throws ManifestException, DependencyResolutionRequiredException {
+        return getManifest(null, project, config, Collections.emptyMap());
     }
 
     /**
@@ -225,36 +209,28 @@ public Manifest getManifest( MavenProject project, ManifestConfiguration config
      * @throws org.apache.maven.artifact.DependencyResolutionRequiredException the dependency resolution required
      *                                                                         exception
      */
-    public Manifest getManifest( MavenSession mavenSession, MavenProject project, ManifestConfiguration config )
-        throws ManifestException, DependencyResolutionRequiredException
-    {
-        return getManifest( mavenSession, project, config, Collections.emptyMap() );
+    public Manifest getManifest(MavenSession mavenSession, MavenProject project, ManifestConfiguration config)
+            throws ManifestException, DependencyResolutionRequiredException {
+        return getManifest(mavenSession, project, config, Collections.emptyMap());
     }
 
-    private void addManifestAttribute( Manifest manifest, Map<String, String> map, String key, String value )
-        throws ManifestException
-    {
-        if ( map.containsKey( key ) )
-        {
+    private void addManifestAttribute(Manifest manifest, Map<String, String> map, String key, String value)
+            throws ManifestException {
+        if (map.containsKey(key)) {
             return; // The map value will be added later
         }
-        addManifestAttribute( manifest, key, value );
+        addManifestAttribute(manifest, key, value);
     }
 
-    private void addManifestAttribute( Manifest manifest, String key, String value )
-        throws ManifestException
-    {
-        if ( !StringUtils.isEmpty( value ) )
-        {
-            Manifest.Attribute attr = new Manifest.Attribute( key, value );
-            manifest.addConfiguredAttribute( attr );
-        }
-        else
-        {
+    private void addManifestAttribute(Manifest manifest, String key, String value) throws ManifestException {
+        if (!StringUtils.isEmpty(value)) {
+            Manifest.Attribute attr = new Manifest.Attribute(key, value);
+            manifest.addConfiguredAttribute(attr);
+        } else {
             // if the value is empty, create an entry with an empty string
             // to prevent null print in the manifest file
-            Manifest.Attribute attr = new Manifest.Attribute( key, "" );
-            manifest.addConfiguredAttribute( attr );
+            Manifest.Attribute attr = new Manifest.Attribute(key, "");
+            manifest.addConfiguredAttribute(attr);
         }
     }
 
@@ -270,27 +246,22 @@ private void addManifestAttribute( Manifest manifest, String key, String value )
      * @throws org.apache.maven.artifact.DependencyResolutionRequiredException the dependency resolution required
      *                                                                         exception
      */
-    protected Manifest getManifest( MavenSession session, MavenProject project, ManifestConfiguration config,
-                                    Map<String, String> entries )
-                                        throws ManifestException, DependencyResolutionRequiredException
-    {
+    protected Manifest getManifest(
+            MavenSession session, MavenProject project, ManifestConfiguration config, Map<String, String> entries)
+            throws ManifestException, DependencyResolutionRequiredException {
         // TODO: Should we replace "map" with a copy? Note, that we modify it!
 
         Manifest m = new Manifest();
 
-        if ( config.isAddDefaultEntries() )
-        {
-            handleDefaultEntries( m, entries );
+        if (config.isAddDefaultEntries()) {
+            handleDefaultEntries(m, entries);
         }
 
-
-        if ( config.isAddBuildEnvironmentEntries() )
-        {
-            handleBuildEnvironmentEntries( session, m, entries );
+        if (config.isAddBuildEnvironmentEntries()) {
+            handleBuildEnvironmentEntries(session, m, entries);
         }
 
-        if ( config.isAddClasspath() )
-        {
+        if (config.isAddClasspath()) {
             StringBuilder classpath = new StringBuilder();
 
             List<String> artifacts = project.getRuntimeClasspathElements();
@@ -300,265 +271,220 @@ protected Manifest getManifest( MavenSession session, MavenProject project, Mani
 
             Interpolator interpolator = new StringSearchInterpolator();
 
-            for ( String artifactFile : artifacts )
-            {
-                File f = new File( artifactFile );
-                if ( f.getAbsoluteFile().isFile() )
-                {
-                    Artifact artifact = findArtifactWithFile( project.getArtifacts(), f );
+            for (String artifactFile : artifacts) {
+                File f = new File(artifactFile);
+                if (f.getAbsoluteFile().isFile()) {
+                    Artifact artifact = findArtifactWithFile(project.getArtifacts(), f);
 
-                    if ( classpath.length() > 0 )
-                    {
-                        classpath.append( " " );
+                    if (classpath.length() > 0) {
+                        classpath.append(" ");
                     }
-                    classpath.append( classpathPrefix );
+                    classpath.append(classpathPrefix);
 
                     // NOTE: If the artifact or layout type (from config) is null, give up and use the file name by
                     // itself.
-                    if ( artifact == null || layoutType == null )
-                    {
-                        classpath.append( f.getName() );
-                    }
-                    else
-                    {
+                    if (artifact == null || layoutType == null) {
+                        classpath.append(f.getName());
+                    } else {
                         List<ValueSource> valueSources = new ArrayList<>();
 
-                        handleExtraExpression( artifact, valueSources );
+                        handleExtraExpression(artifact, valueSources);
 
-                        for ( ValueSource vs : valueSources )
-                        {
-                            interpolator.addValueSource( vs );
+                        for (ValueSource vs : valueSources) {
+                            interpolator.addValueSource(vs);
                         }
 
                         RecursionInterceptor recursionInterceptor =
-                            new PrefixAwareRecursionInterceptor( ARTIFACT_EXPRESSION_PREFIXES );
+                                new PrefixAwareRecursionInterceptor(ARTIFACT_EXPRESSION_PREFIXES);
 
-                        try
-                        {
-                            switch ( layoutType )
-                            {
+                        try {
+                            switch (layoutType) {
                                 case CLASSPATH_LAYOUT_TYPE_SIMPLE:
-                                    if ( config.isUseUniqueVersions() )
-                                    {
-                                        classpath.append( interpolator.interpolate( SIMPLE_LAYOUT,
-                                                recursionInterceptor ) );
-                                    }
-                                    else
-                                    {
-                                        classpath.append( interpolator.interpolate( SIMPLE_LAYOUT_NONUNIQUE,
-                                                recursionInterceptor ) );
+                                    if (config.isUseUniqueVersions()) {
+                                        classpath.append(interpolator.interpolate(SIMPLE_LAYOUT, recursionInterceptor));
+                                    } else {
+                                        classpath.append(interpolator.interpolate(
+                                                SIMPLE_LAYOUT_NONUNIQUE, recursionInterceptor));
                                     }
                                     break;
                                 case CLASSPATH_LAYOUT_TYPE_REPOSITORY:
                                     // we use layout /$groupId[0]/../${groupId[n]/$artifactId/$version/{fileName}
                                     // here we must find the Artifact in the project Artifacts
                                     // to create the maven layout
-                                    if ( config.isUseUniqueVersions() )
-                                    {
-                                        classpath.append( interpolator.interpolate( REPOSITORY_LAYOUT,
-                                                recursionInterceptor ) );
-                                    }
-                                    else
-                                    {
-                                        classpath.append( interpolator.interpolate( REPOSITORY_LAYOUT_NONUNIQUE,
-                                                recursionInterceptor ) );
+                                    if (config.isUseUniqueVersions()) {
+                                        classpath.append(
+                                                interpolator.interpolate(REPOSITORY_LAYOUT, recursionInterceptor));
+                                    } else {
+                                        classpath.append(interpolator.interpolate(
+                                                REPOSITORY_LAYOUT_NONUNIQUE, recursionInterceptor));
                                     }
                                     break;
                                 case CLASSPATH_LAYOUT_TYPE_CUSTOM:
-                                    if ( layout == null )
-                                    {
-                                        throw new ManifestException( CLASSPATH_LAYOUT_TYPE_CUSTOM
+                                    if (layout == null) {
+                                        throw new ManifestException(CLASSPATH_LAYOUT_TYPE_CUSTOM
                                                 + " layout type was declared, but custom layout expression was not"
                                                 + " specified. Check your <archive><manifest><customLayout/>"
-                                                + " element." );
+                                                + " element.");
                                     }
 
-                                    classpath.append( interpolator.interpolate( layout, recursionInterceptor ) );
+                                    classpath.append(interpolator.interpolate(layout, recursionInterceptor));
                                     break;
                                 default:
-                                    throw new ManifestException( "Unknown classpath layout type: '" + layoutType
-                                            + "'. Check your <archive><manifest><layoutType/> element." );
+                                    throw new ManifestException("Unknown classpath layout type: '" + layoutType
+                                            + "'. Check your <archive><manifest><layoutType/> element.");
                             }
-                        }
-                        catch ( InterpolationException e )
-                        {
-                            ManifestException error =
-                                new ManifestException( "Error interpolating artifact path for classpath entry: "
-                                    + e.getMessage() );
+                        } catch (InterpolationException e) {
+                            ManifestException error = new ManifestException(
+                                    "Error interpolating artifact path for classpath entry: " + e.getMessage());
 
-                            error.initCause( e );
+                            error.initCause(e);
                             throw error;
-                        }
-                        finally
-                        {
-                            for ( ValueSource vs : valueSources )
-                            {
-                                interpolator.removeValuesSource( vs );
+                        } finally {
+                            for (ValueSource vs : valueSources) {
+                                interpolator.removeValuesSource(vs);
                             }
                         }
                     }
                 }
             }
 
-            if ( classpath.length() > 0 )
-            {
+            if (classpath.length() > 0) {
                 // Class-Path is special and should be added to manifest even if
                 // it is specified in the manifestEntries section
-                addManifestAttribute( m, "Class-Path", classpath.toString() );
+                addManifestAttribute(m, "Class-Path", classpath.toString());
             }
         }
 
-        if ( config.isAddDefaultSpecificationEntries() )
-        {
-            handleSpecificationEntries( project, entries, m );
+        if (config.isAddDefaultSpecificationEntries()) {
+            handleSpecificationEntries(project, entries, m);
         }
 
-        if ( config.isAddDefaultImplementationEntries() )
-        {
-            handleImplementationEntries( project, entries, m );
+        if (config.isAddDefaultImplementationEntries()) {
+            handleImplementationEntries(project, entries, m);
         }
 
         String mainClass = config.getMainClass();
-        if ( mainClass != null && !"".equals( mainClass ) )
-        {
-            addManifestAttribute( m, entries, "Main-Class", mainClass );
+        if (mainClass != null && !"".equals(mainClass)) {
+            addManifestAttribute(m, entries, "Main-Class", mainClass);
         }
 
-        if ( config.isAddExtensions() )
-        {
-            handleExtensions( project, entries, m );
+        if (config.isAddExtensions()) {
+            handleExtensions(project, entries, m);
         }
 
-        addCustomEntries( m, entries, config );
+        addCustomEntries(m, entries, config);
 
         return m;
     }
 
-    private void handleExtraExpression( Artifact artifact, List<ValueSource> valueSources )
-    {
-        valueSources.add( new PrefixedObjectValueSource( ARTIFACT_EXPRESSION_PREFIXES, artifact,
-                                                         true ) );
-        valueSources.add( new PrefixedObjectValueSource( ARTIFACT_EXPRESSION_PREFIXES,
-                                                         artifact.getArtifactHandler(), true ) );
+    private void handleExtraExpression(Artifact artifact, List<ValueSource> valueSources) {
+        valueSources.add(new PrefixedObjectValueSource(ARTIFACT_EXPRESSION_PREFIXES, artifact, true));
+        valueSources.add(
+                new PrefixedObjectValueSource(ARTIFACT_EXPRESSION_PREFIXES, artifact.getArtifactHandler(), true));
 
         Properties extraExpressions = new Properties();
         // FIXME: This query method SHOULD NOT affect the internal
         // state of the artifact version, but it does.
-        if ( !artifact.isSnapshot() )
-        {
-            extraExpressions.setProperty( "baseVersion", artifact.getVersion() );
+        if (!artifact.isSnapshot()) {
+            extraExpressions.setProperty("baseVersion", artifact.getVersion());
         }
 
-        extraExpressions.setProperty( "groupIdPath", artifact.getGroupId().replace( '.', '/' ) );
-        if ( StringUtils.isNotEmpty( artifact.getClassifier() ) )
-        {
-            extraExpressions.setProperty( "dashClassifier", "-" + artifact.getClassifier() );
-            extraExpressions.setProperty( "dashClassifier?", "-" + artifact.getClassifier() );
-        }
-        else
-        {
-            extraExpressions.setProperty( "dashClassifier", "" );
-            extraExpressions.setProperty( "dashClassifier?", "" );
+        extraExpressions.setProperty("groupIdPath", artifact.getGroupId().replace('.', '/'));
+        if (StringUtils.isNotEmpty(artifact.getClassifier())) {
+            extraExpressions.setProperty("dashClassifier", "-" + artifact.getClassifier());
+            extraExpressions.setProperty("dashClassifier?", "-" + artifact.getClassifier());
+        } else {
+            extraExpressions.setProperty("dashClassifier", "");
+            extraExpressions.setProperty("dashClassifier?", "");
         }
-        valueSources.add( new PrefixedPropertiesValueSource( ARTIFACT_EXPRESSION_PREFIXES,
-                                                             extraExpressions, true ) );
+        valueSources.add(new PrefixedPropertiesValueSource(ARTIFACT_EXPRESSION_PREFIXES, extraExpressions, true));
     }
 
-    private void handleExtensions( MavenProject project, Map<String, String> entries, Manifest m )
-        throws ManifestException
-    {
+    private void handleExtensions(MavenProject project, Map<String, String> entries, Manifest m)
+            throws ManifestException {
         // TODO: this is only for applets - should we distinguish them as a packaging?
         StringBuilder extensionsList = new StringBuilder();
         Set<Artifact> artifacts = project.getArtifacts();
 
-        for ( Artifact artifact : artifacts )
-        {
-            if ( !Artifact.SCOPE_TEST.equals( artifact.getScope() ) )
-            {
-                if ( "jar".equals( artifact.getType() ) )
-                {
-                    if ( extensionsList.length() > 0 )
-                    {
-                        extensionsList.append( " " );
+        for (Artifact artifact : artifacts) {
+            if (!Artifact.SCOPE_TEST.equals(artifact.getScope())) {
+                if ("jar".equals(artifact.getType())) {
+                    if (extensionsList.length() > 0) {
+                        extensionsList.append(" ");
                     }
-                    extensionsList.append( artifact.getArtifactId() );
+                    extensionsList.append(artifact.getArtifactId());
                 }
             }
         }
 
-        if ( extensionsList.length() > 0 )
-        {
-            addManifestAttribute( m, entries, "Extension-List", extensionsList.toString() );
+        if (extensionsList.length() > 0) {
+            addManifestAttribute(m, entries, "Extension-List", extensionsList.toString());
         }
 
-        for ( Artifact artifact : artifacts )
-        {
+        for (Artifact artifact : artifacts) {
             // TODO: the correct solution here would be to have an extension type, and to read
             // the real extension values either from the artifact's manifest or some part of the POM
-            if ( "jar".equals( artifact.getType() ) )
-            {
-                String artifactId = artifact.getArtifactId().replace( '.', '_' );
+            if ("jar".equals(artifact.getType())) {
+                String artifactId = artifact.getArtifactId().replace('.', '_');
                 String ename = artifactId + "-Extension-Name";
-                addManifestAttribute( m, entries, ename, artifact.getArtifactId() );
+                addManifestAttribute(m, entries, ename, artifact.getArtifactId());
                 String iname = artifactId + "-Implementation-Version";
-                addManifestAttribute( m, entries, iname, artifact.getVersion() );
+                addManifestAttribute(m, entries, iname, artifact.getVersion());
 
-                if ( artifact.getRepository() != null )
-                {
+                if (artifact.getRepository() != null) {
                     iname = artifactId + "-Implementation-URL";
                     String url = artifact.getRepository().getUrl() + "/" + artifact;
-                    addManifestAttribute( m, entries, iname, url );
+                    addManifestAttribute(m, entries, iname, url);
                 }
             }
         }
     }
 
-    private void handleImplementationEntries( MavenProject project, Map<String, String> entries, Manifest m )
-        throws ManifestException
-    {
-        addManifestAttribute( m, entries, "Implementation-Title", project.getName() );
-        addManifestAttribute( m, entries, "Implementation-Version", project.getVersion() );
+    private void handleImplementationEntries(MavenProject project, Map<String, String> entries, Manifest m)
+            throws ManifestException {
+        addManifestAttribute(m, entries, "Implementation-Title", project.getName());
+        addManifestAttribute(m, entries, "Implementation-Version", project.getVersion());
 
-        if ( project.getOrganization() != null )
-        {
-            addManifestAttribute( m, entries, "Implementation-Vendor", project.getOrganization().getName() );
+        if (project.getOrganization() != null) {
+            addManifestAttribute(
+                    m,
+                    entries,
+                    "Implementation-Vendor",
+                    project.getOrganization().getName());
         }
     }
 
-    private void handleSpecificationEntries( MavenProject project, Map<String, String> entries, Manifest m )
-        throws ManifestException
-    {
-        addManifestAttribute( m, entries, "Specification-Title", project.getName() );
+    private void handleSpecificationEntries(MavenProject project, Map<String, String> entries, Manifest m)
+            throws ManifestException {
+        addManifestAttribute(m, entries, "Specification-Title", project.getName());
 
-        try
-        {
+        try {
             ArtifactVersion version = project.getArtifact().getSelectedVersion();
-            String specVersion = String.format( "%s.%s", version.getMajorVersion(), version.getMinorVersion() );
-            addManifestAttribute( m, entries, "Specification-Version", specVersion );
-        }
-        catch ( OverConstrainedVersionException e )
-        {
-            throw new ManifestException( "Failed to get selected artifact version to calculate"
-                + " the specification version: " + e.getMessage() );
+            String specVersion = String.format("%s.%s", version.getMajorVersion(), version.getMinorVersion());
+            addManifestAttribute(m, entries, "Specification-Version", specVersion);
+        } catch (OverConstrainedVersionException e) {
+            throw new ManifestException("Failed to get selected artifact version to calculate"
+                    + " the specification version: " + e.getMessage());
         }
 
-        if ( project.getOrganization() != null )
-        {
-            addManifestAttribute( m, entries, "Specification-Vendor", project.getOrganization().getName() );
+        if (project.getOrganization() != null) {
+            addManifestAttribute(
+                    m,
+                    entries,
+                    "Specification-Vendor",
+                    project.getOrganization().getName());
         }
     }
 
-    private void addCustomEntries( Manifest m, Map<String, String> entries, ManifestConfiguration config )
-        throws ManifestException
-    {
+    private void addCustomEntries(Manifest m, Map<String, String> entries, ManifestConfiguration config)
+            throws ManifestException {
         /*
          * TODO: rethink this, it wasn't working Artifact projectArtifact = project.getArtifact(); if (
          * projectArtifact.isSnapshot() ) { Manifest.Attribute buildNumberAttr = new Manifest.Attribute( "Build-Number",
          * "" + project.getSnapshotDeploymentBuildNumber() ); m.addConfiguredAttribute( buildNumberAttr ); }
          */
-        if ( config.getPackageName() != null )
-        {
-            addManifestAttribute( m, entries, "Package", config.getPackageName() );
+        if (config.getPackageName() != null) {
+            addManifestAttribute(m, entries, "Package", config.getPackageName());
         }
     }
 
@@ -567,8 +493,7 @@ private void addCustomEntries( Manifest m, Map<String, String> entries, Manifest
      *
      * @return {@link org.codehaus.plexus.archiver.jar.JarArchiver}
      */
-    public JarArchiver getArchiver()
-    {
+    public JarArchiver getArchiver() {
         return archiver;
     }
 
@@ -577,8 +502,7 @@ public JarArchiver getArchiver()
      *
      * @param archiver {@link org.codehaus.plexus.archiver.jar.JarArchiver}
      */
-    public void setArchiver( JarArchiver archiver )
-    {
+    public void setArchiver(JarArchiver archiver) {
         this.archiver = archiver;
     }
 
@@ -587,8 +511,7 @@ public void setArchiver( JarArchiver archiver )
      *
      * @param outputFile Set output file.
      */
-    public void setOutputFile( File outputFile )
-    {
+    public void setOutputFile(File outputFile) {
         archiveFile = outputFile;
     }
 
@@ -603,18 +526,15 @@ public void setOutputFile( File outputFile )
      * @throws java.io.IOException IO Exception.
      * @throws org.apache.maven.artifact.DependencyResolutionRequiredException Dependency resolution exception.
      */
-    public void createArchive( MavenSession session, MavenProject project,
-                               MavenArchiveConfiguration archiveConfiguration )
-                                   throws ManifestException, IOException,
-                                   DependencyResolutionRequiredException
-    {
+    public void createArchive(
+            MavenSession session, MavenProject project, MavenArchiveConfiguration archiveConfiguration)
+            throws ManifestException, IOException, DependencyResolutionRequiredException {
         // we have to clone the project instance so we can write out the pom with the deployment version,
         // without impacting the main project instance...
         MavenProject workingProject = project.clone();
 
         boolean forced = archiveConfiguration.isForced();
-        if ( archiveConfiguration.isAddMavenDescriptor() )
-        {
+        if (archiveConfiguration.isAddMavenDescriptor()) {
             // ----------------------------------------------------------------------
             // We want to add the metadata for the project to the JAR in two forms:
             //
@@ -626,80 +546,74 @@ public void createArchive( MavenSession session, MavenProject project,
             // POM information without the use of maven tools can do so.
             // ----------------------------------------------------------------------
 
-            if ( workingProject.getArtifact().isSnapshot() )
-            {
-                workingProject.setVersion( workingProject.getArtifact().getVersion() );
+            if (workingProject.getArtifact().isSnapshot()) {
+                workingProject.setVersion(workingProject.getArtifact().getVersion());
             }
 
             String groupId = workingProject.getGroupId();
 
             String artifactId = workingProject.getArtifactId();
 
-            archiver.addFile( project.getFile(), "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml" );
+            archiver.addFile(project.getFile(), "META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml");
 
             // ----------------------------------------------------------------------
             // Create pom.properties file
             // ----------------------------------------------------------------------
 
             File customPomPropertiesFile = archiveConfiguration.getPomPropertiesFile();
-            File dir = new File( workingProject.getBuild().getDirectory(), "maven-archiver" );
-            File pomPropertiesFile = new File( dir, "pom.properties" );
+            File dir = new File(workingProject.getBuild().getDirectory(), "maven-archiver");
+            File pomPropertiesFile = new File(dir, "pom.properties");
 
-            new PomPropertiesUtil().createPomProperties( session, workingProject, archiver,
-                customPomPropertiesFile, pomPropertiesFile, forced );
+            new PomPropertiesUtil()
+                    .createPomProperties(
+                            session, workingProject, archiver, customPomPropertiesFile, pomPropertiesFile, forced);
         }
 
         // ----------------------------------------------------------------------
         // Create the manifest
         // ----------------------------------------------------------------------
 
-        archiver.setMinimalDefaultManifest( true );
+        archiver.setMinimalDefaultManifest(true);
 
         File manifestFile = archiveConfiguration.getManifestFile();
 
-        if ( manifestFile != null )
-        {
-            archiver.setManifest( manifestFile );
+        if (manifestFile != null) {
+            archiver.setManifest(manifestFile);
         }
 
-        Manifest manifest = getManifest( session, workingProject, archiveConfiguration );
+        Manifest manifest = getManifest(session, workingProject, archiveConfiguration);
 
         // Configure the jar
-        archiver.addConfiguredManifest( manifest );
+        archiver.addConfiguredManifest(manifest);
 
-        archiver.setCompress( archiveConfiguration.isCompress() );
+        archiver.setCompress(archiveConfiguration.isCompress());
 
-        archiver.setRecompressAddedZips( archiveConfiguration.isRecompressAddedZips() );
+        archiver.setRecompressAddedZips(archiveConfiguration.isRecompressAddedZips());
 
-        archiver.setIndex( archiveConfiguration.isIndex() );
+        archiver.setIndex(archiveConfiguration.isIndex());
 
-        archiver.setDestFile( archiveFile );
+        archiver.setDestFile(archiveFile);
 
         // make the archiver index the jars on the classpath, if we are adding that to the manifest
-        if ( archiveConfiguration.getManifest().isAddClasspath() )
-        {
+        if (archiveConfiguration.getManifest().isAddClasspath()) {
             List<String> artifacts = project.getRuntimeClasspathElements();
-            for ( String artifact : artifacts )
-            {
-                File f = new File( artifact );
-                archiver.addConfiguredIndexJars( f );
+            for (String artifact : artifacts) {
+                File f = new File(artifact);
+                archiver.addConfiguredIndexJars(f);
             }
         }
 
-        archiver.setForced( forced );
-        if ( !archiveConfiguration.isForced() && archiver.isSupportingForced() )
-        {
+        archiver.setForced(forced);
+        if (!archiveConfiguration.isForced() && archiver.isSupportingForced()) {
             // TODO Should issue a warning here, but how do we get a logger?
             // TODO getLog().warn(
             // "Forced build is disabled, but disabling the forced mode isn't supported by the archiver." );
         }
 
-        String automaticModuleName = manifest.getMainSection().getAttributeValue( "Automatic-Module-Name" );
-        if ( automaticModuleName != null )
-        {
-            if ( !isValidModuleName( automaticModuleName ) )
-            {
-                throw new ManifestException( "Invalid automatic module name: '" + automaticModuleName + "'" );
+        String automaticModuleName = manifest.getMainSection().getAttributeValue("Automatic-Module-Name");
+        if (automaticModuleName != null) {
+            if (!isValidModuleName(automaticModuleName)) {
+                throw new ManifestException("Invalid automatic module name: '" + automaticModuleName + "'");
             }
         }
 
@@ -707,41 +621,45 @@ public void createArchive( MavenSession session, MavenProject project,
         archiver.createArchive();
     }
 
-    private void handleDefaultEntries( Manifest m, Map<String, String> entries )
-        throws ManifestException
-    {
-         String createdBy = this.createdBy;
-         if ( createdBy == null )
-         {
-             createdBy = createdBy( CREATED_BY, "org.apache.maven", "maven-archiver" );
-         }
-         addManifestAttribute( m, entries, "Created-By", createdBy );
-         if ( buildJdkSpecDefaultEntry )
-         {
-             addManifestAttribute( m, entries, "Build-Jdk-Spec", System.getProperty( "java.specification.version" ) );
-         }
+    private void handleDefaultEntries(Manifest m, Map<String, String> entries) throws ManifestException {
+        String createdBy = this.createdBy;
+        if (createdBy == null) {
+            createdBy = createdBy(CREATED_BY, "org.apache.maven", "maven-archiver");
+        }
+        addManifestAttribute(m, entries, "Created-By", createdBy);
+        if (buildJdkSpecDefaultEntry) {
+            addManifestAttribute(m, entries, "Build-Jdk-Spec", System.getProperty("java.specification.version"));
+        }
     }
 
-    private void handleBuildEnvironmentEntries( MavenSession session, Manifest m, Map<String, String> entries )
-        throws ManifestException
-    {
-        addManifestAttribute( m, entries, "Build-Tool",
-            session != null ? session.getSystemProperties().getProperty( "maven.build.version" ) : "Apache Maven" );
-        addManifestAttribute( m, entries, "Build-Jdk", String.format( "%s (%s)", System.getProperty( "java.version" ),
-            System.getProperty( "java.vendor" ) ) );
-        addManifestAttribute( m, entries, "Build-Os", String.format( "%s (%s; %s)", System.getProperty( "os.name" ),
-            System.getProperty( "os.version" ), System.getProperty( "os.arch" ) ) );
+    private void handleBuildEnvironmentEntries(MavenSession session, Manifest m, Map<String, String> entries)
+            throws ManifestException {
+        addManifestAttribute(
+                m,
+                entries,
+                "Build-Tool",
+                session != null ? session.getSystemProperties().getProperty("maven.build.version") : "Apache Maven");
+        addManifestAttribute(
+                m,
+                entries,
+                "Build-Jdk",
+                String.format("%s (%s)", System.getProperty("java.version"), System.getProperty("java.vendor")));
+        addManifestAttribute(
+                m,
+                entries,
+                "Build-Os",
+                String.format(
+                        "%s (%s; %s)",
+                        System.getProperty("os.name"),
+                        System.getProperty("os.version"),
+                        System.getProperty("os.arch")));
     }
 
-    private Artifact findArtifactWithFile( Set<Artifact> artifacts, File file )
-    {
-        for ( Artifact artifact : artifacts )
-        {
+    private Artifact findArtifactWithFile(Set<Artifact> artifacts, File file) {
+        for (Artifact artifact : artifacts) {
             // normally not null but we can check
-            if ( artifact.getFile() != null )
-            {
-                if ( artifact.getFile().equals( file ) )
-                {
+            if (artifact.getFile() != null) {
+                if (artifact.getFile().equals(file)) {
                     return artifact;
                 }
             }
@@ -749,25 +667,19 @@ private Artifact findArtifactWithFile( Set<Artifact> artifacts, File file )
         return null;
     }
 
-    private static String getCreatedByVersion( String groupId, String artifactId )
-    {
-        final Properties properties = loadOptionalProperties( MavenArchiver.class.getResourceAsStream(
-            "/META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" ) );
+    private static String getCreatedByVersion(String groupId, String artifactId) {
+        final Properties properties = loadOptionalProperties(MavenArchiver.class.getResourceAsStream(
+                "/META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties"));
 
-        return properties.getProperty( "version" );
+        return properties.getProperty("version");
     }
 
-    private static Properties loadOptionalProperties( final InputStream inputStream )
-    {
+    private static Properties loadOptionalProperties(final InputStream inputStream) {
         Properties properties = new Properties();
-        if ( inputStream != null )
-        {
-            try ( InputStream in = inputStream )
-            {
-                properties.load( in );
-            }
-            catch ( IllegalArgumentException | IOException ex )
-            {
+        if (inputStream != null) {
+            try (InputStream in = inputStream) {
+                properties.load(in);
+            } catch (IllegalArgumentException | IOException ex) {
                 // ignore and return empty properties
             }
         }
@@ -782,17 +694,14 @@ private static Properties loadOptionalProperties( final InputStream inputStream
      * @param artifactId artifactId where to get version in pom.properties
      * @since 3.5.0
      */
-    public void setCreatedBy( String description, String groupId, String artifactId )
-    {
-        createdBy = createdBy( description, groupId, artifactId );
+    public void setCreatedBy(String description, String groupId, String artifactId) {
+        createdBy = createdBy(description, groupId, artifactId);
     }
 
-    private String createdBy( String description, String groupId, String artifactId )
-    {
+    private String createdBy(String description, String groupId, String artifactId) {
         String createdBy = description;
-        String version = getCreatedByVersion( groupId, artifactId );
-        if ( version != null )
-        {
+        String version = getCreatedByVersion(groupId, artifactId);
+        if (version != null) {
             createdBy += " " + version;
         }
         return createdBy;
@@ -806,8 +715,7 @@ private String createdBy( String description, String groupId, String artifactId
      * @param buildJdkSpecDefaultEntry the value for "Build-Jdk-Spec" entry
      * @since 3.5.0
      */
-    public void setBuildJdkSpecDefaultEntry( boolean buildJdkSpecDefaultEntry )
-    {
+    public void setBuildJdkSpecDefaultEntry(boolean buildJdkSpecDefaultEntry) {
         this.buildJdkSpecDefaultEntry = buildJdkSpecDefaultEntry;
     }
 
@@ -825,9 +733,8 @@ public void setBuildJdkSpecDefaultEntry( boolean buildJdkSpecDefaultEntry )
      * @deprecated Use {@link #parseBuildOutputTimestamp(String)} instead.
      */
     @Deprecated
-    public Date parseOutputTimestamp( String outputTimestamp )
-    {
-        return parseBuildOutputTimestamp( outputTimestamp ).map( Date::from ).orElse( null );
+    public Date parseOutputTimestamp(String outputTimestamp) {
+        return parseBuildOutputTimestamp(outputTimestamp).map(Date::from).orElse(null);
     }
 
     /**
@@ -840,10 +747,9 @@ public Date parseOutputTimestamp( String outputTimestamp )
      * @deprecated Use {@link #configureReproducibleBuild(String)} instead.
      */
     @Deprecated
-    public Date configureReproducible( String outputTimestamp )
-    {
-        configureReproducibleBuild( outputTimestamp );
-        return parseOutputTimestamp( outputTimestamp );
+    public Date configureReproducible(String outputTimestamp) {
+        configureReproducibleBuild(outputTimestamp);
+        return parseOutputTimestamp(outputTimestamp);
     }
 
     /**
@@ -859,44 +765,38 @@ public Date configureReproducible( String outputTimestamp )
      * @throws IllegalArgumentException if the outputTimestamp is neither ISO 8601 nor an integer, or it's not within
      *             the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z
      */
-    public static Optional<Instant> parseBuildOutputTimestamp( String outputTimestamp )
-    {
+    public static Optional<Instant> parseBuildOutputTimestamp(String outputTimestamp) {
         // Fail-fast on nulls
-        if ( outputTimestamp == null )
-        {
+        if (outputTimestamp == null) {
             return Optional.empty();
         }
 
         // Number representing seconds since the epoch
-        if ( StringUtils.isNotEmpty( outputTimestamp ) && StringUtils.isNumeric( outputTimestamp ) )
-        {
-            return Optional.of( Instant.ofEpochSecond( Long.parseLong( outputTimestamp ) ) );
+        if (StringUtils.isNotEmpty(outputTimestamp) && StringUtils.isNumeric(outputTimestamp)) {
+            return Optional.of(Instant.ofEpochSecond(Long.parseLong(outputTimestamp)));
         }
 
         // no timestamp configured (1 character configuration is useful to override a full value during pom
         // inheritance)
-        if ( outputTimestamp.length() < 2 )
-        {
+        if (outputTimestamp.length() < 2) {
             return Optional.empty();
         }
 
-        try
-        {
+        try {
             // Parse the date in UTC such as '2011-12-03T10:15:30Z' or with an offset '2019-10-05T20:37:42+06:00'.
-            final Instant date = OffsetDateTime.parse( outputTimestamp )
-                .withOffsetSameInstant( ZoneOffset.UTC ).truncatedTo( ChronoUnit.SECONDS ).toInstant();
-
-            if ( date.isBefore( DATE_MIN ) || date.isAfter( DATE_MAX ) )
-            {
-                throw new IllegalArgumentException( "'" + date + "' is not within the valid range "
-                    + DATE_MIN + " to " + DATE_MAX );
+            final Instant date = OffsetDateTime.parse(outputTimestamp)
+                    .withOffsetSameInstant(ZoneOffset.UTC)
+                    .truncatedTo(ChronoUnit.SECONDS)
+                    .toInstant();
+
+            if (date.isBefore(DATE_MIN) || date.isAfter(DATE_MAX)) {
+                throw new IllegalArgumentException(
+                        "'" + date + "' is not within the valid range " + DATE_MIN + " to " + DATE_MAX);
             }
-            return Optional.of( date );
-        }
-        catch ( DateTimeParseException pe )
-        {
-            throw new IllegalArgumentException( "Invalid project.build.outputTimestamp value '" + outputTimestamp + "'",
-                                                pe );
+            return Optional.of(date);
+        } catch (DateTimeParseException pe) {
+            throw new IllegalArgumentException(
+                    "Invalid project.build.outputTimestamp value '" + outputTimestamp + "'", pe);
         }
     }
 
@@ -907,10 +807,8 @@ public static Optional<Instant> parseBuildOutputTimestamp( String outputTimestam
      * @since 3.6.0
      * @see #parseBuildOutputTimestamp(String)
      */
-    public void configureReproducibleBuild( String outputTimestamp )
-    {
-        parseBuildOutputTimestamp( outputTimestamp )
-            .map( FileTime::from )
-            .ifPresent( modifiedTime -> getArchiver().configureReproducibleBuild( modifiedTime ) );
+    public void configureReproducibleBuild(String outputTimestamp) {
+        parseBuildOutputTimestamp(outputTimestamp).map(FileTime::from).ifPresent(modifiedTime -> getArchiver()
+                .configureReproducibleBuild(modifiedTime));
     }
 }
diff --git a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
index aacf13f..f105241 100644
--- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
+++ b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -43,67 +42,52 @@
  * @author slachiewicz
  * @version $Id: $Id
  */
-public class PomPropertiesUtil
-{
-    private Properties loadPropertiesFile( File file )
-        throws IOException
-    {
+public class PomPropertiesUtil {
+    private Properties loadPropertiesFile(File file) throws IOException {
         Properties fileProps = new Properties();
-        try ( InputStream istream = Files.newInputStream( file.toPath() ) )
-        {
-            fileProps.load( istream );
+        try (InputStream istream = Files.newInputStream(file.toPath())) {
+            fileProps.load(istream);
             return fileProps;
         }
     }
 
-    private boolean sameContents( Properties props, File file )
-        throws IOException
-    {
-        if ( !file.isFile() )
-        {
+    private boolean sameContents(Properties props, File file) throws IOException {
+        if (!file.isFile()) {
             return false;
         }
 
-        Properties fileProps = loadPropertiesFile( file );
-        return fileProps.equals( props );
+        Properties fileProps = loadPropertiesFile(file);
+        return fileProps.equals(props);
     }
 
-    private void createPropertiesFile( Properties properties, File outputFile, boolean forceCreation )
-        throws IOException
-    {
+    private void createPropertiesFile(Properties properties, File outputFile, boolean forceCreation)
+            throws IOException {
         File outputDir = outputFile.getParentFile();
-        if ( outputDir != null && !outputDir.isDirectory() && !outputDir.mkdirs() )
-        {
-            throw new IOException( "Failed to create directory: " + outputDir );
+        if (outputDir != null && !outputDir.isDirectory() && !outputDir.mkdirs()) {
+            throw new IOException("Failed to create directory: " + outputDir);
         }
-        if ( !forceCreation && sameContents( properties, outputFile ) )
-        {
+        if (!forceCreation && sameContents(properties, outputFile)) {
             return;
         }
-        
-        try ( PrintWriter pw = new PrintWriter( outputFile, "ISO-8859-1" );
-              StringWriter sw = new StringWriter() )
-        {
-            
-            properties.store( sw, null );
+
+        try (PrintWriter pw = new PrintWriter(outputFile, "ISO-8859-1");
+                StringWriter sw = new StringWriter()) {
+
+            properties.store(sw, null);
 
             List<String> lines = new ArrayList<>();
-            try ( BufferedReader r = new BufferedReader( new StringReader( sw.toString() ) ) )
-            {
+            try (BufferedReader r = new BufferedReader(new StringReader(sw.toString()))) {
                 String line;
-                while ( ( line = r.readLine() ) != null )
-                {
-                    if ( !line.startsWith( "#" ) )
-                    {
-                        lines.add( line );
+                while ((line = r.readLine()) != null) {
+                    if (!line.startsWith("#")) {
+                        lines.add(line);
                     }
                 }
             }
 
-            Collections.sort( lines );
-            for ( String l : lines )
-            {
-                pw.println( l );
+            Collections.sort(lines);
+            for (String l : lines) {
+                pw.println(l);
             }
         }
     }
@@ -120,33 +104,34 @@ private void createPropertiesFile( Properties properties, File outputFile, boole
      * @throws org.codehaus.plexus.archiver.ArchiverException archiver exception.
      * @throws java.io.IOException IO exception.
      */
-    public void createPomProperties( MavenSession session, MavenProject project, Archiver archiver,
-                                     File customPomPropertiesFile, File pomPropertiesFile, boolean forceCreation )
-        throws IOException
-    {
+    public void createPomProperties(
+            MavenSession session,
+            MavenProject project,
+            Archiver archiver,
+            File customPomPropertiesFile,
+            File pomPropertiesFile,
+            boolean forceCreation)
+            throws IOException {
         final String groupId = project.getGroupId();
         final String artifactId = project.getArtifactId();
         final String version = project.getVersion();
 
         Properties p;
 
-        if ( customPomPropertiesFile != null )
-        {
-            p = loadPropertiesFile( customPomPropertiesFile );
-        }
-        else
-        {
+        if (customPomPropertiesFile != null) {
+            p = loadPropertiesFile(customPomPropertiesFile);
+        } else {
             p = new Properties();
         }
 
-        p.setProperty( "groupId", groupId );
+        p.setProperty("groupId", groupId);
 
-        p.setProperty( "artifactId", artifactId );
+        p.setProperty("artifactId", artifactId);
 
-        p.setProperty( "version", version );
+        p.setProperty("version", version);
 
-        createPropertiesFile( p, pomPropertiesFile, forceCreation );
+        createPropertiesFile(p, pomPropertiesFile, forceCreation);
 
-        archiver.addFile( pomPropertiesFile, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" );
+        archiver.addFile(pomPropertiesFile, "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties");
     }
 }
diff --git a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
index dce5c4e..528ff45 100644
--- a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,47 +16,43 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-class ManifestConfigurationTest
-{
+class ManifestConfigurationTest {
 
     private ManifestConfiguration manifestConfiguration;
 
     @BeforeEach
-    public void before()
-    {
+    public void before() {
         this.manifestConfiguration = new ManifestConfiguration();
     }
 
     @Test
-    public void XXX()
-    {
-        assertThat( manifestConfiguration.getClasspathLayoutType() ).isEqualTo( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE );
+    public void XXX() {
+        assertThat(manifestConfiguration.getClasspathLayoutType())
+                .isEqualTo(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE);
     }
 
     @Test
-    public void getClasspathPrefixShouldReturnPrefixWithSlashesInsteadOfBackSlashes()
-    {
-        manifestConfiguration.setClasspathPrefix( "\\lib\\const\\" );
-        assertThat( manifestConfiguration.getClasspathPrefix() ).isEqualTo( "/lib/const/" );
+    public void getClasspathPrefixShouldReturnPrefixWithSlashesInsteadOfBackSlashes() {
+        manifestConfiguration.setClasspathPrefix("\\lib\\const\\");
+        assertThat(manifestConfiguration.getClasspathPrefix()).isEqualTo("/lib/const/");
     }
 
     @Test
-    public void getClasspathPrefixShouldReturnPrefixWithTraingSlash()
-    {
-        manifestConfiguration.setClasspathPrefix( "const" );
-        assertThat( manifestConfiguration.getClasspathPrefix() ).isEqualTo( "const/" );
+    public void getClasspathPrefixShouldReturnPrefixWithTraingSlash() {
+        manifestConfiguration.setClasspathPrefix("const");
+        assertThat(manifestConfiguration.getClasspathPrefix()).isEqualTo("const/");
     }
 
     @Test
-    public void getClasspathPrefixShouldReturnTheTrailingSlash()
-    {
-        manifestConfiguration.setClasspathPrefix( "const/" );
-        assertThat( manifestConfiguration.getClasspathPrefix() ).isEqualTo( "const/" );
+    public void getClasspathPrefixShouldReturnTheTrailingSlash() {
+        manifestConfiguration.setClasspathPrefix("const/");
+        assertThat(manifestConfiguration.getClasspathPrefix()).isEqualTo("const/");
     }
 }
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
index 3939bc2..b37b8ab 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,58 +16,54 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.entry;
+package org.apache.maven.archiver;
 
 import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
 /**
  * @author Karl Heinz Marbaise <a href="mailto:khmarbaise@apache.org">khmarbaise@apache.org</a>.
  */
-class MavenArchiveConfigurationTest
-{
+class MavenArchiveConfigurationTest {
 
     private MavenArchiveConfiguration archive;
 
     @BeforeEach
-    public void before()
-    {
+    public void before() {
         archive = new MavenArchiveConfiguration();
-        archive.setManifest( new ManifestConfiguration() );
-        archive.setForced( false );
-        archive.setCompress( false );
-        archive.setIndex( false );
+        archive.setManifest(new ManifestConfiguration());
+        archive.setForced(false);
+        archive.setCompress(false);
+        archive.setIndex(false);
     }
 
     @Test
-    void addingSingleEntryShouldBeReturned()
-    {
-        archive.addManifestEntry( "key1", "value1" );
+    void addingSingleEntryShouldBeReturned() {
+        archive.addManifestEntry("key1", "value1");
         Map<String, String> manifestEntries = archive.getManifestEntries();
-        assertThat( manifestEntries ).containsExactly( entry( "key1", "value1" ) );
+        assertThat(manifestEntries).containsExactly(entry("key1", "value1"));
     }
 
     @Test
-    void addingTwoEntriesShouldBeReturnedInInsertOrder()
-    {
-        archive.addManifestEntry( "key1", "value1" );
-        archive.addManifestEntry( "key2", "value2" );
+    void addingTwoEntriesShouldBeReturnedInInsertOrder() {
+        archive.addManifestEntry("key1", "value1");
+        archive.addManifestEntry("key2", "value2");
         Map<String, String> manifestEntries = archive.getManifestEntries();
-        assertThat( manifestEntries ).containsExactly( entry( "key1", "value1" ), entry( "key2", "value2" ) );
+        assertThat(manifestEntries).containsExactly(entry("key1", "value1"), entry("key2", "value2"));
     }
 
     @Test
-    void addingThreeEntriesShouldBeReturnedInInsertOrder()
-    {
-        archive.addManifestEntry( "key1", "value1" );
-        archive.addManifestEntry( "key2", "value2" );
-        archive.addManifestEntry( "key3", "value3" );
+    void addingThreeEntriesShouldBeReturnedInInsertOrder() {
+        archive.addManifestEntry("key1", "value1");
+        archive.addManifestEntry("key2", "value2");
+        archive.addManifestEntry("key3", "value3");
         Map<String, String> manifestEntries = archive.getManifestEntries();
-        assertThat( manifestEntries ).containsExactly( entry( "key1", "value1" ), entry( "key2", "value2" ),
-                                                       entry( "key3", "value3" ) );
+        assertThat(manifestEntries)
+                .containsExactly(entry("key1", "value1"), entry("key2", "value2"), entry("key3", "value3"));
     }
 }
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 728c8b7..5ac7a01 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.time.Instant;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
@@ -47,548 +68,493 @@
 import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.time.Instant;
-import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-class MavenArchiverTest
-{
-    static class ArtifactComparator
-        implements Comparator<Artifact>
-    {
-        public int compare( Artifact o1, Artifact o2 )
-        {
-            return o1.getArtifactId().compareTo( o2.getArtifactId() );
+class MavenArchiverTest {
+    static class ArtifactComparator implements Comparator<Artifact> {
+        public int compare(Artifact o1, Artifact o2) {
+            return o1.getArtifactId().compareTo(o2.getArtifactId());
         }
 
-        public boolean equals( Object o )
-        {
+        public boolean equals(Object o) {
             return false;
         }
     }
 
     @ParameterizedTest
     @EmptySource
-    @ValueSource( strings = { ".", "dash-is-invalid", "plus+is+invalid", "colon:is:invalid", "new.class",
-        "123.at.start.is.invalid", "digit.at.123start.is.invalid" } )
-    void testInvalidModuleNames( String value )
-    {
-        assertThat( MavenArchiver.isValidModuleName( value ) ).isFalse();
+    @ValueSource(
+            strings = {
+                ".",
+                "dash-is-invalid",
+                "plus+is+invalid",
+                "colon:is:invalid",
+                "new.class",
+                "123.at.start.is.invalid",
+                "digit.at.123start.is.invalid"
+            })
+    void testInvalidModuleNames(String value) {
+        assertThat(MavenArchiver.isValidModuleName(value)).isFalse();
     }
 
     @ParameterizedTest
-    @ValueSource( strings = { "a", "a.b", "a_b", "trailing0.digits123.are456.ok789", "UTF8.chars.are.okay.äëïöüẍ",
-        "ℤ€ℕ" } )
-    void testValidModuleNames( String value )
-    {
-        assertThat( MavenArchiver.isValidModuleName( value ) ).isTrue();
+    @ValueSource(strings = {"a", "a.b", "a_b", "trailing0.digits123.are456.ok789", "UTF8.chars.are.okay.äëïöüẍ", "ℤ€ℕ"})
+    void testValidModuleNames(String value) {
+        assertThat(MavenArchiver.isValidModuleName(value)).isTrue();
     }
 
     @Test
-    void testGetManifestExtensionList()
-        throws Exception
-    {
+    void testGetManifestExtensionList() throws Exception {
         MavenArchiver archiver = new MavenArchiver();
 
         MavenSession session = getDummySession();
 
         Model model = new Model();
-        model.setArtifactId( "dummy" );
+        model.setArtifactId("dummy");
 
-        MavenProject project = new MavenProject( model );
+        MavenProject project = new MavenProject(model);
         // we need to sort the artifacts for test purposes
-        Set<Artifact> artifacts = new TreeSet<>( new ArtifactComparator() );
-        project.setArtifacts( artifacts );
+        Set<Artifact> artifacts = new TreeSet<>(new ArtifactComparator());
+        project.setArtifacts(artifacts);
 
         // there should be a mock or a setter for this field.
-        ManifestConfiguration config = new ManifestConfiguration()
-        {
-            public boolean isAddExtensions()
-            {
+        ManifestConfiguration config = new ManifestConfiguration() {
+            public boolean isAddExtensions() {
                 return true;
             }
         };
 
-        Manifest manifest = archiver.getManifest( session, project, config );
+        Manifest manifest = archiver.getManifest(session, project, config);
 
-        assertThat( manifest.getMainAttributes() ).isNotNull();
+        assertThat(manifest.getMainAttributes()).isNotNull();
 
-        assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isNull();
+        assertThat(manifest.getMainAttributes().getValue("Extension-List")).isNull();
 
         MockArtifact artifact1 = new MockArtifact();
-        artifact1.setGroupId( "org.apache.dummy" );
-        artifact1.setArtifactId( "dummy1" );
-        artifact1.setVersion( "1.0" );
-        artifact1.setType( "dll" );
-        artifact1.setScope( "compile" );
+        artifact1.setGroupId("org.apache.dummy");
+        artifact1.setArtifactId("dummy1");
+        artifact1.setVersion("1.0");
+        artifact1.setType("dll");
+        artifact1.setScope("compile");
 
-        artifacts.add( artifact1 );
+        artifacts.add(artifact1);
 
-        manifest = archiver.getManifest( session, project, config );
+        manifest = archiver.getManifest(session, project, config);
 
-        assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isNull();
+        assertThat(manifest.getMainAttributes().getValue("Extension-List")).isNull();
 
         MockArtifact artifact2 = new MockArtifact();
-        artifact2.setGroupId( "org.apache.dummy" );
-        artifact2.setArtifactId( "dummy2" );
-        artifact2.setVersion( "1.0" );
-        artifact2.setType( "jar" );
-        artifact2.setScope( "compile" );
+        artifact2.setGroupId("org.apache.dummy");
+        artifact2.setArtifactId("dummy2");
+        artifact2.setVersion("1.0");
+        artifact2.setType("jar");
+        artifact2.setScope("compile");
 
-        artifacts.add( artifact2 );
+        artifacts.add(artifact2);
 
-        manifest = archiver.getManifest( session, project, config );
+        manifest = archiver.getManifest(session, project, config);
 
-        assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isEqualTo( "dummy2" );
+        assertThat(manifest.getMainAttributes().getValue("Extension-List")).isEqualTo("dummy2");
 
         MockArtifact artifact3 = new MockArtifact();
-        artifact3.setGroupId( "org.apache.dummy" );
-        artifact3.setArtifactId( "dummy3" );
-        artifact3.setVersion( "1.0" );
-        artifact3.setScope( "test" );
-        artifact3.setType( "jar" );
+        artifact3.setGroupId("org.apache.dummy");
+        artifact3.setArtifactId("dummy3");
+        artifact3.setVersion("1.0");
+        artifact3.setScope("test");
+        artifact3.setType("jar");
 
-        artifacts.add( artifact3 );
+        artifacts.add(artifact3);
 
-        manifest = archiver.getManifest( session, project, config );
+        manifest = archiver.getManifest(session, project, config);
 
-        assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isEqualTo( "dummy2" );
+        assertThat(manifest.getMainAttributes().getValue("Extension-List")).isEqualTo("dummy2");
 
         MockArtifact artifact4 = new MockArtifact();
-        artifact4.setGroupId( "org.apache.dummy" );
-        artifact4.setArtifactId( "dummy4" );
-        artifact4.setVersion( "1.0" );
-        artifact4.setType( "jar" );
-        artifact4.setScope( "compile" );
+        artifact4.setGroupId("org.apache.dummy");
+        artifact4.setArtifactId("dummy4");
+        artifact4.setVersion("1.0");
+        artifact4.setType("jar");
+        artifact4.setScope("compile");
 
-        artifacts.add( artifact4 );
+        artifacts.add(artifact4);
 
-        manifest = archiver.getManifest( session, project, config );
+        manifest = archiver.getManifest(session, project, config);
 
-        assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isEqualTo( "dummy2 dummy4" );
+        assertThat(manifest.getMainAttributes().getValue("Extension-List")).isEqualTo("dummy2 dummy4");
     }
 
     @Test
-    void testMultiClassPath()
-        throws Exception
-    {
-        final File tempFile = File.createTempFile( "maven-archiver-test-", ".jar" );
+    void testMultiClassPath() throws Exception {
+        final File tempFile = File.createTempFile("maven-archiver-test-", ".jar");
 
-        try
-        {
+        try {
             MavenArchiver archiver = new MavenArchiver();
 
             MavenSession session = getDummySession();
 
             Model model = new Model();
-            model.setArtifactId( "dummy" );
+            model.setArtifactId("dummy");
 
-            MavenProject project = new MavenProject( model )
-            {
-                public List<String> getRuntimeClasspathElements()
-                {
-                    return Collections.singletonList( tempFile.getAbsolutePath() );
+            MavenProject project = new MavenProject(model) {
+                public List<String> getRuntimeClasspathElements() {
+                    return Collections.singletonList(tempFile.getAbsolutePath());
                 }
             };
 
             // there should be a mock or a setter for this field.
-            ManifestConfiguration manifestConfig = new ManifestConfiguration()
-            {
-                public boolean isAddClasspath()
-                {
+            ManifestConfiguration manifestConfig = new ManifestConfiguration() {
+                public boolean isAddClasspath() {
                     return true;
                 }
             };
 
             MavenArchiveConfiguration archiveConfiguration = new MavenArchiveConfiguration();
-            archiveConfiguration.setManifest( manifestConfig );
-            archiveConfiguration.addManifestEntry( "Class-Path", "help/" );
-
-            Manifest manifest = archiver.getManifest( session, project, archiveConfiguration );
-            String classPath = manifest.getMainAttributes().getValue( "Class-Path" );
-            assertThat( classPath )
-                    .as( "User specified Class-Path entry was not prepended to manifest" )
-                    .startsWith( "help/" )
-                    .as( "Class-Path generated by addClasspath was not appended to manifest" )
-                    .endsWith( tempFile.getName() );
-        }
-        finally
-        {
+            archiveConfiguration.setManifest(manifestConfig);
+            archiveConfiguration.addManifestEntry("Class-Path", "help/");
+
+            Manifest manifest = archiver.getManifest(session, project, archiveConfiguration);
+            String classPath = manifest.getMainAttributes().getValue("Class-Path");
+            assertThat(classPath)
+                    .as("User specified Class-Path entry was not prepended to manifest")
+                    .startsWith("help/")
+                    .as("Class-Path generated by addClasspath was not appended to manifest")
+                    .endsWith(tempFile.getName());
+        } finally {
             // noinspection ResultOfMethodCallIgnored
             tempFile.delete();
         }
     }
 
     @Test
-    void testRecreation()
-        throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    void testRecreation() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( false );
+        config.setForced(false);
 
-        File directory = new File( "target/maven-archiver" );
-        org.apache.commons.io.FileUtils.deleteDirectory( directory );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
+        File directory = new File("target/maven-archiver");
+        org.apache.commons.io.FileUtils.deleteDirectory(directory);
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
 
         long history = System.currentTimeMillis() - 60000L;
-        jarFile.setLastModified( history );
+        jarFile.setLastModified(history);
         long time = jarFile.lastModified();
 
-        List<File> files = FileUtils.getFiles( directory, "**/**", null, true );
-        for ( File file : files )
-        {
-            assertThat( file.setLastModified( time ) ).isTrue();
+        List<File> files = FileUtils.getFiles(directory, "**/**", null, true);
+        for (File file : files) {
+            assertThat(file.setLastModified(time)).isTrue();
         }
 
-        archiver.createArchive( session, project, config );
+        archiver.createArchive(session, project, config);
 
-        config.setForced( true );
-        archiver.createArchive( session, project, config );
+        config.setForced(true);
+        archiver.createArchive(session, project, config);
         // I'm not sure if it could only be greater than time or if it is sufficient to be greater or equal..
-        assertThat( jarFile.lastModified() ).isGreaterThanOrEqualTo( time );
+        assertThat(jarFile.lastModified()).isGreaterThanOrEqualTo(time);
     }
 
     @Test
-    void testNotGenerateImplementationVersionForMANIFESTMF()
-        throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    void testNotGenerateImplementationVersionForMANIFESTMF() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( false );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-
-        try ( JarFile jar = new JarFile( jarFile ) )
-        {
-            assertThat( jar.getManifest().getMainAttributes() )
-                    .doesNotContainKey( Attributes.Name.IMPLEMENTATION_VERSION ); // "Implementation-Version"
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(false);
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+
+        try (JarFile jar = new JarFile(jarFile)) {
+            assertThat(jar.getManifest().getMainAttributes())
+                    .doesNotContainKey(Attributes.Name.IMPLEMENTATION_VERSION); // "Implementation-Version"
         }
     }
 
     @Test
-    void testGenerateImplementationVersionForMANIFESTMF()
-        throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    void testGenerateImplementationVersionForMANIFESTMF() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
 
-        String ls = System.getProperty( "line.separator" );
-        project.setDescription( "foo " + ls + " bar " );
+        String ls = System.getProperty("line.separator");
+        project.setDescription("foo " + ls + " bar ");
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.addManifestEntry( "Description", project.getDescription() );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-
-        try ( JarFile jar = new JarFile( jarFile ) )
-        {
-            assertThat( jar.getManifest().getMainAttributes() )
-                    .containsKey( Attributes.Name.IMPLEMENTATION_VERSION )
-                    .containsEntry( Attributes.Name.IMPLEMENTATION_VERSION, "0.1.1" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.addManifestEntry("Description", project.getDescription());
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+
+        try (JarFile jar = new JarFile(jarFile)) {
+            assertThat(jar.getManifest().getMainAttributes())
+                    .containsKey(Attributes.Name.IMPLEMENTATION_VERSION)
+                    .containsEntry(Attributes.Name.IMPLEMENTATION_VERSION, "0.1.1");
         }
     }
 
-    private MavenArchiver getMavenArchiver( JarArchiver jarArchiver )
-    {
+    private MavenArchiver getMavenArchiver(JarArchiver jarArchiver) {
         MavenArchiver archiver = new MavenArchiver();
-        archiver.setArchiver( jarArchiver );
-        archiver.setOutputFile( jarArchiver.getDestFile() );
+        archiver.setArchiver(jarArchiver);
+        archiver.setOutputFile(jarArchiver.getDestFile());
         return archiver;
     }
 
     @Test
     public void testDashesInClassPath_MSHARED_134()
-        throws IOException, ManifestException, DependencyResolutionRequiredException
-    {
-        File jarFile = new File( "target/test/dummyWithDashes.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+            throws IOException, ManifestException, DependencyResolutionRequiredException {
+        File jarFile = new File("target/test/dummyWithDashes.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
 
         Set<Artifact> artifacts =
-            getArtifacts( getMockArtifact1(), getArtifactWithDot(), getMockArtifact2(), getMockArtifact3() );
+                getArtifacts(getMockArtifact1(), getArtifactWithDot(), getMockArtifact2(), getMockArtifact3());
 
-        project.setArtifacts( artifacts );
+        project.setArtifacts(artifacts);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( false );
+        config.setForced(false);
 
         final ManifestConfiguration mftConfig = config.getManifest();
-        mftConfig.setMainClass( "org.apache.maven.Foo" );
-        mftConfig.setAddClasspath( true );
-        mftConfig.setAddExtensions( true );
-        mftConfig.setClasspathPrefix( "./lib/" );
+        mftConfig.setMainClass("org.apache.maven.Foo");
+        mftConfig.setAddClasspath(true);
+        mftConfig.setAddExtensions(true);
+        mftConfig.setClasspathPrefix("./lib/");
 
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
     }
 
     @Test
     public void testDashesInClassPath_MSHARED_182()
-        throws IOException, ManifestException, DependencyResolutionRequiredException
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+            throws IOException, ManifestException, DependencyResolutionRequiredException {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
 
         Set<Artifact> artifacts =
-            getArtifacts( getMockArtifact1(), getArtifactWithDot(), getMockArtifact2(), getMockArtifact3() );
+                getArtifacts(getMockArtifact1(), getArtifactWithDot(), getMockArtifact2(), getMockArtifact3());
 
-        project.setArtifacts( artifacts );
+        project.setArtifacts(artifacts);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( false );
+        config.setForced(false);
 
         final ManifestConfiguration mftConfig = config.getManifest();
-        mftConfig.setMainClass( "org.apache.maven.Foo" );
-        mftConfig.setAddClasspath( true );
-        mftConfig.setAddExtensions( true );
-        mftConfig.setClasspathPrefix( "./lib/" );
-        config.addManifestEntry( "Key1", "value1" );
-        config.addManifestEntry( "key2", "value2" );
-
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        final Attributes mainAttributes = getJarFileManifest( jarFile ).getMainAttributes();
-        assertThat( mainAttributes.getValue( "Key1" ) ).isEqualTo( "value1" );
-        assertThat( mainAttributes.getValue( "Key2" ) ).isEqualTo( "value2" );
+        mftConfig.setMainClass("org.apache.maven.Foo");
+        mftConfig.setAddClasspath(true);
+        mftConfig.setAddExtensions(true);
+        mftConfig.setClasspathPrefix("./lib/");
+        config.addManifestEntry("Key1", "value1");
+        config.addManifestEntry("key2", "value2");
+
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        final Attributes mainAttributes = getJarFileManifest(jarFile).getMainAttributes();
+        assertThat(mainAttributes.getValue("Key1")).isEqualTo("value1");
+        assertThat(mainAttributes.getValue("Key2")).isEqualTo("value2");
     }
 
     @Test
-    public void testCarriageReturnInManifestEntry()
-        throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    public void testCarriageReturnInManifestEntry() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
 
-        String ls = System.getProperty( "line.separator" );
-        project.setDescription( "foo " + ls + " bar " );
+        String ls = System.getProperty("line.separator");
+        project.setDescription("foo " + ls + " bar ");
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.addManifestEntry( "Description", project.getDescription() );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.addManifestEntry("Description", project.getDescription());
         // config.addManifestEntry( "EntryWithTab", " foo tab " + ( '\u0009' ) + ( '\u0009' ) // + " bar tab" + ( //
         // '\u0009' // ) );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
 
-        final Manifest manifest = getJarFileManifest( jarFile );
+        final Manifest manifest = getJarFileManifest(jarFile);
         Attributes attributes = manifest.getMainAttributes();
-        assertThat( project.getDescription().indexOf( ls ) ).isGreaterThan( 0 );
-        Attributes.Name description = new Attributes.Name( "Description" );
-        String value = attributes.getValue( description );
-        assertThat( value ).isNotNull();
-        assertThat( value.indexOf( ls ) ).isLessThanOrEqualTo( 0 );
+        assertThat(project.getDescription().indexOf(ls)).isGreaterThan(0);
+        Attributes.Name description = new Attributes.Name("Description");
+        String value = attributes.getValue(description);
+        assertThat(value).isNotNull();
+        assertThat(value.indexOf(ls)).isLessThanOrEqualTo(0);
     }
 
     @Test
-    public void testDeprecatedCreateArchiveAPI()
-        throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    public void testDeprecatedCreateArchiveAPI() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenProject project = getDummyProject();
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
 
         MavenSession session = getDummySessionWithoutMavenVersion();
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Attributes manifest = getJarFileManifest( jarFile ).getMainAttributes();
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Attributes manifest = getJarFileManifest(jarFile).getMainAttributes();
 
         // no version number
-        assertThat( manifest )
-                .containsEntry( new Attributes.Name( "Created-By" ), "Maven Archiver" )
-                .containsEntry( Attributes.Name.SPECIFICATION_TITLE, "archiver test" )
-                .containsEntry( Attributes.Name.SPECIFICATION_VERSION, "0.1" )
-                .containsEntry( Attributes.Name.SPECIFICATION_VENDOR, "Apache" )
-                .containsEntry( Attributes.Name.IMPLEMENTATION_TITLE, "archiver test" )
-                .containsEntry( Attributes.Name.IMPLEMENTATION_VERSION, "0.1.1" )
-                .containsEntry( Attributes.Name.IMPLEMENTATION_VENDOR, "Apache" )
-                .containsEntry( new Attributes.Name( "Build-Jdk-Spec" ),
-                        System.getProperty( "java.specification.version" ) );
+        assertThat(manifest)
+                .containsEntry(new Attributes.Name("Created-By"), "Maven Archiver")
+                .containsEntry(Attributes.Name.SPECIFICATION_TITLE, "archiver test")
+                .containsEntry(Attributes.Name.SPECIFICATION_VERSION, "0.1")
+                .containsEntry(Attributes.Name.SPECIFICATION_VENDOR, "Apache")
+                .containsEntry(Attributes.Name.IMPLEMENTATION_TITLE, "archiver test")
+                .containsEntry(Attributes.Name.IMPLEMENTATION_VERSION, "0.1.1")
+                .containsEntry(Attributes.Name.IMPLEMENTATION_VENDOR, "Apache")
+                .containsEntry(new Attributes.Name("Build-Jdk-Spec"), System.getProperty("java.specification.version"));
     }
 
     @Test
-    public void testMinimalManifestEntries()
-        throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    public void testMinimalManifestEntries() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultEntries( false );
+        config.setForced(true);
+        config.getManifest().setAddDefaultEntries(false);
 
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
 
-        final Manifest jarFileManifest = getJarFileManifest( jarFile );
+        final Manifest jarFileManifest = getJarFileManifest(jarFile);
         Attributes manifest = jarFileManifest.getMainAttributes();
 
-        assertThat( manifest ).hasSize( 1 ).containsOnlyKeys( new Attributes.Name( "Manifest-Version" ) );
-        assertThat( manifest.getValue( "Manifest-Version" ) ).isEqualTo( "1.0" );
+        assertThat(manifest).hasSize(1).containsOnlyKeys(new Attributes.Name("Manifest-Version"));
+        assertThat(manifest.getValue("Manifest-Version")).isEqualTo("1.0");
     }
 
-
     @Test
-    public void testManifestEntries()
-        throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    public void testManifestEntries() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setAddBuildEnvironmentEntries( true );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setAddBuildEnvironmentEntries(true);
 
         Map<String, String> manifestEntries = new HashMap<>();
-        manifestEntries.put( "foo", "bar" );
-        manifestEntries.put( "first-name", "olivier" );
-        manifestEntries.put( "Automatic-Module-Name", "org.apache.maven.archiver" );
-        manifestEntries.put( "keyWithEmptyValue", null );
-        config.setManifestEntries( manifestEntries );
+        manifestEntries.put("foo", "bar");
+        manifestEntries.put("first-name", "olivier");
+        manifestEntries.put("Automatic-Module-Name", "org.apache.maven.archiver");
+        manifestEntries.put("keyWithEmptyValue", null);
+        config.setManifestEntries(manifestEntries);
 
         ManifestSection manifestSection = new ManifestSection();
-        manifestSection.setName( "UserSection" );
-        manifestSection.addManifestEntry( "key", "value" );
+        manifestSection.setName("UserSection");
+        manifestSection.addManifestEntry("key", "value");
         List<ManifestSection> manifestSections = new ArrayList<>();
-        manifestSections.add( manifestSection );
-        config.setManifestSections( manifestSections );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
+        manifestSections.add(manifestSection);
+        config.setManifestSections(manifestSections);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
 
-        final Manifest jarFileManifest = getJarFileManifest( jarFile );
+        final Manifest jarFileManifest = getJarFileManifest(jarFile);
         Attributes manifest = jarFileManifest.getMainAttributes();
 
         // no version number
-        assertThat( manifest )
-                .containsEntry( new Attributes.Name( "Created-By" ), "Maven Archiver" )
-                .containsEntry( new Attributes.Name( "Build-Tool" ),
-                        session.getSystemProperties().get( "maven.build.version" ) )
-                .containsEntry( new Attributes.Name( "Build-Jdk" ), String.format( "%s (%s)",
-                        System.getProperty( "java.version" ), System.getProperty( "java.vendor" ) ) )
-                .containsEntry( new Attributes.Name( "Build-Os" ), String.format( "%s (%s; %s)",
-                        System.getProperty( "os.name" ), System.getProperty( "os.version" ),
-                        System.getProperty( "os.arch" ) ) )
-                .containsEntry( Attributes.Name.SPECIFICATION_TITLE, "archiver test" )
-                .containsEntry( Attributes.Name.SPECIFICATION_VERSION, "0.1" )
-                .containsEntry( Attributes.Name.SPECIFICATION_VENDOR, "Apache" )
-                .containsEntry( Attributes.Name.IMPLEMENTATION_TITLE, "archiver test" )
-                .containsEntry( Attributes.Name.IMPLEMENTATION_VERSION, "0.1.1" )
-                .containsEntry( Attributes.Name.IMPLEMENTATION_VENDOR, "Apache" )
-                .containsEntry( Attributes.Name.MAIN_CLASS, "org.apache.maven.Foo" )
-                .containsEntry( new Attributes.Name( "foo" ), "bar" )
-                .containsEntry( new Attributes.Name( "first-name" ), "olivier" );
-
-        assertThat( manifest.getValue( "Automatic-Module-Name" ) ).isEqualTo( "org.apache.maven.archiver" );
-
-        assertThat( manifest ).containsEntry( new Attributes.Name( "Build-Jdk-Spec" ),
-                System.getProperty( "java.specification.version" ) );
-
-        assertThat( StringUtils.isEmpty( manifest.getValue( new Attributes.Name( "keyWithEmptyValue" ) ) ) ).isTrue();
-        assertThat( manifest ).containsKey( new Attributes.Name( "keyWithEmptyValue" ) );
-
-        manifest = jarFileManifest.getAttributes( "UserSection" );
-
-        assertThat( manifest ).containsEntry( new Attributes.Name( "key" ), "value" );
+        assertThat(manifest)
+                .containsEntry(new Attributes.Name("Created-By"), "Maven Archiver")
+                .containsEntry(
+                        new Attributes.Name("Build-Tool"),
+                        session.getSystemProperties().get("maven.build.version"))
+                .containsEntry(
+                        new Attributes.Name("Build-Jdk"),
+                        String.format("%s (%s)", System.getProperty("java.version"), System.getProperty("java.vendor")))
+                .containsEntry(
+                        new Attributes.Name("Build-Os"),
+                        String.format(
+                                "%s (%s; %s)",
+                                System.getProperty("os.name"),
+                                System.getProperty("os.version"),
+                                System.getProperty("os.arch")))
+                .containsEntry(Attributes.Name.SPECIFICATION_TITLE, "archiver test")
+                .containsEntry(Attributes.Name.SPECIFICATION_VERSION, "0.1")
+                .containsEntry(Attributes.Name.SPECIFICATION_VENDOR, "Apache")
+                .containsEntry(Attributes.Name.IMPLEMENTATION_TITLE, "archiver test")
+                .containsEntry(Attributes.Name.IMPLEMENTATION_VERSION, "0.1.1")
+                .containsEntry(Attributes.Name.IMPLEMENTATION_VENDOR, "Apache")
+                .containsEntry(Attributes.Name.MAIN_CLASS, "org.apache.maven.Foo")
+                .containsEntry(new Attributes.Name("foo"), "bar")
+                .containsEntry(new Attributes.Name("first-name"), "olivier");
+
+        assertThat(manifest.getValue("Automatic-Module-Name")).isEqualTo("org.apache.maven.archiver");
+
+        assertThat(manifest)
+                .containsEntry(new Attributes.Name("Build-Jdk-Spec"), System.getProperty("java.specification.version"));
+
+        assertThat(StringUtils.isEmpty(manifest.getValue(new Attributes.Name("keyWithEmptyValue"))))
+                .isTrue();
+        assertThat(manifest).containsKey(new Attributes.Name("keyWithEmptyValue"));
+
+        manifest = jarFileManifest.getAttributes("UserSection");
+
+        assertThat(manifest).containsEntry(new Attributes.Name("key"), "value");
     }
 
     @Test
-    public void testManifestWithInvalidAutomaticModuleNameThrowsOnCreateArchive()
-            throws Exception
-    {
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+    public void testManifestWithInvalidAutomaticModuleNameThrowsOnCreateArchive() throws Exception {
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
 
         Map<String, String> manifestEntries = new HashMap<>();
-        manifestEntries.put( "Automatic-Module-Name", "123.in-valid.new.name" );
-        config.setManifestEntries( manifestEntries );
+        manifestEntries.put("Automatic-Module-Name", "123.in-valid.new.name");
+        config.setManifestEntries(manifestEntries);
 
-        try
-        {
-            archiver.createArchive( session, project, config );
-        }
-        catch ( ManifestException e )
-        {
-            assertThat( e.getMessage() ).isEqualTo( "Invalid automatic module name: '123.in-valid.new.name'" );
+        try {
+            archiver.createArchive(session, project, config);
+        } catch (ManifestException e) {
+            assertThat(e.getMessage()).isEqualTo("Invalid automatic module name: '123.in-valid.new.name'");
         }
     }
 
@@ -596,9 +562,7 @@ public void testManifestWithInvalidAutomaticModuleNameThrowsOnCreateArchive()
      * Test to make sure that manifest sections are present in the manifest prior to the archive has been created.
      */
     @Test
-    public void testManifestSections()
-        throws Exception
-    {
+    public void testManifestSections() throws Exception {
         MavenArchiver archiver = new MavenArchiver();
 
         MavenSession session = getDummySession();
@@ -607,576 +571,564 @@ public void testManifestSections()
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
 
         ManifestSection manifestSection = new ManifestSection();
-        manifestSection.setName( "SectionOne" );
-        manifestSection.addManifestEntry( "key", "value" );
+        manifestSection.setName("SectionOne");
+        manifestSection.addManifestEntry("key", "value");
         List<ManifestSection> manifestSections = new ArrayList<>();
-        manifestSections.add( manifestSection );
-        config.setManifestSections( manifestSections );
-
-        Manifest manifest = archiver.getManifest( session, project, config );
-
-        Attributes section = manifest.getAttributes( "SectionOne" );
-        assertThat( section ).as( "The section is not present in the manifest as it should be." ).isNotNull();
-
-        String attribute = section.getValue( "key" );
-        assertThat( attribute )
-                .as( "The attribute we are looking for is not present in the section." ).isNotNull()
-                .as( "The value of the attribute is wrong." ).isEqualTo( "value" );
+        manifestSections.add(manifestSection);
+        config.setManifestSections(manifestSections);
+
+        Manifest manifest = archiver.getManifest(session, project, config);
+
+        Attributes section = manifest.getAttributes("SectionOne");
+        assertThat(section)
+                .as("The section is not present in the manifest as it should be.")
+                .isNotNull();
+
+        String attribute = section.getValue("key");
+        assertThat(attribute)
+                .as("The attribute we are looking for is not present in the section.")
+                .isNotNull()
+                .as("The value of the attribute is wrong.")
+                .isEqualTo("value");
     }
 
     @Test
-    public void testDefaultClassPathValue()
-        throws Exception
-    {
+    public void testDefaultClassPathValue() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}" );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        final Manifest manifest = getJarFileManifest( jarFile );
-        String classPath = manifest.getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) )
-                .containsExactly( "dummy1-1.0.jar", "dummy2-1.5.jar", "dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest()
+                .setCustomClasspathLayout(
+                        "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}");
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        final Manifest manifest = getJarFileManifest(jarFile);
+        String classPath = manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly("dummy1-1.0.jar", "dummy2-1.5.jar", "dummy3-2.0.jar");
     }
 
-    private void deleteAndAssertNotPresent( File jarFile )
-    {
+    private void deleteAndAssertNotPresent(File jarFile) {
         jarFile.delete();
-        assertThat( jarFile ).doesNotExist();
+        assertThat(jarFile).doesNotExist();
     }
 
     @Test
-    public void testDefaultClassPathValue_WithSnapshot()
-        throws Exception
-    {
+    public void testDefaultClassPathValue_WithSnapshot() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}" );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-
-        final Manifest manifest = getJarFileManifest( jarFile );
-        String classPath = manifest.getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) )
-                .containsExactly( "dummy1-1.1-20081022.112233-1.jar", "dummy2-1.5.jar", "dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest()
+                .setCustomClasspathLayout(
+                        "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}");
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+
+        final Manifest manifest = getJarFileManifest(jarFile);
+        String classPath = manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly("dummy1-1.1-20081022.112233-1.jar", "dummy2-1.5.jar", "dummy3-2.0.jar");
     }
 
     @Test
-    public void testMavenRepoClassPathValue()
-        throws Exception
-    {
+    public void testMavenRepoClassPathValue() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setUseUniqueVersions( true );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries ).containsExactly(
-                "org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
-                "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) ).containsExactly(
-                "org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
-                "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setUseUniqueVersions(true);
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY);
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries)
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
     }
 
     @Test
-    public void shouldCreateArchiveWithSimpleClassPathLayoutWhileSettingSimpleLayoutExplicit()
-        throws Exception
-    {
+    public void shouldCreateArchiveWithSimpleClassPathLayoutWhileSettingSimpleLayoutExplicit() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy-explicit-simple.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy-explicit-simple.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathPrefix( "lib" );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE );
-
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries )
-                .containsExactly( "lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) )
-                .containsExactly( "lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathPrefix("lib");
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE);
+
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries).containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
     }
 
     @Test
-    public void shouldCreateArchiveCustomerLayoutSimple()
-        throws Exception
-    {
+    public void shouldCreateArchiveCustomerLayoutSimple() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy-custom-layout-simple.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy-custom-layout-simple.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathPrefix( "lib" );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( MavenArchiver.SIMPLE_LAYOUT );
-
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries )
-                .containsExactly( "lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) )
-                .containsExactly( "lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathPrefix("lib");
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest().setCustomClasspathLayout(MavenArchiver.SIMPLE_LAYOUT);
+
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries).containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
     }
 
     @Test
-    public void shouldCreateArchiveCustomLayoutSimpleNonUnique()
-        throws Exception
-    {
+    public void shouldCreateArchiveCustomLayoutSimpleNonUnique() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy-custom-layout-simple-non-unique.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy-custom-layout-simple-non-unique.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathPrefix( "lib" );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( MavenArchiver.SIMPLE_LAYOUT_NONUNIQUE );
-
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries )
-                .containsExactly( "lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) )
-                .containsExactly( "lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathPrefix("lib");
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest().setCustomClasspathLayout(MavenArchiver.SIMPLE_LAYOUT_NONUNIQUE);
+
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries)
+                .containsExactly("lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly("lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
     }
 
     @Test
-    public void shouldCreateArchiveCustomLayoutRepository()
-        throws Exception
-    {
+    public void shouldCreateArchiveCustomLayoutRepository() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy-custom-layout-repo.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy-custom-layout-repo.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathPrefix( "lib" );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( MavenArchiver.REPOSITORY_LAYOUT );
-
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries ).containsExactly(
-                "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
-                "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) ).containsExactly(
-                "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
-                "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathPrefix("lib");
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest().setCustomClasspathLayout(MavenArchiver.REPOSITORY_LAYOUT);
+
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries)
+                .containsExactly(
+                        "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
+                        "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly(
+                        "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
+                        "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
     }
 
     @Test
-    public void shouldCreateArchiveCustomLayoutRepositoryNonUnique()
-        throws Exception
-    {
+    public void shouldCreateArchiveCustomLayoutRepositoryNonUnique() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy-custom-layout-repo-non-unique.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy-custom-layout-repo-non-unique.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathPrefix( "lib" );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( MavenArchiver.REPOSITORY_LAYOUT_NONUNIQUE );
-
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries ).containsExactly(
-                "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.1.jar",
-                "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) ).containsExactly(
-                "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.1.jar",
-                "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathPrefix("lib");
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest().setCustomClasspathLayout(MavenArchiver.REPOSITORY_LAYOUT_NONUNIQUE);
+
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries)
+                .containsExactly(
+                        "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.1.jar",
+                        "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly(
+                        "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.1.jar",
+                        "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
     }
 
     @Test
-    public void shouldCreateArchiveWithSimpleClassPathLayoutUsingDefaults()
-        throws Exception
-    {
+    public void shouldCreateArchiveWithSimpleClassPathLayoutUsingDefaults() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy-defaults.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy-defaults.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathPrefix( "lib" );
-
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries )
-                .containsExactly( "lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) )
-                .containsExactly( "lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathPrefix("lib");
+
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries).containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
     }
 
     @Test
-    public void testMavenRepoClassPathValue_WithSnapshot()
-        throws Exception
-    {
+    public void testMavenRepoClassPathValue_WithSnapshot() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries ).containsExactly(
-                "org/apache/dummy/dummy1/1.1-SNAPSHOT/dummy1-1.1-20081022.112233-1.jar",
-                "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) ).containsExactly(
-                "org/apache/dummy/dummy1/1.1-SNAPSHOT/dummy1-1.1-20081022.112233-1.jar",
-                "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY);
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries)
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.1-SNAPSHOT/dummy1-1.1-20081022.112233-1.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.1-SNAPSHOT/dummy1-1.1-20081022.112233-1.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
     }
 
     @Test
-    public void testCustomClassPathValue()
-        throws Exception
-    {
+    public void testCustomClassPathValue() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( "${artifact.groupIdPath}/${artifact.artifactId}/${artifact.version}/TEST-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}" );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries ).containsExactly(
-                "org/apache/dummy/dummy1/1.0/TEST-dummy1-1.0.jar",
-                "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar" );
-
-        final Manifest manifest1 = getJarFileManifest( jarFile );
-        String classPath = manifest1.getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) ).containsExactly(
-                "org/apache/dummy/dummy1/1.0/TEST-dummy1-1.0.jar",
-                "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest()
+                .setCustomClasspathLayout(
+                        "${artifact.groupIdPath}/${artifact.artifactId}/${artifact.version}/TEST-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}");
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries)
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.0/TEST-dummy1-1.0.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+
+        final Manifest manifest1 = getJarFileManifest(jarFile);
+        String classPath = manifest1.getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.0/TEST-dummy1-1.0.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
     }
 
     @Test
-    public void testCustomClassPathValue_WithSnapshotResolvedVersion()
-        throws Exception
-    {
+    public void testCustomClassPathValue_WithSnapshotResolvedVersion() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( "${artifact.groupIdPath}/${artifact.artifactId}/${artifact.baseVersion}/TEST-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}" );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries ).containsExactly(
-                "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-20081022.112233-1.jar",
-                "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) ).containsExactly(
-                "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-20081022.112233-1.jar",
-                "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest()
+                .setCustomClasspathLayout(
+                        "${artifact.groupIdPath}/${artifact.artifactId}/${artifact.baseVersion}/TEST-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}");
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries)
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-20081022.112233-1.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-20081022.112233-1.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
     }
 
     @Test
-    public void testCustomClassPathValue_WithSnapshotForcingBaseVersion()
-        throws Exception
-    {
+    public void testCustomClassPathValue_WithSnapshotForcingBaseVersion() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.getManifest().setAddDefaultImplementationEntries( true );
-        config.getManifest().setAddDefaultSpecificationEntries( true );
-        config.getManifest().setMainClass( "org.apache.maven.Foo" );
-        config.getManifest().setAddClasspath( true );
-        config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
-        config.getManifest().setCustomClasspathLayout( "${artifact.groupIdPath}/${artifact.artifactId}/${artifact.baseVersion}/TEST-${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}" );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
-        Manifest manifest = archiver.getManifest( session, project, config );
-        String[] classPathEntries =
-            StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ), " " );
-        assertThat( classPathEntries[0] ).isEqualTo(
-                "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-SNAPSHOT.jar" );
-        assertThat( classPathEntries[1] ).isEqualTo( "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar" );
-        assertThat( classPathEntries[2] ).isEqualTo( "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar" );
-
-        String classPath = getJarFileManifest( jarFile ).getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-        assertThat( classPath ).isNotNull();
-        assertThat( StringUtils.split( classPath, " " ) ).containsExactly(
-                "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-SNAPSHOT.jar",
-                "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar" );
+        config.setForced(true);
+        config.getManifest().setAddDefaultImplementationEntries(true);
+        config.getManifest().setAddDefaultSpecificationEntries(true);
+        config.getManifest().setMainClass("org.apache.maven.Foo");
+        config.getManifest().setAddClasspath(true);
+        config.getManifest().setClasspathLayoutType(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM);
+        config.getManifest()
+                .setCustomClasspathLayout(
+                        "${artifact.groupIdPath}/${artifact.artifactId}/${artifact.baseVersion}/TEST-${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}");
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
+        Manifest manifest = archiver.getManifest(session, project, config);
+        String[] classPathEntries = StringUtils.split(
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        assertThat(classPathEntries[0]).isEqualTo("org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-SNAPSHOT.jar");
+        assertThat(classPathEntries[1]).isEqualTo("org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar");
+        assertThat(classPathEntries[2]).isEqualTo("org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+
+        String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
+        assertThat(classPath).isNotNull();
+        assertThat(StringUtils.split(classPath, " "))
+                .containsExactly(
+                        "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-SNAPSHOT.jar",
+                        "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
     }
 
     @Test
-    public void testDefaultPomProperties()
-        throws Exception
-    {
+    public void testDefaultPomProperties() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
+        config.setForced(true);
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
 
         final String groupId = project.getGroupId();
         final String artifactId = project.getArtifactId();
         final String version = project.getVersion();
 
-        JarFile virtJarFile = new JarFile( jarFile );
+        JarFile virtJarFile = new JarFile(jarFile);
         ZipEntry pomPropertiesEntry =
-            virtJarFile.getEntry( "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" );
-        assertThat( pomPropertiesEntry ).isNotNull();
+                virtJarFile.getEntry("META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties");
+        assertThat(pomPropertiesEntry).isNotNull();
 
-        try ( InputStream is = virtJarFile.getInputStream( pomPropertiesEntry ) )
-        {
+        try (InputStream is = virtJarFile.getInputStream(pomPropertiesEntry)) {
             Properties p = new Properties();
-            p.load( is );
+            p.load(is);
 
-            assertThat( p.getProperty( "groupId" ) ).isEqualTo( groupId );
-            assertThat( p.getProperty( "artifactId" ) ).isEqualTo( artifactId );
-            assertThat( p.getProperty( "version" ) ).isEqualTo( version );
+            assertThat(p.getProperty("groupId")).isEqualTo(groupId);
+            assertThat(p.getProperty("artifactId")).isEqualTo(artifactId);
+            assertThat(p.getProperty("version")).isEqualTo(version);
         }
         virtJarFile.close();
     }
 
     @Test
-    public void testCustomPomProperties()
-        throws Exception
-    {
+    public void testCustomPomProperties() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
-        File jarFile = new File( "target/test/dummy.jar" );
-        JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
+        File jarFile = new File("target/test/dummy.jar");
+        JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
-        MavenArchiver archiver = getMavenArchiver( jarArchiver );
+        MavenArchiver archiver = getMavenArchiver(jarArchiver);
 
-        File customPomPropertiesFile = new File( "src/test/resources/custom-pom.properties" );
+        File customPomPropertiesFile = new File("src/test/resources/custom-pom.properties");
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
-        config.setForced( true );
-        config.setPomPropertiesFile( customPomPropertiesFile );
-        archiver.createArchive( session, project, config );
-        assertThat( jarFile ).exists();
+        config.setForced(true);
+        config.setPomPropertiesFile(customPomPropertiesFile);
+        archiver.createArchive(session, project, config);
+        assertThat(jarFile).exists();
 
         final String groupId = project.getGroupId();
         final String artifactId = project.getArtifactId();
         final String version = project.getVersion();
 
-        try ( JarFile virtJarFile = new JarFile( jarFile ) )
-        {
-            ZipEntry pomPropertiesEntry = virtJarFile
-                    .getEntry( "META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties" );
-            assertThat( pomPropertiesEntry ).isNotNull();
+        try (JarFile virtJarFile = new JarFile(jarFile)) {
+            ZipEntry pomPropertiesEntry =
+                    virtJarFile.getEntry("META-INF/maven/" + groupId + "/" + artifactId + "/pom.properties");
+            assertThat(pomPropertiesEntry).isNotNull();
 
-            try ( InputStream is = virtJarFile.getInputStream( pomPropertiesEntry ) )
-            {
+            try (InputStream is = virtJarFile.getInputStream(pomPropertiesEntry)) {
                 Properties p = new Properties();
-                p.load( is );
+                p.load(is);
 
-                assertThat( p.getProperty( "groupId" ) ).isEqualTo( groupId );
-                assertThat( p.getProperty( "artifactId" ) ).isEqualTo( artifactId );
-                assertThat( p.getProperty( "version" ) ).isEqualTo( version );
-                assertThat( p.getProperty( "build.revision" ) ).isEqualTo( "1337" );
-                assertThat( p.getProperty( "build.branch" ) ).isEqualTo( "tags/0.1.1" );
+                assertThat(p.getProperty("groupId")).isEqualTo(groupId);
+                assertThat(p.getProperty("artifactId")).isEqualTo(artifactId);
+                assertThat(p.getProperty("version")).isEqualTo(version);
+                assertThat(p.getProperty("build.revision")).isEqualTo("1337");
+                assertThat(p.getProperty("build.branch")).isEqualTo("tags/0.1.1");
             }
         }
     }
 
-    private JarArchiver getCleanJarArchiver( File jarFile )
-    {
-        deleteAndAssertNotPresent( jarFile );
+    private JarArchiver getCleanJarArchiver(File jarFile) {
+        deleteAndAssertNotPresent(jarFile);
         JarArchiver jarArchiver = new JarArchiver();
-        jarArchiver.setDestFile( jarFile );
+        jarArchiver.setDestFile(jarFile);
         return jarArchiver;
     }
 
@@ -1184,338 +1136,331 @@ private JarArchiver getCleanJarArchiver( File jarFile )
     // common methods for testing
     // ----------------------------------------
 
-    private MavenProject getDummyProject()
-    {
+    private MavenProject getDummyProject() {
         MavenProject project = getMavenProject();
-        File pomFile = new File( "src/test/resources/pom.xml" );
-        pomFile.setLastModified( System.currentTimeMillis() - 60000L );
-        project.setFile( pomFile );
+        File pomFile = new File("src/test/resources/pom.xml");
+        pomFile.setLastModified(System.currentTimeMillis() - 60000L);
+        project.setFile(pomFile);
         Build build = new Build();
-        build.setDirectory( "target" );
-        build.setOutputDirectory( "target" );
-        project.setBuild( build );
-        project.setName( "archiver test" );
-        project.setUrl( "https://maven.apache.org" );
+        build.setDirectory("target");
+        build.setOutputDirectory("target");
+        project.setBuild(build);
+        project.setName("archiver test");
+        project.setUrl("https://maven.apache.org");
         Organization organization = new Organization();
-        organization.setName( "Apache" );
-        project.setOrganization( organization );
+        organization.setName("Apache");
+        project.setOrganization(organization);
         MockArtifact artifact = new MockArtifact();
-        artifact.setGroupId( "org.apache.dummy" );
-        artifact.setArtifactId( "dummy" );
-        artifact.setVersion( "0.1.1" );
-        artifact.setBaseVersion( "0.1.2" );
-        artifact.setType( "jar" );
-        artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
-        project.setArtifact( artifact );
+        artifact.setGroupId("org.apache.dummy");
+        artifact.setArtifactId("dummy");
+        artifact.setVersion("0.1.1");
+        artifact.setBaseVersion("0.1.2");
+        artifact.setType("jar");
+        artifact.setArtifactHandler(new DefaultArtifactHandler("jar"));
+        project.setArtifact(artifact);
 
-        Set<Artifact> artifacts = getArtifacts( getMockArtifact1Release(), getMockArtifact2(), getMockArtifact3() );
-        project.setArtifacts( artifacts );
+        Set<Artifact> artifacts = getArtifacts(getMockArtifact1Release(), getMockArtifact2(), getMockArtifact3());
+        project.setArtifacts(artifacts);
 
         return project;
     }
 
-    private MavenProject getMavenProject()
-    {
+    private MavenProject getMavenProject() {
         Model model = new Model();
-        model.setGroupId( "org.apache.dummy" );
-        model.setArtifactId( "dummy" );
-        model.setVersion( "0.1.1" );
-
-        final MavenProject project = new MavenProject( model );
-        project.setExtensionArtifacts( Collections.emptySet() );
-        project.setRemoteArtifactRepositories( Collections.emptyList() );
-        project.setPluginArtifactRepositories( Collections.emptyList() );
+        model.setGroupId("org.apache.dummy");
+        model.setArtifactId("dummy");
+        model.setVersion("0.1.1");
+
+        final MavenProject project = new MavenProject(model);
+        project.setExtensionArtifacts(Collections.emptySet());
+        project.setRemoteArtifactRepositories(Collections.emptyList());
+        project.setPluginArtifactRepositories(Collections.emptyList());
         return project;
     }
 
-    private MockArtifact getMockArtifact3()
-    {
+    private MockArtifact getMockArtifact3() {
         MockArtifact artifact3 = new MockArtifact();
-        artifact3.setGroupId( "org.apache.dummy.bar" );
-        artifact3.setArtifactId( "dummy3" );
-        artifact3.setVersion( "2.0" );
-        artifact3.setScope( "runtime" );
-        artifact3.setType( "jar" );
-        artifact3.setFile( getClasspathFile( artifact3.getArtifactId() + "-" + artifact3.getVersion() + ".jar" ) );
+        artifact3.setGroupId("org.apache.dummy.bar");
+        artifact3.setArtifactId("dummy3");
+        artifact3.setVersion("2.0");
+        artifact3.setScope("runtime");
+        artifact3.setType("jar");
+        artifact3.setFile(getClasspathFile(artifact3.getArtifactId() + "-" + artifact3.getVersion() + ".jar"));
         return artifact3;
     }
 
-    private MavenProject getDummyProjectWithSnapshot()
-    {
+    private MavenProject getDummyProjectWithSnapshot() {
         MavenProject project = getMavenProject();
-        File pomFile = new File( "src/test/resources/pom.xml" );
-        pomFile.setLastModified( System.currentTimeMillis() - 60000L );
-        project.setFile( pomFile );
+        File pomFile = new File("src/test/resources/pom.xml");
+        pomFile.setLastModified(System.currentTimeMillis() - 60000L);
+        project.setFile(pomFile);
         Build build = new Build();
-        build.setDirectory( "target" );
-        build.setOutputDirectory( "target" );
-        project.setBuild( build );
-        project.setName( "archiver test" );
+        build.setDirectory("target");
+        build.setOutputDirectory("target");
+        project.setBuild(build);
+        project.setName("archiver test");
         Organization organization = new Organization();
-        organization.setName( "Apache" );
-        project.setOrganization( organization );
+        organization.setName("Apache");
+        project.setOrganization(organization);
 
         MockArtifact artifact = new MockArtifact();
-        artifact.setGroupId( "org.apache.dummy" );
-        artifact.setArtifactId( "dummy" );
-        artifact.setVersion( "0.1.1" );
-        artifact.setBaseVersion( "0.1.1" );
-        artifact.setType( "jar" );
-        artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
-        project.setArtifact( artifact );
+        artifact.setGroupId("org.apache.dummy");
+        artifact.setArtifactId("dummy");
+        artifact.setVersion("0.1.1");
+        artifact.setBaseVersion("0.1.1");
+        artifact.setType("jar");
+        artifact.setArtifactHandler(new DefaultArtifactHandler("jar"));
+        project.setArtifact(artifact);
 
-        Set<Artifact> artifacts = getArtifacts( getMockArtifact1(), getMockArtifact2(), getMockArtifact3() );
+        Set<Artifact> artifacts = getArtifacts(getMockArtifact1(), getMockArtifact2(), getMockArtifact3());
 
-        project.setArtifacts( artifacts );
+        project.setArtifacts(artifacts);
 
         return project;
     }
 
-    private ArtifactHandler getMockArtifactHandler()
-    {
-        return new ArtifactHandler()
-        {
+    private ArtifactHandler getMockArtifactHandler() {
+        return new ArtifactHandler() {
 
-            public String getClassifier()
-            {
+            public String getClassifier() {
                 return null;
             }
 
-            public String getDirectory()
-            {
+            public String getDirectory() {
                 return null;
             }
 
-            public String getExtension()
-            {
+            public String getExtension() {
                 return "jar";
             }
 
-            public String getLanguage()
-            {
+            public String getLanguage() {
                 return null;
             }
 
-            public String getPackaging()
-            {
+            public String getPackaging() {
                 return null;
             }
 
-            public boolean isAddedToClasspath()
-            {
+            public boolean isAddedToClasspath() {
                 return true;
             }
 
-            public boolean isIncludesDependencies()
-            {
+            public boolean isIncludesDependencies() {
                 return false;
             }
-
         };
     }
 
-    private MockArtifact getMockArtifact2()
-    {
+    private MockArtifact getMockArtifact2() {
         MockArtifact artifact2 = new MockArtifact();
-        artifact2.setGroupId( "org.apache.dummy.foo" );
-        artifact2.setArtifactId( "dummy2" );
-        artifact2.setVersion( "1.5" );
-        artifact2.setType( "jar" );
-        artifact2.setScope( "runtime" );
-        artifact2.setFile( getClasspathFile( artifact2.getArtifactId() + "-" + artifact2.getVersion() + ".jar" ) );
+        artifact2.setGroupId("org.apache.dummy.foo");
+        artifact2.setArtifactId("dummy2");
+        artifact2.setVersion("1.5");
+        artifact2.setType("jar");
+        artifact2.setScope("runtime");
+        artifact2.setFile(getClasspathFile(artifact2.getArtifactId() + "-" + artifact2.getVersion() + ".jar"));
         return artifact2;
     }
 
-    private MockArtifact getArtifactWithDot()
-    {
+    private MockArtifact getArtifactWithDot() {
         MockArtifact artifact2 = new MockArtifact();
-        artifact2.setGroupId( "org.apache.dummy.foo" );
-        artifact2.setArtifactId( "dummy.dot" );
-        artifact2.setVersion( "1.5" );
-        artifact2.setType( "jar" );
-        artifact2.setScope( "runtime" );
-        artifact2.setFile( getClasspathFile( artifact2.getArtifactId() + "-" + artifact2.getVersion() + ".jar" ) );
+        artifact2.setGroupId("org.apache.dummy.foo");
+        artifact2.setArtifactId("dummy.dot");
+        artifact2.setVersion("1.5");
+        artifact2.setType("jar");
+        artifact2.setScope("runtime");
+        artifact2.setFile(getClasspathFile(artifact2.getArtifactId() + "-" + artifact2.getVersion() + ".jar"));
         return artifact2;
     }
 
-    private MockArtifact getMockArtifact1()
-    {
+    private MockArtifact getMockArtifact1() {
         MockArtifact artifact1 = new MockArtifact();
-        artifact1.setGroupId( "org.apache.dummy" );
-        artifact1.setArtifactId( "dummy1" );
-        artifact1.setSnapshotVersion( "1.1-20081022.112233-1", "1.1-SNAPSHOT" );
-        artifact1.setType( "jar" );
-        artifact1.setScope( "runtime" );
-        artifact1.setFile( getClasspathFile( artifact1.getArtifactId() + "-" + artifact1.getVersion() + ".jar" ) );
+        artifact1.setGroupId("org.apache.dummy");
+        artifact1.setArtifactId("dummy1");
+        artifact1.setSnapshotVersion("1.1-20081022.112233-1", "1.1-SNAPSHOT");
+        artifact1.setType("jar");
+        artifact1.setScope("runtime");
+        artifact1.setFile(getClasspathFile(artifact1.getArtifactId() + "-" + artifact1.getVersion() + ".jar"));
         return artifact1;
     }
 
-    private MockArtifact getMockArtifact1Release()
-    {
+    private MockArtifact getMockArtifact1Release() {
         MockArtifact artifact1 = new MockArtifact();
-        artifact1.setGroupId( "org.apache.dummy" );
-        artifact1.setArtifactId( "dummy1" );
-        artifact1.setVersion( "1.0" );
-        artifact1.setBaseVersion( "1.0.1" );
-        artifact1.setType( "jar" );
-        artifact1.setScope( "runtime" );
-        artifact1.setFile( getClasspathFile( artifact1.getArtifactId() + "-" + artifact1.getVersion() + ".jar" ) );
+        artifact1.setGroupId("org.apache.dummy");
+        artifact1.setArtifactId("dummy1");
+        artifact1.setVersion("1.0");
+        artifact1.setBaseVersion("1.0.1");
+        artifact1.setType("jar");
+        artifact1.setScope("runtime");
+        artifact1.setFile(getClasspathFile(artifact1.getArtifactId() + "-" + artifact1.getVersion() + ".jar"));
         return artifact1;
     }
 
-    private File getClasspathFile( String file )
-    {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource( file );
-        if ( resource == null )
-        {
-            throw new IllegalStateException( "Cannot retrieve java.net.URL for file: " + file
-                + " on the current test classpath." );
+    private File getClasspathFile(String file) {
+        URL resource = Thread.currentThread().getContextClassLoader().getResource(file);
+        if (resource == null) {
+            throw new IllegalStateException(
+                    "Cannot retrieve java.net.URL for file: " + file + " on the current test classpath.");
         }
 
-        URI uri = new File( resource.getPath() ).toURI().normalize();
+        URI uri = new File(resource.getPath()).toURI().normalize();
 
-        return new File( uri.getPath().replaceAll( "%20", " " ) );
+        return new File(uri.getPath().replaceAll("%20", " "));
     }
 
-    private MavenSession getDummySession()
-    {
+    private MavenSession getDummySession() {
         Properties systemProperties = new Properties();
-        systemProperties.put( "maven.version", "3.1.1" );
-        systemProperties.put( "maven.build.version",
-            "Apache Maven 3.1.1 (0728685237757ffbf44136acec0402957f723d9a; 2013-09-17 17:22:22+0200)" );
+        systemProperties.put("maven.version", "3.1.1");
+        systemProperties.put(
+                "maven.build.version",
+                "Apache Maven 3.1.1 (0728685237757ffbf44136acec0402957f723d9a; 2013-09-17 17:22:22+0200)");
 
-        return getDummySession( systemProperties );
+        return getDummySession(systemProperties);
     }
 
-    private MavenSession getDummySessionWithoutMavenVersion()
-    {
-        return getDummySession( new Properties() );
+    private MavenSession getDummySessionWithoutMavenVersion() {
+        return getDummySession(new Properties());
     }
 
-    private MavenSession getDummySession( Properties systemProperties )
-    {
+    private MavenSession getDummySession(Properties systemProperties) {
         Date startTime = new Date();
 
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
-        request.setSystemProperties( systemProperties );
-        request.setGoals( null );
-        request.setStartTime( startTime );
-        request.setUserSettingsFile( null );
+        request.setSystemProperties(systemProperties);
+        request.setGoals(null);
+        request.setStartTime(startTime);
+        request.setUserSettingsFile(null);
 
         MavenExecutionResult result = new DefaultMavenExecutionResult();
 
         RepositorySystemSession rss = new DefaultRepositorySystemSession();
 
-        return new MavenSession( null, rss, request, result );
-
+        return new MavenSession(null, rss, request, result);
     }
 
-    private Set<Artifact> getArtifacts( Artifact... artifacts )
-    {
+    private Set<Artifact> getArtifacts(Artifact... artifacts) {
         final ArtifactHandler mockArtifactHandler = getMockArtifactHandler();
-        Set<Artifact> result = new TreeSet<>( new ArtifactComparator() );
-        for ( Artifact artifact : artifacts )
-        {
-            artifact.setArtifactHandler( mockArtifactHandler );
-            result.add( artifact );
+        Set<Artifact> result = new TreeSet<>(new ArtifactComparator());
+        for (Artifact artifact : artifacts) {
+            artifact.setArtifactHandler(mockArtifactHandler);
+            result.add(artifact);
         }
         return result;
     }
 
-    public Manifest getJarFileManifest( File jarFile )
-        throws IOException
-    {
-        try ( JarFile jar = new JarFile( jarFile ) )
-        {
+    public Manifest getJarFileManifest(File jarFile) throws IOException {
+        try (JarFile jar = new JarFile(jarFile)) {
             return jar.getManifest();
         }
     }
 
     @Test
-    public void testParseOutputTimestamp()
-    {
+    public void testParseOutputTimestamp() {
         MavenArchiver archiver = new MavenArchiver();
 
-        assertThat( archiver.parseOutputTimestamp( null ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( "" ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( "." ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( " " ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( "_" ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( "-" ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( "/" ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( "!" ) ).isNull();
-        assertThat( archiver.parseOutputTimestamp( "*" ) ).isNull();
-
-        assertThat( archiver.parseOutputTimestamp( "1570300662" ).getTime() ).isEqualTo( 1570300662000L );
-        assertThat( archiver.parseOutputTimestamp( "0" ).getTime() ).isZero();
-        assertThat( archiver.parseOutputTimestamp( "1" ).getTime() ).isEqualTo( 1000L );
-
-        assertThat( archiver.parseOutputTimestamp( "2019-10-05T18:37:42Z" ).getTime() )
-            .isEqualTo( 1570300662000L );
-        assertThat( archiver.parseOutputTimestamp( "2019-10-05T20:37:42+02:00" ).getTime() )
-            .isEqualTo( 1570300662000L );
-        assertThat( archiver.parseOutputTimestamp( "2019-10-05T16:37:42-02:00" ).getTime() )
-            .isEqualTo( 1570300662000L );
+        assertThat(archiver.parseOutputTimestamp(null)).isNull();
+        assertThat(archiver.parseOutputTimestamp("")).isNull();
+        assertThat(archiver.parseOutputTimestamp(".")).isNull();
+        assertThat(archiver.parseOutputTimestamp(" ")).isNull();
+        assertThat(archiver.parseOutputTimestamp("_")).isNull();
+        assertThat(archiver.parseOutputTimestamp("-")).isNull();
+        assertThat(archiver.parseOutputTimestamp("/")).isNull();
+        assertThat(archiver.parseOutputTimestamp("!")).isNull();
+        assertThat(archiver.parseOutputTimestamp("*")).isNull();
+
+        assertThat(archiver.parseOutputTimestamp("1570300662").getTime()).isEqualTo(1570300662000L);
+        assertThat(archiver.parseOutputTimestamp("0").getTime()).isZero();
+        assertThat(archiver.parseOutputTimestamp("1").getTime()).isEqualTo(1000L);
+
+        assertThat(archiver.parseOutputTimestamp("2019-10-05T18:37:42Z").getTime())
+                .isEqualTo(1570300662000L);
+        assertThat(archiver.parseOutputTimestamp("2019-10-05T20:37:42+02:00").getTime())
+                .isEqualTo(1570300662000L);
+        assertThat(archiver.parseOutputTimestamp("2019-10-05T16:37:42-02:00").getTime())
+                .isEqualTo(1570300662000L);
 
         // These must result in IAE because we expect extended ISO format only (ie with - separator for date and
         // : separator for timezone), hence the XXX SimpleDateFormat for tz offset
         // X SimpleDateFormat accepts timezone without separator while date has separator, which is a mix between
         // basic (no separators, both for date and timezone) and extended (separator for both)
-        assertThatExceptionOfType( IllegalArgumentException.class )
-            .isThrownBy( () -> archiver.parseOutputTimestamp( "2019-10-05T20:37:42+0200" ) );
-        assertThatExceptionOfType( IllegalArgumentException.class )
-            .isThrownBy( () -> archiver.parseOutputTimestamp( "2019-10-05T20:37:42-0200" ) );
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> archiver.parseOutputTimestamp("2019-10-05T20:37:42+0200"));
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> archiver.parseOutputTimestamp("2019-10-05T20:37:42-0200"));
     }
 
     @ParameterizedTest
     @NullAndEmptySource
-    @ValueSource( strings = { ".", " ", "_", "-", "T", "/", "!", "!", "*", "ñ" } )
-    public void testEmptyParseOutputTimestampInstant( String value )
-    {
+    @ValueSource(strings = {".", " ", "_", "-", "T", "/", "!", "!", "*", "ñ"})
+    public void testEmptyParseOutputTimestampInstant(String value) {
         // Empty optional if null or 1 char
-        assertThat( MavenArchiver.parseBuildOutputTimestamp( value ) ).isEmpty();
+        assertThat(MavenArchiver.parseBuildOutputTimestamp(value)).isEmpty();
     }
 
     @ParameterizedTest
-    @CsvSource( { "0,0", "1,1", "9,9", "1570300662,1570300662", "2147483648,2147483648",
-        "2019-10-05T18:37:42Z,1570300662", "2019-10-05T20:37:42+02:00,1570300662",
-        "2019-10-05T16:37:42-02:00,1570300662", "1988-02-22T15:23:47.76598Z,572541827",
-        "2011-12-03T10:15:30+01:00,1322903730", "1980-01-01T00:00:02Z,315532802", "2099-12-31T23:59:59Z,4102444799" } )
-    public void testParseOutputTimestampInstant( String value, long expected )
-    {
-        assertThat( MavenArchiver.parseBuildOutputTimestamp( value ) )
-            .contains( Instant.ofEpochSecond( expected ) );
+    @CsvSource({
+        "0,0",
+        "1,1",
+        "9,9",
+        "1570300662,1570300662",
+        "2147483648,2147483648",
+        "2019-10-05T18:37:42Z,1570300662",
+        "2019-10-05T20:37:42+02:00,1570300662",
+        "2019-10-05T16:37:42-02:00,1570300662",
+        "1988-02-22T15:23:47.76598Z,572541827",
+        "2011-12-03T10:15:30+01:00,1322903730",
+        "1980-01-01T00:00:02Z,315532802",
+        "2099-12-31T23:59:59Z,4102444799"
+    })
+    public void testParseOutputTimestampInstant(String value, long expected) {
+        assertThat(MavenArchiver.parseBuildOutputTimestamp(value)).contains(Instant.ofEpochSecond(expected));
     }
 
     @ParameterizedTest
-    @ValueSource( strings = { "2019-10-05T20:37:42+0200", "2019-10-05T20:37:42-0200", "2019-10-05T25:00:00Z",
-        "2019-10-05", "XYZ", "Tue, 3 Jun 2008 11:05:30 GMT", "2011-12-03T10:15:30+01:00[Europe/Paris]" } )
-    public void testThrownParseOutputTimestampInstant( String outputTimestamp )
-    {
+    @ValueSource(
+            strings = {
+                "2019-10-05T20:37:42+0200",
+                "2019-10-05T20:37:42-0200",
+                "2019-10-05T25:00:00Z",
+                "2019-10-05",
+                "XYZ",
+                "Tue, 3 Jun 2008 11:05:30 GMT",
+                "2011-12-03T10:15:30+01:00[Europe/Paris]"
+            })
+    public void testThrownParseOutputTimestampInstant(String outputTimestamp) {
         // Invalid parsing
-        assertThatExceptionOfType( IllegalArgumentException.class )
-            .isThrownBy( () -> MavenArchiver.parseBuildOutputTimestamp( outputTimestamp ) )
-            .withCauseInstanceOf( DateTimeParseException.class );
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> MavenArchiver.parseBuildOutputTimestamp(outputTimestamp))
+                .withCauseInstanceOf(DateTimeParseException.class);
     }
 
     @ParameterizedTest
-    @ValueSource( strings = { "1980-01-01T00:00:01Z", "2100-01-01T00:00Z", "2100-02-28T23:59:59Z",
-        "2099-12-31T23:59:59-01:00", "1980-01-01T00:15:35+01:00", "1980-01-01T10:15:35+14:00" } )
-    public void testThrownParseOutputTimestampInvalidRange( String outputTimestamp )
-    {
+    @ValueSource(
+            strings = {
+                "1980-01-01T00:00:01Z",
+                "2100-01-01T00:00Z",
+                "2100-02-28T23:59:59Z",
+                "2099-12-31T23:59:59-01:00",
+                "1980-01-01T00:15:35+01:00",
+                "1980-01-01T10:15:35+14:00"
+            })
+    public void testThrownParseOutputTimestampInvalidRange(String outputTimestamp) {
         // date is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z
-        assertThatExceptionOfType( IllegalArgumentException.class )
-            .isThrownBy( () -> MavenArchiver.parseBuildOutputTimestamp( outputTimestamp ) )
-            .withMessageContaining("is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z");
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> MavenArchiver.parseBuildOutputTimestamp(outputTimestamp))
+                .withMessageContaining("is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z");
     }
 
     @ParameterizedTest
-    @CsvSource( { "2011-12-03T10:15:30+01,1322903730", "2019-10-05T20:37:42+02,1570300662",
-        "2011-12-03T10:15:30+06,1322885730", "1988-02-22T20:37:42+06,572539062" } )
-    @EnabledForJreRange( min = JRE.JAVA_9 )
-    public void testShortOffset( String value, long expected )
-    {
-        assertThat( MavenArchiver.parseBuildOutputTimestamp( value ) )
-            .contains( Instant.ofEpochSecond( expected ) );
+    @CsvSource({
+        "2011-12-03T10:15:30+01,1322903730",
+        "2019-10-05T20:37:42+02,1570300662",
+        "2011-12-03T10:15:30+06,1322885730",
+        "1988-02-22T20:37:42+06,572539062"
+    })
+    @EnabledForJreRange(min = JRE.JAVA_9)
+    public void testShortOffset(String value, long expected) {
+        assertThat(MavenArchiver.parseBuildOutputTimestamp(value)).contains(Instant.ofEpochSecond(expected));
     }
 }
diff --git a/src/test/java/org/apache/maven/archiver/MockArtifact.java b/src/test/java/org/apache/maven/archiver/MockArtifact.java
index ae2d50d..a82c751 100644
--- a/src/test/java/org/apache/maven/archiver/MockArtifact.java
+++ b/src/test/java/org/apache/maven/archiver/MockArtifact.java
@@ -1,5 +1,3 @@
-package org.apache.maven.archiver;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -28,17 +31,11 @@
 import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
 import org.apache.maven.artifact.versioning.VersionRange;
 
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-
 /*
  * TODO move to maven-artifact-test
  */
-@SuppressWarnings( "deprecation" )
-public class MockArtifact
-    implements Artifact
-{
+@SuppressWarnings("deprecation")
+public class MockArtifact implements Artifact {
     private String groupId;
 
     private String artifactId;
@@ -59,256 +56,203 @@ public class MockArtifact
 
     private boolean snapshot;
 
-    public String getGroupId()
-    {
+    public String getGroupId() {
         return groupId;
     }
 
-    public String getArtifactId()
-    {
+    public String getArtifactId() {
         return artifactId;
     }
 
-    public String getVersion()
-    {
+    public String getVersion() {
         return version;
     }
 
-    public void setVersion( String string )
-    {
+    public void setVersion(String string) {
         this.version = string;
     }
 
-    public void setSnapshotVersion( String snapshotVersion, String baseVersion )
-    {
+    public void setSnapshotVersion(String snapshotVersion, String baseVersion) {
         snapshot = true;
         version = snapshotVersion;
         this.baseVersion = baseVersion;
     }
 
-    public String getScope()
-    {
+    public String getScope() {
         return scope;
     }
 
-    public String getType()
-    {
+    public String getType() {
         return type;
     }
 
-    public String getClassifier()
-    {
+    public String getClassifier() {
         return classifier;
     }
 
-    public boolean hasClassifier()
-    {
+    public boolean hasClassifier() {
         return classifier != null;
     }
 
-    public File getFile()
-    {
+    public File getFile() {
         return file;
     }
 
-    public void setFile( File file )
-    {
+    public void setFile(File file) {
         this.file = file;
     }
 
-    public String getBaseVersion()
-    {
+    public String getBaseVersion() {
         return baseVersion;
     }
 
-    public void setBaseVersion( String string )
-    {
+    public void setBaseVersion(String string) {
         this.baseVersion = string;
     }
 
-    public String getId()
-    {
+    public String getId() {
         return null;
     }
 
-    public String getDependencyConflictId()
-    {
+    public String getDependencyConflictId() {
         return null;
     }
 
-    public void addMetadata( ArtifactMetadata artifactMetadata )
-    {
-    }
+    public void addMetadata(ArtifactMetadata artifactMetadata) {}
 
-    public ArtifactMetadata getMetadata( Class<?> metadataClass )
-    {
+    public ArtifactMetadata getMetadata(Class<?> metadataClass) {
         return null;
     }
 
-    public Collection<ArtifactMetadata> getMetadataList()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public Collection<ArtifactMetadata> getMetadataList() {
+        return null; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setRepository( ArtifactRepository artifactRepository )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setRepository(ArtifactRepository artifactRepository) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public ArtifactRepository getRepository()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public ArtifactRepository getRepository() {
+        return null; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void updateVersion( String string, ArtifactRepository artifactRepository )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void updateVersion(String string, ArtifactRepository artifactRepository) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public String getDownloadUrl()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public String getDownloadUrl() {
+        return null; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setDownloadUrl( String string )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setDownloadUrl(String string) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public ArtifactFilter getDependencyFilter()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public ArtifactFilter getDependencyFilter() {
+        return null; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setDependencyFilter( ArtifactFilter artifactFilter )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setDependencyFilter(ArtifactFilter artifactFilter) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public ArtifactHandler getArtifactHandler()
-    {
+    public ArtifactHandler getArtifactHandler() {
         return artifactHandler;
     }
 
-    public List<String> getDependencyTrail()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public List<String> getDependencyTrail() {
+        return null; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setDependencyTrail( List<String> list )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setDependencyTrail(List<String> list) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public VersionRange getVersionRange()
-    {
-        return VersionRange.createFromVersion( version );
+    public VersionRange getVersionRange() {
+        return VersionRange.createFromVersion(version);
     }
 
-    public void setVersionRange( VersionRange versionRange )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setVersionRange(VersionRange versionRange) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void selectVersion( String string )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void selectVersion(String string) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public boolean isSnapshot()
-    {
+    public boolean isSnapshot() {
         return snapshot;
     }
 
-    public void setResolved( boolean b )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setResolved(boolean b) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public boolean isResolved()
-    {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    public boolean isResolved() {
+        return false; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setResolvedVersion( String string )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setResolvedVersion(String string) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setArtifactHandler( ArtifactHandler artifactHandler )
-    {
+    public void setArtifactHandler(ArtifactHandler artifactHandler) {
         this.artifactHandler = artifactHandler;
     }
 
-    public boolean isRelease()
-    {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    public boolean isRelease() {
+        return false; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setRelease( boolean b )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setRelease(boolean b) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public List<ArtifactVersion> getAvailableVersions()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public List<ArtifactVersion> getAvailableVersions() {
+        return null; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setAvailableVersions( List<ArtifactVersion> list )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setAvailableVersions(List<ArtifactVersion> list) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public boolean isOptional()
-    {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    public boolean isOptional() {
+        return false; // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public void setOptional( boolean b )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
+    public void setOptional(boolean b) {
+        // To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public ArtifactVersion getSelectedVersion()
-        throws OverConstrainedVersionException
-    {
-        return VersionRange.createFromVersion( version ).getSelectedVersion( this );
+    public ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException {
+        return VersionRange.createFromVersion(version).getSelectedVersion(this);
     }
 
-    public boolean isSelectedVersionKnown()
-        throws OverConstrainedVersionException
-    {
-        return VersionRange.createFromVersion( version ).isSelectedVersionKnown( this );
+    public boolean isSelectedVersionKnown() throws OverConstrainedVersionException {
+        return VersionRange.createFromVersion(version).isSelectedVersionKnown(this);
     }
 
-    public void setGroupId( String groupId )
-    {
+    public void setGroupId(String groupId) {
         this.groupId = groupId;
     }
 
-    public void setArtifactId( String artifactId )
-    {
+    public void setArtifactId(String artifactId) {
         this.artifactId = artifactId;
     }
 
-    public void setType( String type )
-    {
+    public void setType(String type) {
         this.type = type;
     }
 
-    public void setClassifier( String classifier )
-    {
+    public void setClassifier(String classifier) {
         this.classifier = classifier;
     }
 
-    public void setScope( String string )
-    {
-         this.scope = string;
+    public void setScope(String string) {
+        this.scope = string;
     }
 
-    public int compareTo( Artifact o )
-    {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+    public int compareTo(Artifact o) {
+        return 0; // To change body of implemented methods use File | Settings | File Templates.
     }
 }

From e5416e5e20220f5b1edfa949ac22fe937ee0a96e Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Sun, 26 Mar 2023 08:13:00 -0400
Subject: [PATCH 05/23] Back to 3.6.1-SNAPSHOT (#31)

styling changes are not a minor version bump
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f699db5..3c02314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-archiver</artifactId>
-  <version>3.7.0-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
 
   <name>Apache Maven Archiver</name>
   <description>Provides utility methods for creating JARs and other archive files from a Maven project.</description>

From c47a26ded210b027d045c1a3653ed9c88067b533 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 15:21:50 +0000
Subject: [PATCH 06/23] Bump plexus-archiver from 1.0-alpha-7 to 3.6.0 in
 /src/test/resources

Bumps [plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 1.0-alpha-7 to 3.6.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-archiver/commits/plexus-archiver-3.6.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-archiver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/test/resources/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/pom.xml b/src/test/resources/pom.xml
index 34a4a01..a74a498 100644
--- a/src/test/resources/pom.xml
+++ b/src/test/resources/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-7</version>
+      <version>3.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

From 5c4f29759e9e18c84a75de51b3d690b177580088 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sat, 8 Apr 2023 20:29:46 +0200
Subject: [PATCH 07/23] Bump maven-gh-actions-shared to v3

---
 .github/workflows/maven-verify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index bbd7786..4d67fdc 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -24,4 +24,4 @@ on:
 jobs:
   build:
     name: Verify
-    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3

From 449b8d28368beeda47bf4c19d4c9c6e3c9847c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Mon, 24 Apr 2023 16:43:06 +0200
Subject: [PATCH 08/23] Auto-link MSHARED Jira

---
 .asf.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index edf94c7..1d292aa 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -27,6 +27,8 @@ github:
     squash: true
     merge: false
     rebase: true
+  autolink_jira:
+    - MSHARED
 notifications:
   commits: commits@maven.apache.org
   issues: issues@maven.apache.org

From 0c6cd0c70a75e1614742d99394566c7a95e597a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 11:34:01 +0000
Subject: [PATCH 09/23] Bump plexus-utils from 3.4.2 to 3.5.1 (#30)

Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.4.2 to 3.5.1.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.4.2...plexus-utils-3.5.1)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3c02314..a40a07e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.4.2</version>
+      <version>3.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

From 06cb6e8a8fb58197183acd5d1a28c78de769440f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 11:34:57 +0000
Subject: [PATCH 10/23] Bump plexus-io from 3.4.0 to 3.4.1 (#28)

Bumps [plexus-io](https://github.com/codehaus-plexus/plexus-io) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/codehaus-plexus/plexus-io/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-io/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-io/compare/plexus-io-3.4.0...plexus-io-3.4.1)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-io
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a40a07e..1ad0559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

From d6fb35c232511b8d297e32a45a7823b6f72ea22c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 11:35:38 +0000
Subject: [PATCH 11/23] Bump junit-jupiter from 5.9.2 to 5.9.3 (#32)

Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1ad0559..1f61807 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>5.9.2</version>
+      <version>5.9.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From cabb87f39b10deb68cd2b3b1cbf17fce80579032 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sun, 11 Jun 2023 21:55:57 +0200
Subject: [PATCH 12/23] Ignore reformat commit after pom upgrade

---
 .git-blame-ignore-revs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000..aff5414
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Change maven code style
+670da42432fbfd2d28b29458095716a117d27b7c

From 6429741056ccb47628ffd4d0e1dcd071ea92b7fc Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sun, 11 Jun 2023 22:02:36 +0200
Subject: [PATCH 13/23] Drop public from junit tests

---
 .../archiver/ManifestConfigurationTest.java   | 10 ++--
 .../MavenArchiveConfigurationTest.java        |  2 +-
 .../maven/archiver/MavenArchiverTest.java     | 58 +++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
index 528ff45..d662d6f 100644
--- a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
@@ -28,30 +28,30 @@ class ManifestConfigurationTest {
     private ManifestConfiguration manifestConfiguration;
 
     @BeforeEach
-    public void before() {
+    void before() {
         this.manifestConfiguration = new ManifestConfiguration();
     }
 
     @Test
-    public void XXX() {
+    void XXX() {
         assertThat(manifestConfiguration.getClasspathLayoutType())
                 .isEqualTo(ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE);
     }
 
     @Test
-    public void getClasspathPrefixShouldReturnPrefixWithSlashesInsteadOfBackSlashes() {
+    void getClasspathPrefixShouldReturnPrefixWithSlashesInsteadOfBackSlashes() {
         manifestConfiguration.setClasspathPrefix("\\lib\\const\\");
         assertThat(manifestConfiguration.getClasspathPrefix()).isEqualTo("/lib/const/");
     }
 
     @Test
-    public void getClasspathPrefixShouldReturnPrefixWithTraingSlash() {
+    void getClasspathPrefixShouldReturnPrefixWithTraingSlash() {
         manifestConfiguration.setClasspathPrefix("const");
         assertThat(manifestConfiguration.getClasspathPrefix()).isEqualTo("const/");
     }
 
     @Test
-    public void getClasspathPrefixShouldReturnTheTrailingSlash() {
+    void getClasspathPrefixShouldReturnTheTrailingSlash() {
         manifestConfiguration.setClasspathPrefix("const/");
         assertThat(manifestConfiguration.getClasspathPrefix()).isEqualTo("const/");
     }
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
index b37b8ab..1756c03 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
@@ -34,7 +34,7 @@ class MavenArchiveConfigurationTest {
     private MavenArchiveConfiguration archive;
 
     @BeforeEach
-    public void before() {
+    void before() {
         archive = new MavenArchiveConfiguration();
         archive.setManifest(new ManifestConfiguration());
         archive.setForced(false);
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 5ac7a01..e2c27c4 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -317,7 +317,7 @@ private MavenArchiver getMavenArchiver(JarArchiver jarArchiver) {
     }
 
     @Test
-    public void testDashesInClassPath_MSHARED_134()
+    void testDashesInClassPath_MSHARED_134()
             throws IOException, ManifestException, DependencyResolutionRequiredException {
         File jarFile = new File("target/test/dummyWithDashes.jar");
         JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
@@ -346,7 +346,7 @@ public void testDashesInClassPath_MSHARED_134()
     }
 
     @Test
-    public void testDashesInClassPath_MSHARED_182()
+    void testDashesInClassPath_MSHARED_182()
             throws IOException, ManifestException, DependencyResolutionRequiredException {
         File jarFile = new File("target/test/dummy.jar");
         JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
@@ -379,7 +379,7 @@ public void testDashesInClassPath_MSHARED_182()
     }
 
     @Test
-    public void testCarriageReturnInManifestEntry() throws Exception {
+    void testCarriageReturnInManifestEntry() throws Exception {
         File jarFile = new File("target/test/dummy.jar");
         JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
@@ -409,7 +409,7 @@ public void testCarriageReturnInManifestEntry() throws Exception {
     }
 
     @Test
-    public void testDeprecatedCreateArchiveAPI() throws Exception {
+    void testDeprecatedCreateArchiveAPI() throws Exception {
         File jarFile = new File("target/test/dummy.jar");
         JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
@@ -439,7 +439,7 @@ public void testDeprecatedCreateArchiveAPI() throws Exception {
     }
 
     @Test
-    public void testMinimalManifestEntries() throws Exception {
+    void testMinimalManifestEntries() throws Exception {
         File jarFile = new File("target/test/dummy.jar");
         JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
@@ -462,7 +462,7 @@ public void testMinimalManifestEntries() throws Exception {
     }
 
     @Test
-    public void testManifestEntries() throws Exception {
+    void testManifestEntries() throws Exception {
         File jarFile = new File("target/test/dummy.jar");
         JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
@@ -537,7 +537,7 @@ public void testManifestEntries() throws Exception {
     }
 
     @Test
-    public void testManifestWithInvalidAutomaticModuleNameThrowsOnCreateArchive() throws Exception {
+    void testManifestWithInvalidAutomaticModuleNameThrowsOnCreateArchive() throws Exception {
         File jarFile = new File("target/test/dummy.jar");
         JarArchiver jarArchiver = getCleanJarArchiver(jarFile);
 
@@ -562,7 +562,7 @@ public void testManifestWithInvalidAutomaticModuleNameThrowsOnCreateArchive() th
      * Test to make sure that manifest sections are present in the manifest prior to the archive has been created.
      */
     @Test
-    public void testManifestSections() throws Exception {
+    void testManifestSections() throws Exception {
         MavenArchiver archiver = new MavenArchiver();
 
         MavenSession session = getDummySession();
@@ -593,7 +593,7 @@ public void testManifestSections() throws Exception {
     }
 
     @Test
-    public void testDefaultClassPathValue() throws Exception {
+    void testDefaultClassPathValue() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy.jar");
@@ -626,7 +626,7 @@ private void deleteAndAssertNotPresent(File jarFile) {
     }
 
     @Test
-    public void testDefaultClassPathValue_WithSnapshot() throws Exception {
+    void testDefaultClassPathValue_WithSnapshot() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
         File jarFile = new File("target/test/dummy.jar");
@@ -655,7 +655,7 @@ public void testDefaultClassPathValue_WithSnapshot() throws Exception {
     }
 
     @Test
-    public void testMavenRepoClassPathValue() throws Exception {
+    void testMavenRepoClassPathValue() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy.jar");
@@ -692,7 +692,7 @@ public void testMavenRepoClassPathValue() throws Exception {
     }
 
     @Test
-    public void shouldCreateArchiveWithSimpleClassPathLayoutWhileSettingSimpleLayoutExplicit() throws Exception {
+    void shouldCreateArchiveWithSimpleClassPathLayoutWhileSettingSimpleLayoutExplicit() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy-explicit-simple.jar");
@@ -724,7 +724,7 @@ public void shouldCreateArchiveWithSimpleClassPathLayoutWhileSettingSimpleLayout
     }
 
     @Test
-    public void shouldCreateArchiveCustomerLayoutSimple() throws Exception {
+    void shouldCreateArchiveCustomerLayoutSimple() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy-custom-layout-simple.jar");
@@ -757,7 +757,7 @@ public void shouldCreateArchiveCustomerLayoutSimple() throws Exception {
     }
 
     @Test
-    public void shouldCreateArchiveCustomLayoutSimpleNonUnique() throws Exception {
+    void shouldCreateArchiveCustomLayoutSimpleNonUnique() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy-custom-layout-simple-non-unique.jar");
@@ -791,7 +791,7 @@ public void shouldCreateArchiveCustomLayoutSimpleNonUnique() throws Exception {
     }
 
     @Test
-    public void shouldCreateArchiveCustomLayoutRepository() throws Exception {
+    void shouldCreateArchiveCustomLayoutRepository() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy-custom-layout-repo.jar");
@@ -831,7 +831,7 @@ public void shouldCreateArchiveCustomLayoutRepository() throws Exception {
     }
 
     @Test
-    public void shouldCreateArchiveCustomLayoutRepositoryNonUnique() throws Exception {
+    void shouldCreateArchiveCustomLayoutRepositoryNonUnique() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy-custom-layout-repo-non-unique.jar");
@@ -871,7 +871,7 @@ public void shouldCreateArchiveCustomLayoutRepositoryNonUnique() throws Exceptio
     }
 
     @Test
-    public void shouldCreateArchiveWithSimpleClassPathLayoutUsingDefaults() throws Exception {
+    void shouldCreateArchiveWithSimpleClassPathLayoutUsingDefaults() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy-defaults.jar");
@@ -901,7 +901,7 @@ public void shouldCreateArchiveWithSimpleClassPathLayoutUsingDefaults() throws E
     }
 
     @Test
-    public void testMavenRepoClassPathValue_WithSnapshot() throws Exception {
+    void testMavenRepoClassPathValue_WithSnapshot() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
         File jarFile = new File("target/test/dummy.jar");
@@ -938,7 +938,7 @@ public void testMavenRepoClassPathValue_WithSnapshot() throws Exception {
     }
 
     @Test
-    public void testCustomClassPathValue() throws Exception {
+    void testCustomClassPathValue() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy.jar");
@@ -978,7 +978,7 @@ public void testCustomClassPathValue() throws Exception {
     }
 
     @Test
-    public void testCustomClassPathValue_WithSnapshotResolvedVersion() throws Exception {
+    void testCustomClassPathValue_WithSnapshotResolvedVersion() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
         File jarFile = new File("target/test/dummy.jar");
@@ -1017,7 +1017,7 @@ public void testCustomClassPathValue_WithSnapshotResolvedVersion() throws Except
     }
 
     @Test
-    public void testCustomClassPathValue_WithSnapshotForcingBaseVersion() throws Exception {
+    void testCustomClassPathValue_WithSnapshotForcingBaseVersion() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProjectWithSnapshot();
         File jarFile = new File("target/test/dummy.jar");
@@ -1054,7 +1054,7 @@ public void testCustomClassPathValue_WithSnapshotForcingBaseVersion() throws Exc
     }
 
     @Test
-    public void testDefaultPomProperties() throws Exception {
+    void testDefaultPomProperties() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy.jar");
@@ -1088,7 +1088,7 @@ public void testDefaultPomProperties() throws Exception {
     }
 
     @Test
-    public void testCustomPomProperties() throws Exception {
+    void testCustomPomProperties() throws Exception {
         MavenSession session = getDummySession();
         MavenProject project = getDummyProject();
         File jarFile = new File("target/test/dummy.jar");
@@ -1356,7 +1356,7 @@ public Manifest getJarFileManifest(File jarFile) throws IOException {
     }
 
     @Test
-    public void testParseOutputTimestamp() {
+    void testParseOutputTimestamp() {
         MavenArchiver archiver = new MavenArchiver();
 
         assertThat(archiver.parseOutputTimestamp(null)).isNull();
@@ -1393,7 +1393,7 @@ public void testParseOutputTimestamp() {
     @ParameterizedTest
     @NullAndEmptySource
     @ValueSource(strings = {".", " ", "_", "-", "T", "/", "!", "!", "*", "ñ"})
-    public void testEmptyParseOutputTimestampInstant(String value) {
+    void testEmptyParseOutputTimestampInstant(String value) {
         // Empty optional if null or 1 char
         assertThat(MavenArchiver.parseBuildOutputTimestamp(value)).isEmpty();
     }
@@ -1413,7 +1413,7 @@ public void testEmptyParseOutputTimestampInstant(String value) {
         "1980-01-01T00:00:02Z,315532802",
         "2099-12-31T23:59:59Z,4102444799"
     })
-    public void testParseOutputTimestampInstant(String value, long expected) {
+    void testParseOutputTimestampInstant(String value, long expected) {
         assertThat(MavenArchiver.parseBuildOutputTimestamp(value)).contains(Instant.ofEpochSecond(expected));
     }
 
@@ -1428,7 +1428,7 @@ public void testParseOutputTimestampInstant(String value, long expected) {
                 "Tue, 3 Jun 2008 11:05:30 GMT",
                 "2011-12-03T10:15:30+01:00[Europe/Paris]"
             })
-    public void testThrownParseOutputTimestampInstant(String outputTimestamp) {
+    void testThrownParseOutputTimestampInstant(String outputTimestamp) {
         // Invalid parsing
         assertThatExceptionOfType(IllegalArgumentException.class)
                 .isThrownBy(() -> MavenArchiver.parseBuildOutputTimestamp(outputTimestamp))
@@ -1445,7 +1445,7 @@ public void testThrownParseOutputTimestampInstant(String outputTimestamp) {
                 "1980-01-01T00:15:35+01:00",
                 "1980-01-01T10:15:35+14:00"
             })
-    public void testThrownParseOutputTimestampInvalidRange(String outputTimestamp) {
+    void testThrownParseOutputTimestampInvalidRange(String outputTimestamp) {
         // date is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z
         assertThatExceptionOfType(IllegalArgumentException.class)
                 .isThrownBy(() -> MavenArchiver.parseBuildOutputTimestamp(outputTimestamp))
@@ -1460,7 +1460,7 @@ public void testThrownParseOutputTimestampInvalidRange(String outputTimestamp) {
         "1988-02-22T20:37:42+06,572539062"
     })
     @EnabledForJreRange(min = JRE.JAVA_9)
-    public void testShortOffset(String value, long expected) {
+    void testShortOffset(String value, long expected) {
         assertThat(MavenArchiver.parseBuildOutputTimestamp(value)).contains(Instant.ofEpochSecond(expected));
     }
 }

From 357268afbd2b7525a7ebd31c1e4823a7d3eaa78f Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sun, 11 Jun 2023 22:05:48 +0200
Subject: [PATCH 14/23] Move junit to dependencyManagement and add missing
 slf4j-simple for tests

---
 pom.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1f61807..f4e4116 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,18 @@
     <project.build.outputTimestamp>2022-06-23T12:18:27Z</project.build.outputTimestamp>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.9.3</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <!--
       Apache Maven dependencies
@@ -99,7 +111,6 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>5.9.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -108,5 +119,11 @@
       <version>3.24.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.36</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

From ab0a1a33a45327aab2f99bd0a9fd89878ccf651a Mon Sep 17 00:00:00 2001
From: Tim te Beek <timtebeek@gmail.com>
Date: Mon, 22 May 2023 15:28:22 +0000
Subject: [PATCH 15/23] [MNG-6829] Replace StringUtils#isEmpty(String) &
 #isNotEmpty(String)

Last batch of is(Not)Empty for https://issues.apache.org/jira/browse/MNG-6829
These are the smallest change sets, hence why I opened more at the same time.
After this we can target the next most often used method from the StringUtils classes.


Use this link to re-run the recipe: https://public.moderne.io/recipes/org.openrewrite.java.migrate.apache.commons.lang.IsNotEmptyToJdk?organizationId=QXBhY2hlIE1hdmVu

Co-authored-by: Moderne <team@moderne.io>
---
 src/main/java/org/apache/maven/archiver/MavenArchiver.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index aa9a1b0..232decc 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -223,7 +223,7 @@ private void addManifestAttribute(Manifest manifest, Map<String, String> map, St
     }
 
     private void addManifestAttribute(Manifest manifest, String key, String value) throws ManifestException {
-        if (!StringUtils.isEmpty(value)) {
+        if (!(value == null || value.isEmpty())) {
             Manifest.Attribute attr = new Manifest.Attribute(key, value);
             manifest.addConfiguredAttribute(attr);
         } else {
@@ -772,7 +772,7 @@ public static Optional<Instant> parseBuildOutputTimestamp(String outputTimestamp
         }
 
         // Number representing seconds since the epoch
-        if (StringUtils.isNotEmpty(outputTimestamp) && StringUtils.isNumeric(outputTimestamp)) {
+        if ((outputTimestamp != null && !outputTimestamp.isEmpty()) && StringUtils.isNumeric(outputTimestamp)) {
             return Optional.of(Instant.ofEpochSecond(Long.parseLong(outputTimestamp)));
         }
 

From f4a9b517b7bb76966de2763287c09bfe1959b3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Sol=C3=B3rzano?= <jorsol@gmail.com>
Date: Mon, 8 May 2023 16:50:19 +0200
Subject: [PATCH 16/23] [MSHARED-1251] - Deprecate the JAR Index feature
 (JDK-8302819)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jorge Solórzano <jorsol@gmail.com>
---
 .../maven/archiver/MavenArchiveConfiguration.java     |  8 ++++++++
 src/site/xdoc/index.xml.vm                            | 11 ++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java b/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
index e373312..77bd7f8 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
@@ -35,6 +35,10 @@ public class MavenArchiveConfiguration {
 
     private boolean recompressAddedZips = true;
 
+    /**
+     * @deprecated See <a href="https://bugs.openjdk.org/browse/JDK-8305597">JDK-8305597</a>
+     */
+    @Deprecated
     private boolean index;
 
     private boolean addMavenDescriptor = true;
@@ -89,7 +93,9 @@ public void setRecompressAddedZips(boolean recompressAddedZips) {
      * <p>isIndex.</p>
      *
      * @return {@link #index}
+     * @deprecated See <a href="https://bugs.openjdk.org/browse/JDK-8305597">JDK-8305597</a>
      */
+    @Deprecated
     public boolean isIndex() {
         return index;
     }
@@ -138,7 +144,9 @@ public void setCompress(boolean compress) {
      * <p>Setter for the field <code>index</code>.</p>
      *
      * @param index set index to true/false.
+     * @deprecated See <a href="https://bugs.openjdk.org/browse/JDK-8305597">JDK-8305597</a>
      */
+    @Deprecated
     public void setIndex(boolean index) {
         this.index = index;
     }
diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm
index 5b9e89e..9bf995e 100644
--- a/src/site/xdoc/index.xml.vm
+++ b/src/site/xdoc/index.xml.vm
@@ -131,9 +131,14 @@
           <tr>
             <td>index</td>
             <td>
-              Whether the created archive will contain an
-              <code>INDEX.LIST</code> file.
-              The default value is <code>false</code>.
+              <strong>Deprecated:</strong> See <a href="https://bugs.openjdk.org/browse/JDK-8305597">JDK-8305597</a>
+              <p>
+                Whether the created archive will contain an
+                <code>INDEX.LIST</code> file.
+              </p>
+              <p>
+                The default value is <code>false</code>.
+              </p>
             </td>
             <td>boolean</td>
             <td></td>

From 6528ddb5c047d4e883b18f894d46f9ccc0f381e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:33:56 +0200
Subject: [PATCH 17/23] [MSHARED-1291] Bump org.junit:junit-bom from 5.9.3 to
 5.10.0 (#37)

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f4e4116..14671c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.3</version>
+        <version>5.10.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 0fcec499b3d484f7e493972d60908fed9e4a800b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:39:06 +0200
Subject: [PATCH 18/23] [MSHARED-1292] Bump org.codehaus.plexus:plexus-archiver
 from 4.4.0 to 4.8.0 (#39)

Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.4.0 to 4.8.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.4.0...plexus-archiver-4.8.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-archiver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 14671c5..72b469c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>4.4.0</version>
+      <version>4.8.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

From c8a2edb7387a22f3b92a1f9d1103e3e679bdcdf6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:46:00 +0200
Subject: [PATCH 19/23] [MSHARED-1292] Bump org.codehaus.plexus:plexus-archiver
 in /src/test/resources (#38)

Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 3.6.0 to 4.8.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-3.6.0...plexus-archiver-4.8.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-archiver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/test/resources/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/pom.xml b/src/test/resources/pom.xml
index a74a498..3fbbb01 100644
--- a/src/test/resources/pom.xml
+++ b/src/test/resources/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>3.6.0</version>
+      <version>4.8.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

From b459dae7964ddabff60e2d166fef9828ca745b5a Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 26 Jul 2023 00:19:09 +0200
Subject: [PATCH 20/23] [MSHARED-1294] Upgrade Parent to 40

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 72b469c..6e47a1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>39</version>
+    <version>40</version>
     <relativePath />
   </parent>
 

From 87edd76eab050c75ac3bb7619678b32a5503e2e8 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 26 Jul 2023 00:24:46 +0200
Subject: [PATCH 21/23] [MSHARED-1293] Refresh download page

---
 src/site/xdoc/download.xml.vm | 117 ++++++++++------------------------
 1 file changed, 33 insertions(+), 84 deletions(-)

diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 666d997..2b848a9 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -23,102 +23,51 @@ under the License.
   <properties>
     <title>Download ${project.name} Source</title>
   </properties>
+
   <body>
     <section name="Download ${project.name} ${project.version} Source">
 
-      <p>${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
-      ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.</p>
-
-      <p>You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
-      hours to reach all mirrors.<p/>
-
-      <p>In order to guard against corrupted downloads/installations, it is highly recommended to
-      <a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
-      of the release bundles against the public <a href="https://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
-      developers.</p>
+      <p><strong>${project.name} ${project.version}</strong> is distributed in source format.</p>
 
-      <p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
+      <p>Use a source archive if you intend to build <strong>${project.name}</strong> yourself.</p>
 
-      <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="/guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
-
-      <a name="mirror"/>
-      <subsection name="Mirror">
-
-        <p>
-          [if-any logo]
-          <a href="[link]">
-            <img align="right" src="[logo]" border="0"
-                 alt="logo"/>
-          </a>
-          [end]
-          The currently selected mirror is
-          <b>[preferred]</b>.
-          If you encounter a problem with this mirror,
-          please select another mirror.
-          If all mirrors are failing, there are
-          <i>backup</i>
-          mirrors
-          (at the end of the mirrors list) that should be available.
-        </p>
+      <p>Otherwise, simply use the ready-made binary artifacts from <strong>central repository</strong>.</p>
 
-        <form action="[location]" method="get" id="SelectMirror">
-          Other mirrors:
-          <select name="Preferred">
-            [if-any http]
-            [for http]
-            <option value="[http]">[http]</option>
-            [end]
-            [end]
-            [if-any ftp]
-            [for ftp]
-            <option value="[ftp]">[ftp]</option>
-            [end]
-            [end]
-            [if-any backup]
-            [for backup]
-            <option value="[backup]">[backup] (backup)</option>
-            [end]
-            [end]
-          </select>
-          <input type="submit" value="Change"/>
-        </form>
+      <p><strong>${project.name}</strong> is distributed under the <a href="https://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
 
-        <p>
-          You may also consult the
-          <a href="http://www.apache.org/mirrors/">complete list of
-            mirrors.</a>
+      <subsection name="Files">
+        
+        <p>This is the current stable version of <strong>${project.name}</strong>.</p>
+
+        <table>
+          <thead>
+            <tr>
+              <th></th>
+              <th>Link</th>
+              <th>Checksum</th>
+              <th>Signature</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>${project.name} ${project.version} (Source zip)</td>
+              <td><a href="https://dlcdn.apache.org/maven/shared/${project.artifactId}-${project.version}-source-release.zip">${project.artifactId}-${project.version}-source-release.zip</a></td>
+              <td><a href="https://downloads.apache.org/maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha512">${project.artifactId}-${project.version}-source-release.zip.sha512</a></td>
+              <td><a href="https://downloads.apache.org/maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc">${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
+            </tr>
+          </tbody>
+        </table>
+
+        <p>It is essential that you <a href="https://www.apache.org/info/verification.html">verify the integrity</a> of the downloaded file
+          using the checksum (.sha512 file)
+          or using the signature (.asc file) against the public <a href="https://downloads.apache.org/maven/KEYS">KEYS</a> used by the Apache Maven developers.
         </p>
 
       </subsection>
-      
-      <subsection name="${project.name} ${project.version}">
-        
-      <p>This is the current stable version of ${project.name}.</p>
-        
-      <table>
-        <thead>
-          <tr>
-            <th></th>
-            <th>Link</th>
-            <th>Checksum</th>
-            <th>Signature</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>${project.name} ${project.version} (Source zip)</td>
-            <td><a href="[preferred]maven/shared/${project.artifactId}-${project.version}-source-release.zip">maven/shared/${project.artifactId}-${project.version}-source-release.zip</a></td>
-            <td><a href="https://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha512">maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha512</a></td>
-            <td><a href="https://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc">maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
-          </tr>
-        </tbody>
-      </table>
-      </subsection>
 
       <subsection name="Previous Versions">
-        
-      <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/shared/">archive site</a>.</p>
-
+        <p>It is strongly recommended to use the latest release version of <strong>${project.name}</strong> to take advantage of the newest features and bug fixes.</p>
+        <p>Older non-recommended releases can be found on our <a href="https://archive.apache.org/dist/maven/shared/">archive site</a>.</p>
       </subsection>
     </section>
   </body>

From 482ec069255bb49e7ccaa1c50eb9ea5ed38c6cb4 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 16 Aug 2023 22:56:44 +0200
Subject: [PATCH 22/23] [MSHARED-1297] Prefer JDK features over plexus-utils,
 plexus-io

---
 pom.xml                                       |  10 --
 .../apache/maven/archiver/MavenArchiver.java  |  25 ++-
 .../maven/archiver/MavenArchiverTest.java     | 149 ++++++++++--------
 3 files changed, 101 insertions(+), 83 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e47a1a..b5b9b1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,21 +85,11 @@
     <!--
       Plexus dependencies
     -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-io</artifactId>
-      <version>3.4.1</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
       <version>4.8.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.5.1</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interpolation</artifactId>
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 232decc..cab5ae9 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -56,7 +56,6 @@
 import org.codehaus.plexus.interpolation.RecursionInterceptor;
 import org.codehaus.plexus.interpolation.StringSearchInterpolator;
 import org.codehaus.plexus.interpolation.ValueSource;
-import org.codehaus.plexus.util.StringUtils;
 
 import static org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM;
 import static org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY;
@@ -390,9 +389,10 @@ private void handleExtraExpression(Artifact artifact, List<ValueSource> valueSou
         }
 
         extraExpressions.setProperty("groupIdPath", artifact.getGroupId().replace('.', '/'));
-        if (StringUtils.isNotEmpty(artifact.getClassifier())) {
-            extraExpressions.setProperty("dashClassifier", "-" + artifact.getClassifier());
-            extraExpressions.setProperty("dashClassifier?", "-" + artifact.getClassifier());
+        String classifier = artifact.getClassifier();
+        if (classifier != null && !classifier.isEmpty()) {
+            extraExpressions.setProperty("dashClassifier", "-" + classifier);
+            extraExpressions.setProperty("dashClassifier?", "-" + classifier);
         } else {
             extraExpressions.setProperty("dashClassifier", "");
             extraExpressions.setProperty("dashClassifier?", "");
@@ -772,7 +772,7 @@ public static Optional<Instant> parseBuildOutputTimestamp(String outputTimestamp
         }
 
         // Number representing seconds since the epoch
-        if ((outputTimestamp != null && !outputTimestamp.isEmpty()) && StringUtils.isNumeric(outputTimestamp)) {
+        if (isNumeric(outputTimestamp)) {
             return Optional.of(Instant.ofEpochSecond(Long.parseLong(outputTimestamp)));
         }
 
@@ -800,6 +800,21 @@ public static Optional<Instant> parseBuildOutputTimestamp(String outputTimestamp
         }
     }
 
+    private static boolean isNumeric(String str) {
+
+        if (str.isEmpty()) {
+            return false;
+        }
+
+        for (char c : str.toCharArray()) {
+            if (!Character.isDigit(c)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Configure Reproducible Builds archive creation if a timestamp is provided.
      *
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index e2c27c4..2ad0176 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -23,6 +23,10 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.FileTime;
 import java.time.Instant;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
@@ -38,6 +42,7 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 
 import org.apache.maven.artifact.Artifact;
@@ -55,8 +60,6 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.jar.ManifestException;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystemSession;
 import org.junit.jupiter.api.Test;
@@ -69,6 +72,7 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 class MavenArchiverTest {
@@ -239,8 +243,13 @@ void testRecreation() throws Exception {
         MavenArchiveConfiguration config = new MavenArchiveConfiguration();
         config.setForced(false);
 
-        File directory = new File("target/maven-archiver");
-        org.apache.commons.io.FileUtils.deleteDirectory(directory);
+        Path directory = Paths.get("target", "maven-archiver");
+        if (Files.exists(directory)) {
+            try (Stream<Path> paths = Files.walk(directory)) {
+                paths.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+            }
+        }
+
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
 
@@ -248,9 +257,10 @@ void testRecreation() throws Exception {
         jarFile.setLastModified(history);
         long time = jarFile.lastModified();
 
-        List<File> files = FileUtils.getFiles(directory, "**/**", null, true);
-        for (File file : files) {
-            assertThat(file.setLastModified(time)).isTrue();
+        try (Stream<Path> paths = Files.walk(directory)) {
+            FileTime fileTime = FileTime.fromMillis(time);
+            paths.forEach(path -> assertThatCode(() -> Files.setLastModifiedTime(path, fileTime))
+                    .doesNotThrowAnyException());
         }
 
         archiver.createArchive(session, project, config);
@@ -527,8 +537,7 @@ void testManifestEntries() throws Exception {
         assertThat(manifest)
                 .containsEntry(new Attributes.Name("Build-Jdk-Spec"), System.getProperty("java.specification.version"));
 
-        assertThat(StringUtils.isEmpty(manifest.getValue(new Attributes.Name("keyWithEmptyValue"))))
-                .isTrue();
+        assertThat(manifest.getValue(new Attributes.Name("keyWithEmptyValue"))).isEmpty();
         assertThat(manifest).containsKey(new Attributes.Name("keyWithEmptyValue"));
 
         manifest = jarFileManifest.getAttributes("UserSection");
@@ -616,8 +625,8 @@ void testDefaultClassPathValue() throws Exception {
         final Manifest manifest = getJarFileManifest(jarFile);
         String classPath = manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
-                .containsExactly("dummy1-1.0.jar", "dummy2-1.5.jar", "dummy3-2.0.jar");
+        assertThat(classPath.split(" "))
+                .containsExactly("dummy1-1.0.jar", "dummy2-1.5.jar", "dummy3-2.0-classifier.jar");
     }
 
     private void deleteAndAssertNotPresent(File jarFile) {
@@ -650,8 +659,8 @@ void testDefaultClassPathValue_WithSnapshot() throws Exception {
         final Manifest manifest = getJarFileManifest(jarFile);
         String classPath = manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
-                .containsExactly("dummy1-1.1-20081022.112233-1.jar", "dummy2-1.5.jar", "dummy3-2.0.jar");
+        assertThat(classPath.split(" "))
+                .containsExactly("dummy1-1.1-20081022.112233-1.jar", "dummy2-1.5.jar", "dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -674,21 +683,21 @@ void testMavenRepoClassPathValue() throws Exception {
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries)
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
                         "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
+        assertThat(classPath.split(" "))
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
                         "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -712,15 +721,16 @@ void shouldCreateArchiveWithSimpleClassPathLayoutWhileSettingSimpleLayoutExplici
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
-        assertThat(classPathEntries).containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
+        assertThat(classPathEntries)
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
 
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
-                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+        assertThat(classPath.split(" "))
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -745,15 +755,16 @@ void shouldCreateArchiveCustomerLayoutSimple() throws Exception {
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
-        assertThat(classPathEntries).containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
+        assertThat(classPathEntries)
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
 
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
-                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+        assertThat(classPath.split(" "))
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -778,16 +789,16 @@ void shouldCreateArchiveCustomLayoutSimpleNonUnique() throws Exception {
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries)
-                .containsExactly("lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+                .containsExactly("lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
 
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
-                .containsExactly("lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+        assertThat(classPath.split(" "))
+                .containsExactly("lib/dummy1-1.0.1.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -812,22 +823,22 @@ void shouldCreateArchiveCustomLayoutRepository() throws Exception {
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries)
                 .containsExactly(
                         "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
                         "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
 
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
+        assertThat(classPath.split(" "))
                 .containsExactly(
                         "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.jar",
                         "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -852,22 +863,22 @@ void shouldCreateArchiveCustomLayoutRepositoryNonUnique() throws Exception {
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries)
                 .containsExactly(
                         "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.1.jar",
                         "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
 
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
+        assertThat(classPath.split(" "))
                 .containsExactly(
                         "lib/org/apache/dummy/dummy1/1.0.1/dummy1-1.0.1.jar",
                         "lib/org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "lib/org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -890,14 +901,15 @@ void shouldCreateArchiveWithSimpleClassPathLayoutUsingDefaults() throws Exceptio
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
-        assertThat(classPathEntries).containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
+        assertThat(classPathEntries)
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
-                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0.jar");
+        assertThat(classPath.split(" "))
+                .containsExactly("lib/dummy1-1.0.jar", "lib/dummy2-1.5.jar", "lib/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -920,21 +932,21 @@ void testMavenRepoClassPathValue_WithSnapshot() throws Exception {
         assertThat(jarFile).exists();
 
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries)
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.1-SNAPSHOT/dummy1-1.1-20081022.112233-1.jar",
                         "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
+        assertThat(classPath.split(" "))
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.1-SNAPSHOT/dummy1-1.1-20081022.112233-1.jar",
                         "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -959,22 +971,22 @@ void testCustomClassPathValue() throws Exception {
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries)
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.0/TEST-dummy1-1.0.jar",
                         "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0-classifier.jar");
 
         final Manifest manifest1 = getJarFileManifest(jarFile);
         String classPath = manifest1.getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
+        assertThat(classPath.split(" "))
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.0/TEST-dummy1-1.0.jar",
                         "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -999,21 +1011,21 @@ void testCustomClassPathValue_WithSnapshotResolvedVersion() throws Exception {
         assertThat(jarFile).exists();
 
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries)
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-20081022.112233-1.jar",
                         "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
+        assertThat(classPath.split(" "))
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-20081022.112233-1.jar",
                         "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -1038,19 +1050,19 @@ void testCustomClassPathValue_WithSnapshotForcingBaseVersion() throws Exception
         archiver.createArchive(session, project, config);
         assertThat(jarFile).exists();
         Manifest manifest = archiver.getManifest(session, project, config);
-        String[] classPathEntries = StringUtils.split(
-                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()), " ");
+        String[] classPathEntries =
+                new String(manifest.getMainAttributes().getValue("Class-Path").getBytes()).split(" ");
         assertThat(classPathEntries[0]).isEqualTo("org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-SNAPSHOT.jar");
         assertThat(classPathEntries[1]).isEqualTo("org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar");
-        assertThat(classPathEntries[2]).isEqualTo("org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+        assertThat(classPathEntries[2]).isEqualTo("org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0-classifier.jar");
 
         String classPath = getJarFileManifest(jarFile).getMainAttributes().getValue(Attributes.Name.CLASS_PATH);
         assertThat(classPath).isNotNull();
-        assertThat(StringUtils.split(classPath, " "))
+        assertThat(classPath.split(" "))
                 .containsExactly(
                         "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-SNAPSHOT.jar",
                         "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar",
-                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0.jar");
+                        "org/apache/dummy/bar/dummy3/2.0/TEST-dummy3-2.0-classifier.jar");
     }
 
     @Test
@@ -1185,6 +1197,7 @@ private MockArtifact getMockArtifact3() {
         artifact3.setVersion("2.0");
         artifact3.setScope("runtime");
         artifact3.setType("jar");
+        artifact3.setClassifier("classifier");
         artifact3.setFile(getClasspathFile(artifact3.getArtifactId() + "-" + artifact3.getVersion() + ".jar"));
         return artifact3;
     }

From 1602aa4d149d318f992433ca9f0a660ff55e95c5 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sat, 19 Aug 2023 12:47:47 +0200
Subject: [PATCH 23/23] [maven-release-plugin] prepare release
 maven-archiver-3.6.1

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b5b9b1a..fb32382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-archiver</artifactId>
-  <version>3.6.1-SNAPSHOT</version>
+  <version>3.6.1</version>
 
   <name>Apache Maven Archiver</name>
   <description>Provides utility methods for creating JARs and other archive files from a Maven project.</description>
@@ -36,7 +36,7 @@
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-archiver.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archiver.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>maven-archiver-3.6.1</tag>
     <url>https://github.com/apache/maven-archiver/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
@@ -57,7 +57,7 @@
   <properties>
     <mavenVersion>3.2.5</mavenVersion>
     <javaVersion>8</javaVersion>
-    <project.build.outputTimestamp>2022-06-23T12:18:27Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-08-19T10:47:34Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>