Skip to content

Commit e7e0cbb

Browse files
[MNG-8179] Upgrade Parent to 43
1 parent 5223ff6 commit e7e0cbb

File tree

12 files changed

+36
-16
lines changed

12 files changed

+36
-16
lines changed

maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ private int ordinalOfCksumPolicy(String policy) {
166166
}
167167
}
168168

169-
@SuppressWarnings("checkstyle:magicnumber")
170169
private int ordinalOfUpdatePolicy(String policy) {
171170
if (ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY.equals(policy)) {
172171
return 1440;

maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import org.apache.maven.building.Problem.Severity;
2222
import org.junit.Test;
2323

24-
import static org.junit.Assert.*;
24+
import static org.junit.Assert.assertEquals;
25+
import static org.junit.Assert.assertNotNull;
2526

2627
public class DefaultProblemCollectorTest {
2728

maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@
3535
import org.apache.maven.plugin.version.PluginVersionResolutionException;
3636
import org.apache.maven.project.MavenProject;
3737

38-
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.*;
38+
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.A;
39+
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.B;
40+
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.C;
41+
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.X;
42+
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Y;
43+
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Z;
44+
import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.getProjectBuildList;
3945

4046
/**
4147
* @author Kristian Rosenvold
@@ -57,7 +63,7 @@ public void testConcurrencyGraphPrimaryVersion()
5763

5864
final List<MavenProject> subsequent = graph.markAsFinished(A);
5965
assertEquals(2, subsequent.size());
60-
assertEquals(ProjectDependencyGraphStub.B, subsequent.get(0));
66+
assertEquals(B, subsequent.get(0));
6167
assertEquals(C, subsequent.get(1));
6268

6369
final List<MavenProject> bDescendants = graph.markAsFinished(B);

maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java

+15-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,21 @@
2727
import org.apache.maven.lifecycle.DefaultLifecycles;
2828
import org.apache.maven.lifecycle.Lifecycle;
2929

30-
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.*;
30+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.CLEAN;
31+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.COMPILE;
32+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.INITIALIZE;
33+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.INSTALL;
34+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PACKAGE;
35+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.POST_CLEAN;
36+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.POST_SITE;
37+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PRE_CLEAN;
38+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PRE_SITE;
39+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PROCESS_RESOURCES;
40+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PROCESS_TEST_RESOURCES;
41+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.SITE;
42+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.SITE_DEPLOY;
43+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.TEST;
44+
import static org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.VALIDATE;
3145

3246
/**
3347
* @author Kristian Rosenvold

maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java

-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
* @author jdcasey
3838
*/
3939
public final class CLIReportingUtils {
40-
// CHECKSTYLE_OFF: MagicNumber
4140
public static final long MB = 1024 * 1024;
4241

4342
private static final long ONE_SECOND = 1000L;
@@ -47,7 +46,6 @@ public final class CLIReportingUtils {
4746
private static final long ONE_HOUR = 60 * ONE_MINUTE;
4847

4948
private static final long ONE_DAY = 24 * ONE_HOUR;
50-
// CHECKSTYLE_ON: MagicNumber
5149

5250
public static final String BUILD_VERSION_PROPERTY = "version";
5351

@@ -159,13 +157,11 @@ public static String formatTimestamp(long timestamp) {
159157
}
160158

161159
public static String formatDuration(long duration) {
162-
// CHECKSTYLE_OFF: MagicNumber
163160
long ms = duration % 1000;
164161
long s = (duration / ONE_SECOND) % 60;
165162
long m = (duration / ONE_MINUTE) % 60;
166163
long h = (duration / ONE_HOUR) % 24;
167164
long d = duration / ONE_DAY;
168-
// CHECKSTYLE_ON: MagicNumber
169165

170166
String format;
171167
if (d > 0) {

maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@
6868
import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
6969
import org.apache.maven.cli.logging.Slf4jLoggerManager;
7070
import org.apache.maven.cli.logging.Slf4jStdoutLogger;
71-
import org.apache.maven.cli.transfer.*;
71+
import org.apache.maven.cli.transfer.ConsoleMavenTransferListener;
72+
import org.apache.maven.cli.transfer.QuietMavenTransferListener;
73+
import org.apache.maven.cli.transfer.SimplexTransferListener;
74+
import org.apache.maven.cli.transfer.Slf4jMavenTransferListener;
7275
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
7376
import org.apache.maven.exception.DefaultExceptionHandler;
7477
import org.apache.maven.exception.ExceptionHandler;

maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java

-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ public String format(long size, ScaleUnit unit) {
136136
return format(size, unit, false);
137137
}
138138

139-
@SuppressWarnings("checkstyle:magicnumber")
140139
public String format(long size, ScaleUnit unit, boolean omitSymbol) {
141140
if (size < 0L) {
142141
throw new IllegalArgumentException("file size cannot be negative: " + size);

maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@
1919
package org.apache.maven.model.interpolation;
2020

2121
import java.io.File;
22-
import java.util.*;
22+
import java.util.ArrayList;
23+
import java.util.Collections;
24+
import java.util.HashMap;
25+
import java.util.List;
26+
import java.util.Map;
27+
import java.util.Properties;
2328
import java.util.concurrent.Callable;
2429
import java.util.concurrent.CountDownLatch;
2530
import java.util.concurrent.Future;

maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public MetadataGenerator newInstance(RepositorySystemSession session, DeployRequ
4545
return new PluginsMetadataGenerator(session, request);
4646
}
4747

48-
@SuppressWarnings("checkstyle:magicnumber")
4948
@Override
5049
public float getPriority() {
5150
return 10; // G level MD should be deployed as 3rd MD

maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public MetadataGenerator newInstance(RepositorySystemSession session, DeployRequ
4545
return new RemoteSnapshotMetadataGenerator(session, request);
4646
}
4747

48-
@SuppressWarnings("checkstyle:magicnumber")
4948
@Override
5049
public float getPriority() {
5150
return 30; // GAV level metadata should be deployed 1st MD

maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public MetadataGenerator newInstance(RepositorySystemSession session, DeployRequ
4545
return new VersionsMetadataGenerator(session, request);
4646
}
4747

48-
@SuppressWarnings("checkstyle:magicnumber")
4948
@Override
5049
public float getPriority() {
5150
return 20; // GA level metadata should be deployed 2nd MD

pom.xml

+1-1
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>43</version>
2727
<relativePath />
2828
</parent>
2929

0 commit comments

Comments
 (0)