[maven-wrapper] branch master updated: [MWRAPPER-34] switch full wrapper (jar and plugin) to Java 7

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git


The following commit(s) were added to refs/heads/master by this push:
     new d32b9e8  [MWRAPPER-34] switch full wrapper (jar and plugin) to Java 7
d32b9e8 is described below

commit d32b9e8fb7aa8bc2f115e487e6b7db8c545c6d8b
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Thu Dec 9 21:40:47 2021 +0100

    [MWRAPPER-34] switch full wrapper (jar and plugin) to Java 7
---
 .../org/apache/maven/plugins/wrapper/WrapperMojo.java  | 18 +++++++++++++-----
 maven-wrapper/pom.xml                                  |  6 +-----
 pom.xml                                                |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git 
a/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
 
b/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
index 8525c7d..d8c8b5b 100644
--- 
a/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
+++ 
b/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
@@ -24,11 +24,13 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Properties;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
 import org.apache.maven.Maven;
@@ -45,6 +47,7 @@ import 
org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate;
 import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import 
org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
 import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.components.io.fileselectors.FileInfo;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 
 import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -173,10 +176,15 @@ public class WrapperMojo extends AbstractMojo
         unarchiver.setSourceFile( artifact.getFile() );
         if ( !includeDebugScript )
         {
-            unarchiver.setFileSelectors( new FileSelector[] 
-                            {
-                                f -> !f.getName().contains( "Debug" ) 
-                            } );
+            unarchiver.setFileSelectors( new FileSelector[] { new 
FileSelector()
+            {
+                public boolean isSelected( @Nonnull
+                FileInfo fileInfo )
+                    throws IOException
+                {
+                    return !fileInfo.getName().contains( "Debug" );
+                }
+            } } );
         }
         unarchiver.extract();
     }
@@ -219,7 +227,7 @@ public class WrapperMojo extends AbstractMojo
             + "# specific language governing permissions and limitations\n"
             + "# under the License.\n";
         
-        try ( BufferedWriter out = Files.newBufferedWriter( 
wrapperPropertiesFile ) )
+        try ( BufferedWriter out = Files.newBufferedWriter( 
wrapperPropertiesFile, StandardCharsets.UTF_8 ) )
         {
             out.append( license );
             out.append( "distributionUrl=" + distributionUrl + "\n" );
diff --git a/maven-wrapper/pom.xml b/maven-wrapper/pom.xml
index e313e3e..84df636 100644
--- a/maven-wrapper/pom.xml
+++ b/maven-wrapper/pom.xml
@@ -33,10 +33,6 @@ under the License.
   <name>Maven Wrapper Jar</name>
   <description>Maven Wrapper Jar download, installs and launches installed 
target Maven distribution as part of Maven Wrapper scripts run.</description>
 
-  <properties>
-    <javaVersion>7</javaVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -76,7 +72,7 @@ under the License.
       <scope>test</scope>
       <exclusions>
         <!-- workaround for provided dependency to com:sun:tools on jdk8 -->
-        <!-- this brake enforceBytecodeVersion -->
+        <!-- this breaks enforceBytecodeVersion -->
         <!-- can be removed after switch to jdk8 -->
         <exclusion>
           <groupId>com.sun</groupId>
diff --git a/pom.xml b/pom.xml
index 5a82e39..654cc2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@ under the License.
   <properties>
     <maven.site.path>wrapper-archives/wrapper-LATEST</maven.site.path>
     <mavenVersion>3.1.0</mavenVersion>
-    <javaVersion>8</javaVersion>
+    <javaVersion>7</javaVersion>
     
<project.build.outputTimestamp>2021-11-26T10:03:59Z</project.build.outputTimestamp>
   </properties>