Skip to content

Commit

Permalink
[mvn] Update maven wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
hazendaz committed Apr 27, 2024
1 parent bb8c016 commit c183a16
Show file tree
Hide file tree
Showing 6 changed files with 179 additions and 182 deletions.
12 changes: 0 additions & 12 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed under the GPL License. You may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
PURPOSE.
-->
<extensions>
<extension>
<groupId>fr.jcgay.maven</groupId>
Expand Down
12 changes: 0 additions & 12 deletions .mvn/settings.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed under the GPL License. You may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
PURPOSE.
-->
<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">

Expand Down
57 changes: 26 additions & 31 deletions .mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,76 +21,71 @@
import java.io.InputStream;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
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.StandardCopyOption;
import java.util.concurrent.ThreadLocalRandom;

public final class MavenWrapperDownloader
{
private static final String WRAPPER_VERSION = "3.2.0";
public final class MavenWrapperDownloader {
private static final String WRAPPER_VERSION = "3.3.1";

private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));

public static void main(String[] args)
{
public static void main(String[] args) {
log("Apache Maven Wrapper Downloader " + WRAPPER_VERSION);

if ( args.length != 2 )
{
if (args.length != 2) {
System.err.println(" - ERROR wrapperUrl or wrapperJarPath parameter missing");
System.exit(1);
}

try
{
try {
log(" - Downloader started");
final URL wrapperUrl = new URL( args[0] );
final URL wrapperUrl = URI.create(args[0]).toURL();
final String jarPath = args[1].replace("..", ""); // Sanitize path
final Path wrapperJarPath = Paths.get(jarPath).toAbsolutePath().normalize();
downloadFileFromURL(wrapperUrl, wrapperJarPath);
log("Done");
}
catch ( IOException e )
{
} catch (IOException e) {
System.err.println("- Error downloading: " + e.getMessage());
if ( VERBOSE )
{
if (VERBOSE) {
e.printStackTrace();
}
System.exit(1);
}
}

private static void downloadFileFromURL(URL wrapperUrl, Path wrapperJarPath)
throws IOException
{
throws IOException {
log(" - Downloading to: " + wrapperJarPath);
if ( System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null )
{
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
final String username = System.getenv("MVNW_USERNAME");
final char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
Authenticator.setDefault(new Authenticator()
{
Authenticator.setDefault(new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication()
{
return new PasswordAuthentication( username, password );
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(username, password);
}
});
}
try ( InputStream inStream = wrapperUrl.openStream() )
{
Files.copy(inStream, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING);
Path temp = wrapperJarPath
.getParent()
.resolve(wrapperJarPath.getFileName() + "."
+ Long.toUnsignedString(ThreadLocalRandom.current().nextLong()) + ".tmp");
try (InputStream inStream = wrapperUrl.openStream()) {
Files.copy(inStream, temp, StandardCopyOption.REPLACE_EXISTING);
Files.move(temp, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING);
} finally {
Files.deleteIfExists(temp);
}
log(" - Downloader complete");
}

private static void log(String msg)
{
if ( VERBOSE )
{
private static void log(String msg) {
if (VERBOSE) {
System.out.println(msg);
}
}
Expand Down
3 changes: 2 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.1
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar
Loading

0 comments on commit c183a16

Please sign in to comment.