[MSHARED-1090] Update module

pom.xml

@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>34</version>
+    <version>36</version>
     <relativePath/>
   </parent>
 
@@ -60,35 +60,40 @@
     </site>
   </distributionManagement>
   <properties>
-    <javaVersion>7</javaVersion>
-    <mavenVersion>3.1.0</mavenVersion>
+    <javaVersion>8</javaVersion>
+    <slf4jVersion>1.7.36</slf4jVersion>
     <project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
-    <!-- Maven -->
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.3</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4jVersion}</version>
     </dependency>
 
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.11.0</version>
     </dependency>
+
     <!-- Test -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4jVersion}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -99,7 +104,6 @@
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
-          <useJava5>true</useJava5>
           <version>1.1.0</version>
           <models>
             <model>src/main/mdo/fileset.mdo</model>

src/main/java/org/apache/maven/shared/model/fileset/mappers/FlatFileNameMapper.java

@@ -31,19 +31,19 @@
 public class FlatFileNameMapper
     implements FileNameMapper
 {
-    /** {@inheritDoc} */
+    @Override
     public void setFrom( String from )
     {
         // nop
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void setTo( String to )
     {
         // nop
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String mapFileName( String sourceFileName )
     {
         return new File( sourceFileName ).getName();

src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java

@@ -89,7 +89,7 @@ public void setCaseSensitive( boolean caseSensitive )
         this.caseSensitive = caseSensitive;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void setFrom( String from )
     {
         int index = from.lastIndexOf( "*" );
@@ -107,7 +107,7 @@ public void setFrom( String from )
         postfixLength = fromPostfix.length();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void setTo( String to )
     {
         int index = to.lastIndexOf( "*" );
@@ -123,7 +123,7 @@ public void setTo( String to )
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String mapFileName( String sourceFileName )
     {
         if ( fromPrefix == null || !modifyName( sourceFileName ).startsWith( modifyName( fromPrefix ) )

src/main/java/org/apache/maven/shared/model/fileset/mappers/IdentityMapper.java

@@ -28,19 +28,19 @@
 public class IdentityMapper
     implements FileNameMapper
 {
-    /** {@inheritDoc} */
+    @Override
     public void setFrom( String from )
     {
         // nop
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void setTo( String to )
     {
         // nop
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String mapFileName( String sourceFileName )
     {
         return sourceFileName;

src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java

@@ -31,19 +31,19 @@ public class MergingMapper
 {
     private String mergedFile = null;
 
-    /** {@inheritDoc} */
+    @Override
     public void setFrom( String from )
     {
         // nop
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void setTo( String to )
     {
         mergedFile = to;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String mapFileName( String sourceFileName )
     {
         return mergedFile;

src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java

@@ -33,7 +33,7 @@
 public class PackageNameMapper
     extends GlobPatternMapper
 {
-    /** {@inheritDoc} */
+    @Override
     protected String extractVariablePart( String name )
     {
         String var = name.substring( prefixLength, name.length() - postfixLength );

src/main/java/org/apache/maven/shared/model/fileset/mappers/RegexpPatternMapper.java

@@ -34,19 +34,19 @@ public class RegexpPatternMapper
     private Pattern fromPattern;
     private String toReplaceExpression;
 
-    /** {@inheritDoc} */
+    @Override
     public void setFrom( String from )
     {
         this.fromPattern = Pattern.compile( from );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void setTo( String to )
     {
         this.toReplaceExpression = to;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String mapFileName( String sourceFileName )
     {
         Matcher matcher = this.fromPattern.matcher( sourceFileName );

src/main/java/org/apache/maven/shared/model/fileset/mappers/UnPackageNameMapper.java

@@ -34,7 +34,7 @@
 public class UnPackageNameMapper
     extends GlobPatternMapper
 {
-    /** {@inheritDoc} */
+    @Override
     protected String extractVariablePart( String name )
     {
         String var = name.substring( prefixLength, name.length() - postfixLength );