Skip to content

Commit 18269d1

Browse files
committed
Upgrade to parent pom 45
1 parent 9a7d780 commit 18269d1

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

maven-wrapper-plugin/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ under the License.
9494
<dependency>
9595
<groupId>org.apache.maven.plugin-tools</groupId>
9696
<artifactId>maven-plugin-annotations</artifactId>
97+
<version>${version.maven-plugin-tools}</version>
9798
<scope>provided</scope>
9899
</dependency>
99100

maven-wrapper-plugin/src/test/java/org/apache/maven/plugins/wrapper/WrapperMojoTest.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,14 @@
1919
package org.apache.maven.plugins.wrapper;
2020

2121
import org.apache.maven.settings.Settings;
22-
import org.junit.jupiter.api.Assertions;
23-
import org.junit.jupiter.api.DisplayNameGeneration;
24-
import org.junit.jupiter.api.DisplayNameGenerator;
2522
import org.junit.jupiter.api.Test;
2623

27-
import static org.junit.jupiter.api.Assertions.*;
24+
import static org.junit.jupiter.api.Assertions.assertEquals;
2825

29-
@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
3026
class WrapperMojoTest {
3127

3228
@Test
33-
void user_supplied_repo_url_gets_trailing_slash_trimmed() {
29+
void userSuppliedRepoUrlGetsTrailingSlashTrimmed() {
3430
// given
3531
Settings settings = new Settings();
3632
WrapperMojo wrapperMojo = new WrapperMojo();
@@ -39,11 +35,11 @@ void user_supplied_repo_url_gets_trailing_slash_trimmed() {
3935
String determinedRepoUrl = wrapperMojo.determineRepoUrl(WrapperMojo.DEFAULT_REPOURL + "/", settings);
4036

4137
// then
42-
Assertions.assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
38+
assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
4339
}
4440

4541
@Test
46-
void null_repo_url_not_used() {
42+
void nullRepoUrlNotUsed() {
4743
// given
4844
Settings settings = new Settings();
4945
WrapperMojo wrapperMojo = new WrapperMojo();
@@ -52,11 +48,11 @@ void null_repo_url_not_used() {
5248
String determinedRepoUrl = wrapperMojo.determineRepoUrl(null, settings);
5349

5450
// then
55-
Assertions.assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
51+
assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
5652
}
5753

5854
@Test
59-
void empty_repo_url_not_used() {
55+
void emptyRepoUrlNotUsed() {
6056
// given
6157
Settings settings = new Settings();
6258
WrapperMojo wrapperMojo = new WrapperMojo();
@@ -65,11 +61,11 @@ void empty_repo_url_not_used() {
6561
String determinedRepoUrl = wrapperMojo.determineRepoUrl("", settings);
6662

6763
// then
68-
Assertions.assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
64+
assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
6965
}
7066

7167
@Test
72-
void slash_repo_url_not_used() {
68+
void slashRepoUrlNotUsed() {
7369
// given
7470
Settings settings = new Settings();
7571
WrapperMojo wrapperMojo = new WrapperMojo();
@@ -78,6 +74,6 @@ void slash_repo_url_not_used() {
7874
String determinedRepoUrl = wrapperMojo.determineRepoUrl("/", settings);
7975

8076
// then
81-
Assertions.assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
77+
assertEquals(WrapperMojo.DEFAULT_REPOURL, determinedRepoUrl);
8278
}
8379
}

maven-wrapper/src/test/java/org/apache/maven/wrapper/HashAlgorithmVerifierTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public class HashAlgorithmVerifierTest {
3535

3636
@TempDir
37-
public File temporaryFolder;
37+
private File temporaryFolder;
3838

3939
private Verifier verifier = new HashAlgorithmVerifier();
4040

maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
*/
5656
public class InstallerTest {
5757
@TempDir
58-
public File tempFolder;
58+
private File tempFolder;
5959

6060
private Path testDir;
6161

maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void testRelativeDistUrl() throws Exception {
191191
}
192192

193193
@Test
194-
void testEnvironmentVariableOverwrite_simpleCase() throws Exception {
194+
void testEnvironmentVariableOverwriteSimpleCase() throws Exception {
195195
final Map<String, String> environmentVariables = new HashMap<>();
196196
environmentVariables.put(MVNW_REPOURL, "https://repo/test");
197197

@@ -206,7 +206,7 @@ void testEnvironmentVariableOverwrite_simpleCase() throws Exception {
206206
}
207207

208208
@Test
209-
void testEnvironmentVariableOverwrite_mvnwRepoUrl_trailingSlash() throws Exception {
209+
void testEnvironmentVariableOverwriteMvnwRepoUrlTrailingSlash() throws Exception {
210210
final Map<String, String> environmentVariables = new HashMap<>();
211211
environmentVariables.put(MVNW_REPOURL, "https://repo/test/");
212212
properties = new Properties();
@@ -220,7 +220,7 @@ void testEnvironmentVariableOverwrite_mvnwRepoUrl_trailingSlash() throws Excepti
220220
}
221221

222222
@Test
223-
void testEnvironmentVariableOverwrite_packageName() throws Exception {
223+
void testEnvironmentVariableOverwritePackageName() throws Exception {
224224
final Map<String, String> environmentVariables = new HashMap<>();
225225
environmentVariables.put(MVNW_REPOURL, "https://repo/test");
226226
properties = new Properties();
@@ -235,7 +235,7 @@ void testEnvironmentVariableOverwrite_packageName() throws Exception {
235235
}
236236

237237
@Test
238-
void testEnvironmentVariableOverwrite_packageName_trailingSpace() throws Exception {
238+
void testEnvironmentVariableOverwritePackageNameTrailingSpace() throws Exception {
239239
final Map<String, String> environmentVariables = new HashMap<>();
240240
environmentVariables.put(MVNW_REPOURL, "https://repo/test/");
241241
properties = new Properties();

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>org.apache.maven</groupId>
2525
<artifactId>maven-parent</artifactId>
26-
<version>42</version>
26+
<version>45</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.wrapper</groupId>

0 commit comments

Comments
 (0)