Skip to content

Commit 9ac3842

Browse files
dkasimovskiydkasimovskiy
committed
build: bump dependencies
1 parent 7c86c97 commit 9ac3842

File tree

8 files changed

+336
-303
lines changed

8 files changed

+336
-303
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424

2525
- name: Set up JDK 1.8
26-
uses: actions/setup-java@v4
26+
uses: actions/setup-java@v5
2727
with:
2828
distribution: 'zulu'
2929
java-version: '8'
@@ -64,7 +64,7 @@ jobs:
6464
- uses: actions/checkout@v4
6565

6666
- name: Set up JDK 1.8
67-
uses: actions/setup-java@v4
67+
uses: actions/setup-java@v5
6868
with:
6969
distribution: 'zulu'
7070
java-version: '8'
@@ -101,7 +101,7 @@ jobs:
101101
- uses: actions/checkout@v4
102102

103103
- name: Set up JDK 1.8
104-
uses: actions/setup-java@v4
104+
uses: actions/setup-java@v5
105105
with:
106106
distribution: 'zulu'
107107
java-version: '8'

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 69 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,96 @@
11
/*
2-
* Copyright 2007-present the original author or authors.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
10+
* http://www.apache.org/licenses/LICENSE-2.0
711
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1518
*/
16-
import java.net.*;
17-
import java.io.*;
18-
import java.nio.channels.*;
19-
import java.util.Properties;
20-
21-
public class MavenWrapperDownloader {
2219

23-
private static final String WRAPPER_VERSION = "0.5.6";
24-
/**
25-
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
26-
*/
27-
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
28-
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
20+
import java.io.IOException;
21+
import java.io.InputStream;
22+
import java.net.Authenticator;
23+
import java.net.PasswordAuthentication;
24+
import java.net.URI;
25+
import java.net.URL;
26+
import java.nio.file.Files;
27+
import java.nio.file.Path;
28+
import java.nio.file.Paths;
29+
import java.nio.file.StandardCopyOption;
30+
import java.util.concurrent.ThreadLocalRandom;
2931

30-
/**
31-
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
32-
* use instead of the default one.
33-
*/
34-
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
35-
".mvn/wrapper/maven-wrapper.properties";
32+
public final class MavenWrapperDownloader {
33+
private static final String WRAPPER_VERSION = "3.3.4";
3634

37-
/**
38-
* Path where the maven-wrapper.jar will be saved to.
39-
*/
40-
private static final String MAVEN_WRAPPER_JAR_PATH =
41-
".mvn/wrapper/maven-wrapper.jar";
35+
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));
4236

43-
/**
44-
* Name of the property which should be used to override the default download url for the wrapper.
45-
*/
46-
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
37+
public static void main(String[] args) {
38+
log("Apache Maven Wrapper Downloader " + WRAPPER_VERSION);
4739

48-
public static void main(String args[]) {
49-
System.out.println("- Downloader started");
50-
File baseDirectory = new File(args[0]);
51-
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
52-
53-
// If the maven-wrapper.properties exists, read it and check if it contains a custom
54-
// wrapperUrl parameter.
55-
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
56-
String url = DEFAULT_DOWNLOAD_URL;
57-
if(mavenWrapperPropertyFile.exists()) {
58-
FileInputStream mavenWrapperPropertyFileInputStream = null;
59-
try {
60-
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
61-
Properties mavenWrapperProperties = new Properties();
62-
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
63-
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
64-
} catch (IOException e) {
65-
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
66-
} finally {
67-
try {
68-
if(mavenWrapperPropertyFileInputStream != null) {
69-
mavenWrapperPropertyFileInputStream.close();
70-
}
71-
} catch (IOException e) {
72-
// Ignore ...
73-
}
74-
}
40+
if (args.length != 2) {
41+
System.err.println(" - ERROR wrapperUrl or wrapperJarPath parameter missing");
42+
System.exit(1);
7543
}
76-
System.out.println("- Downloading from: " + url);
7744

78-
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
79-
if(!outputFile.getParentFile().exists()) {
80-
if(!outputFile.getParentFile().mkdirs()) {
81-
System.out.println(
82-
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
83-
}
84-
}
85-
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
8645
try {
87-
downloadFileFromURL(url, outputFile);
88-
System.out.println("Done");
89-
System.exit(0);
90-
} catch (Throwable e) {
91-
System.out.println("- Error downloading");
92-
e.printStackTrace();
46+
log(" - Downloader started");
47+
final URL wrapperUrl = URI.create(args[0]).toURL();
48+
final Path baseDir = Paths.get(".").toAbsolutePath().normalize();
49+
final Path wrapperJarPath = baseDir.resolve(args[1]).normalize();
50+
if (!wrapperJarPath.startsWith(baseDir)) {
51+
throw new IOException("Invalid path: outside of allowed directory");
52+
}
53+
downloadFileFromURL(wrapperUrl, wrapperJarPath);
54+
log("Done");
55+
} catch (IOException e) {
56+
System.err.println("- Error downloading: " + e.getMessage());
57+
if (VERBOSE) {
58+
e.printStackTrace();
59+
}
9360
System.exit(1);
9461
}
9562
}
9663

97-
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
64+
private static void downloadFileFromURL(URL wrapperUrl, Path wrapperJarPath)
65+
throws IOException {
66+
log(" - Downloading to: " + wrapperJarPath);
9867
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
99-
String username = System.getenv("MVNW_USERNAME");
100-
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
68+
final String username = System.getenv("MVNW_USERNAME");
69+
final char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
10170
Authenticator.setDefault(new Authenticator() {
10271
@Override
10372
protected PasswordAuthentication getPasswordAuthentication() {
10473
return new PasswordAuthentication(username, password);
10574
}
10675
});
10776
}
108-
URL website = new URL(urlString);
109-
ReadableByteChannel rbc;
110-
rbc = Channels.newChannel(website.openStream());
111-
FileOutputStream fos = new FileOutputStream(destination);
112-
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
113-
fos.close();
114-
rbc.close();
77+
Path temp = wrapperJarPath
78+
.getParent()
79+
.resolve(wrapperJarPath.getFileName() + "."
80+
+ Long.toUnsignedString(ThreadLocalRandom.current().nextLong()) + ".tmp");
81+
try (InputStream inStream = wrapperUrl.openStream()) {
82+
Files.copy(inStream, temp, StandardCopyOption.REPLACE_EXISTING);
83+
Files.move(temp, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING);
84+
} finally {
85+
Files.deleteIfExists(temp);
86+
}
87+
log(" - Downloader complete");
88+
}
89+
90+
private static void log(String msg) {
91+
if (VERBOSE) {
92+
System.out.println(msg);
93+
}
11594
}
11695

11796
}

‎.mvn/wrapper/maven-wrapper.jar‎

12.1 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
1+
wrapperVersion=3.3.4
2+
distributionType=source
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
4+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

0 commit comments

Comments
 (0)