[mvn] Update maven wrapper

.mvn/extensions.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright 2010-2022 the original author or authors.
+ Copyright 2010-2023 the original author or authors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

.mvn/maven.config

@@ -1 +1,2 @@
 -Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5
+-Daether.connector.smartChecksums=false

.mvn/settings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright 2010-2022 the original author or authors.
+ Copyright 2010-2023 the original author or authors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -24,8 +24,13 @@
  <username>${env.CI_DEPLOY_USERNAME}</username>
  <password>${env.CI_DEPLOY_PASSWORD}</password>
  </server>
+ <!-- Used for gh-pages-scm publish via maven-scm-publish-plugin -->
  <server>
- <id>gh-pages</id>
+ <id>gh-pages-scm</id>
+ <configuration>
+ <scmVersionType>branch</scmVersionType>
+ <scmVersion>gh-pages</scmVersion>
+ </configuration>
  </server>
  <server>
  <id>github</id>

.mvn/wrapper/MavenWrapperDownloader.java

@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
  *
- * http:https://www.apache.org/licenses/LICENSE-2.0
+ * https:https://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
@@ -23,85 +23,50 @@
 import java.net.PasswordAuthentication;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.nio.file.StandardOpenOption;
-import java.util.Properties;
 
 public final class MavenWrapperDownloader
 {
- private static final String WRAPPER_VERSION = "3.1.1";
+ private static final String WRAPPER_VERSION = "3.2.0";
 
  private static final boolean VERBOSE = Boolean.parseBoolean( System.getenv( "MVNW_VERBOSE" ) );
 
- /**
- * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
- */
- private static final String DEFAULT_DOWNLOAD_URL =
- "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/" + WRAPPER_VERSION
- + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
- /**
- * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the
- * default one.
- */
- private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties";
-
- /**
- * Path where the maven-wrapper.jar will be saved to.
- */
- private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar";
-
- /**
- * Name of the property which should be used to override the default download url for the wrapper.
- */
- private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
  public static void main( String[] args )
  {
- if ( args.length == 0 )
- {
- System.err.println( " - ERROR projectBasedir parameter missing" );
- System.exit( 1 );
- }
+ log( "Apache Maven Wrapper Downloader " + WRAPPER_VERSION );
 
- log( " - Downloader started" );
- final String dir = args[0].replace( "..", "" ); // Sanitize path
- final Path projectBasedir = Paths.get( dir ).toAbsolutePath().normalize();
- if ( !Files.isDirectory( projectBasedir, LinkOption._LINKS ) )
+ if ( args.length != 2 )
  {
- System.err.println( " - ERROR projectBasedir not exists: " + projectBasedir );
+ System.err.println( " - ERROR wrapperUrl or wrapperJarPath parameter missing" );
  System.exit( 1 );
  }
 
- log( " - Using base directory: " + projectBasedir );
-
- // If the maven-wrapper.properties exists, read it and check if it contains a custom
- // wrapperUrl parameter.
- Path mavenWrapperPropertyFile = projectBasedir.resolve( MAVEN_WRAPPER_PROPERTIES_PATH );
- String url = readWrapperUrl( mavenWrapperPropertyFile );
-
  try
  {
- Path outputFile = projectBasedir.resolve( MAVEN_WRAPPER_JAR_PATH );
- createDirectories( outputFile.getParent() );
- downloadFileFromURL( url, outputFile );
+ log( " - Downloader started" );
+ final URL wrapperUrl = new URL( args[0] );
+ final String jarPath = args[1].replace( "..", "" ); // Sanitize path
+ final Path wrapperJarPath = Paths.get( jarPath ).toAbsolutePath().normalize();
+ downloadFileFromURL( wrapperUrl, wrapperJarPath );
  log( "Done" );
- System.exit( 0 );
  }
  catch ( IOException e )
  {
- System.err.println( "- Error downloading" );
- e.printStackTrace();
+ System.err.println( "- Error downloading: " + e.getMessage() );
+ if ( VERBOSE )
+ {
+ e.printStackTrace();
+ }
  System.exit( 1 );
  }
  }
 
- private static void downloadFileFromURL( String urlString, Path destination ) throws IOException
+ private static void downloadFileFromURL( URL wrapperUrl, Path wrapperJarPath )
+ throws IOException
  {
- log( " - Downloading to: " + destination );
+ log( " - Downloading to: " + wrapperJarPath );
  if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null )
  {
  final String username = System.getenv( "MVNW_USERNAME" );
@@ -115,40 +80,11 @@ protected PasswordAuthentication getPasswordAuthentication()
  }
  } );
  }
- URL website = new URL( urlString );
- try ( InputStream inStream = website.openStream() ) {
- Files.copy( inStream, destination, StandardCopyOption.REPLACE_EXISTING );
- }
- log( " - Downloader complete" );
- }
-
- private static void createDirectories(Path outputPath) throws IOException
- {
- if ( !Files.isDirectory( outputPath, LinkOption._LINKS ) ) {
- Path createDirectories = Files.createDirectories( outputPath );
- log( " - Directories created: " + createDirectories );
- }
- }
-
- private static String readWrapperUrl( Path mavenWrapperPropertyFile )
- {
- String url = DEFAULT_DOWNLOAD_URL;
- if ( Files.exists( mavenWrapperPropertyFile, LinkOption._LINKS ) )
+ try ( InputStream inStream = wrapperUrl.openStream() )
  {
- log( " - Reading property file: " + mavenWrapperPropertyFile );
- try ( InputStream in = Files.newInputStream( mavenWrapperPropertyFile, StandardOpenOption.READ ) )
- {
- Properties mavenWrapperProperties = new Properties();
- mavenWrapperProperties.load( in );
- url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, DEFAULT_DOWNLOAD_URL );
- }
- catch ( IOException e )
- {
- System.err.println( " - ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" );
- }
+ Files.copy( inStream, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING );
  }
- log( " - Downloading from: " + url );
- return url;
+ log( " - Downloader complete" );
  }
 
  private static void log( String msg )

.mvn/wrapper/maven-wrapper.properties

@@ -6,7 +6,7 @@
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
 #
-# http:https://www.apache.org/licenses/LICENSE-2.0
+# https:https://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

mvnw

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
 #
-# http:https://www.apache.org/licenses/LICENSE-2.0
+# https:https://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

mvnw.cmd

@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License. You may obtain a copy of the License at
 @REM
-@REM http:https://www.apache.org/licenses/LICENSE-2.0
+@REM https:https://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright 2010-2022 the original author or authors.
+ Copyright 2010-2023 the original author or authors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.