[MSHARED-1179] - Upgrade Parent to 39

.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"

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>

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,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.archiver;
 
 /**
  * Capture common manifest configuration.
  *
  * @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;
     }
 }