This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new e7e0cbb405 [MNG-8179] Upgrade Parent to 43
e7e0cbb405 is described below
commit e7e0cbb4053de3d9e83c82048875969d63918d68
Author: Slawomir Jaranowski <slawomir.jaranow...@payu.com>
AuthorDate: Wed Jul 10 22:55:10 2024 +0200
[MNG-8179] Upgrade Parent to 43
---
.../artifact/repository/ArtifactRepositoryPolicy.java | 1 -
.../maven/building/DefaultProblemCollectorTest.java | 3 ++-
.../internal/ConcurrencyDependencyGraphTest.java | 10 ++++++++--
.../lifecycle/internal/stub/DefaultLifecyclesStub.java | 16 +++++++++++++++-
.../java/org/apache/maven/cli/CLIReportingUtils.java | 4 ----
.../src/main/java/org/apache/maven/cli/MavenCli.java | 5 ++++-
.../cli/transfer/AbstractMavenTransferListener.java | 1 -
.../interpolation/StringSearchModelInterpolatorTest.java | 7 ++++++-
.../internal/PluginsMetadataGeneratorFactory.java | 1 -
.../internal/SnapshotMetadataGeneratorFactory.java | 1 -
.../internal/VersionsMetadataGeneratorFactory.java | 1 -
pom.xml | 2 +-
12 files changed, 36 insertions(+), 16 deletions(-)
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
index deda1af5de..d7bca94b2c 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
@@ -166,7 +166,6 @@ public class ArtifactRepositoryPolicy {
}
}
- @SuppressWarnings("checkstyle:magicnumber")
private int ordinalOfUpdatePolicy(String policy) {
if (ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY.equals(policy)) {
return 1440;
diff --git
a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
index ccc0f4e9d4..bf95444077 100644
---
a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
+++
b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
@@ -21,7 +21,8 @@ package org.apache.maven.building;
import org.apache.maven.building.Problem.Severity;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class DefaultProblemCollectorTest {
diff --git
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
index 6ba405a901..2750d13e36 100644
---
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
+++
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
@@ -35,7 +35,13 @@ import
org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
-import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.*;
+import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.A;
+import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.B;
+import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.C;
+import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.X;
+import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Y;
+import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Z;
+import static
org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.getProjectBuildList;
/**
* @author Kristian Rosenvold
@@ -57,7 +63,7 @@ public class ConcurrencyDependencyGraphTest extends
junit.framework.TestCase {
final List<MavenProject> subsequent = graph.markAsFinished(A);
assertEquals(2, subsequent.size());
- assertEquals(ProjectDependencyGraphStub.B, subsequent.get(0));
+ assertEquals(B, subsequent.get(0));
assertEquals(C, subsequent.get(1));
final List<MavenProject> bDescendants = graph.markAsFinished(B);
diff --git
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
index 81d51e3ff6..9039fb1da5 100644
---
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
+++
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
@@ -27,7 +27,21 @@ import java.util.Map;
import org.apache.maven.lifecycle.DefaultLifecycles;
import org.apache.maven.lifecycle.Lifecycle;
-import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.*;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.CLEAN;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.COMPILE;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.INITIALIZE;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.INSTALL;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PACKAGE;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.POST_CLEAN;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.POST_SITE;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PRE_CLEAN;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PRE_SITE;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PROCESS_RESOURCES;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.PROCESS_TEST_RESOURCES;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.SITE;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.SITE_DEPLOY;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.TEST;
+import static
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub.VALIDATE;
/**
* @author Kristian Rosenvold
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 4bfd9b2512..e220ce783f 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -37,7 +37,6 @@ import static
org.apache.maven.shared.utils.logging.MessageUtils.buffer;
* @author jdcasey
*/
public final class CLIReportingUtils {
- // CHECKSTYLE_OFF: MagicNumber
public static final long MB = 1024 * 1024;
private static final long ONE_SECOND = 1000L;
@@ -47,7 +46,6 @@ public final class CLIReportingUtils {
private static final long ONE_HOUR = 60 * ONE_MINUTE;
private static final long ONE_DAY = 24 * ONE_HOUR;
- // CHECKSTYLE_ON: MagicNumber
public static final String BUILD_VERSION_PROPERTY = "version";
@@ -159,13 +157,11 @@ public final class CLIReportingUtils {
}
public static String formatDuration(long duration) {
- // CHECKSTYLE_OFF: MagicNumber
long ms = duration % 1000;
long s = (duration / ONE_SECOND) % 60;
long m = (duration / ONE_MINUTE) % 60;
long h = (duration / ONE_HOUR) % 24;
long d = duration / ONE_DAY;
- // CHECKSTYLE_ON: MagicNumber
String format;
if (d > 0) {
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index b09a3611e4..18451bc43f 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -68,7 +68,10 @@ import org.apache.maven.cli.logging.Slf4jConfiguration;
import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
import org.apache.maven.cli.logging.Slf4jLoggerManager;
import org.apache.maven.cli.logging.Slf4jStdoutLogger;
-import org.apache.maven.cli.transfer.*;
+import org.apache.maven.cli.transfer.ConsoleMavenTransferListener;
+import org.apache.maven.cli.transfer.QuietMavenTransferListener;
+import org.apache.maven.cli.transfer.SimplexTransferListener;
+import org.apache.maven.cli.transfer.Slf4jMavenTransferListener;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.exception.DefaultExceptionHandler;
import org.apache.maven.exception.ExceptionHandler;
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
index 23211917f9..3f5f2cb138 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -136,7 +136,6 @@ public abstract class AbstractMavenTransferListener extends
AbstractTransferList
return format(size, unit, false);
}
- @SuppressWarnings("checkstyle:magicnumber")
public String format(long size, ScaleUnit unit, boolean omitSymbol) {
if (size < 0L) {
throw new IllegalArgumentException("file size cannot be
negative: " + size);
diff --git
a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
index b2612e5402..b3ef43cee1 100644
---
a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
+++
b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
@@ -19,7 +19,12 @@
package org.apache.maven.model.interpolation;
import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Future;
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java
index d6ccce5921..7c1ebffb34 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java
@@ -45,7 +45,6 @@ public class PluginsMetadataGeneratorFactory implements
MetadataGeneratorFactory
return new PluginsMetadataGenerator(session, request);
}
- @SuppressWarnings("checkstyle:magicnumber")
@Override
public float getPriority() {
return 10; // G level MD should be deployed as 3rd MD
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java
index d25fc2da20..c72bdcc60c 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java
@@ -45,7 +45,6 @@ public class SnapshotMetadataGeneratorFactory implements
MetadataGeneratorFactor
return new RemoteSnapshotMetadataGenerator(session, request);
}
- @SuppressWarnings("checkstyle:magicnumber")
@Override
public float getPriority() {
return 30; // GAV level metadata should be deployed 1st MD
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java
index 77baab2231..53458c75d5 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java
@@ -45,7 +45,6 @@ public class VersionsMetadataGeneratorFactory implements
MetadataGeneratorFactor
return new VersionsMetadataGenerator(session, request);
}
- @SuppressWarnings("checkstyle:magicnumber")
@Override
public float getPriority() {
return 20; // GA level metadata should be deployed 2nd MD
diff --git a/pom.xml b/pom.xml
index 50fb3d5b42..16f025664f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>42</version>
+ <version>43</version>
<relativePath />
</parent>
