You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:11:36 UTC
[maven] branch mvn4 created (now cc589d6)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git.
at cc589d6 mvn4 aggregator
This branch includes the following new commits:
new cc589d6 mvn4 aggregator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit cc589d64131c897fa7a3cb333a333ab89a9df3b0
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:11:31 2022 +0100
mvn4 aggregator
---
build/checkstyle-suppressions.xml | 1 -
maven-bom/pom.xml | 2 +-
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 1 +
.../maven/artifact/handler/DefaultArtifactHandler.java | 1 +
.../maven/plugin/internal/DefaultMavenPluginManager.java | 1 +
.../apache/maven/model/building/DefaultModelBuilder.java | 1 +
.../main/java/org/apache/maven/model/merge/ModelMerger.java | 2 +-
.../repository/internal/PluginsMetadataInfoProvider.java | 3 +++
.../apache/maven/repository/internal/RelocatedArtifact.java | 6 ++++++
pom.xml | 13 +++++++------
10 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/build/checkstyle-suppressions.xml b/build/checkstyle-suppressions.xml
index 78e9e3c..4570299 100644
--- a/build/checkstyle-suppressions.xml
+++ b/build/checkstyle-suppressions.xml
@@ -26,5 +26,4 @@ under the License.
<suppressions>
<suppress checks="JavadocVariable|JavadocMethod" files=".*" />
<suppress checks="HiddenField" files=".*" />
- <suppress checks="FileLength" files="ModelMerger\.java" />
</suppressions>
diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index eab13b4..814fbcb 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath />
</parent>
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 142dc13..2965d11 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -108,6 +108,7 @@ public class DefaultMaven
private final SuperPomProvider superPomProvider;
@Inject
+ @SuppressWarnings( "checkstyle:ParameterNumber" )
public DefaultMaven(
ProjectBuilder projectBuilder,
LifecycleStarter lifecycleStarter,
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
index bb90aff..d0d2bf4 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
@@ -70,6 +70,7 @@ public class DefaultArtifactHandler
);
}
+ @SuppressWarnings( "checkstyle:ParameterNumber" )
public DefaultArtifactHandler( final String type,
final String extension,
final String classifier,
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 7da8ea8..6d55988 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -148,6 +148,7 @@ public class DefaultMavenPluginManager
private final PluginDescriptorBuilder builder = new PluginDescriptorBuilder();
@Inject
+ @SuppressWarnings( "checkstyle:ParameterNumber" )
public DefaultMavenPluginManager(
PlexusContainer container,
ClassRealmManager classRealmManager,
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index d09c705..763ddf7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -100,6 +100,7 @@ import org.eclipse.sisu.Nullable;
*/
@Named
@Singleton
+@SuppressWarnings( {"checkstyle:JavaDocMethod", "checkstyle:HiddenField", "checkstyle:ParameterNumber" } )
public class DefaultModelBuilder
implements ModelBuilder
{
diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
index 2ac6fbf..84ccc80 100644
--- a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
+++ b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader|FileLength|MethodName
package org.apache.maven.model.merge;
/*
@@ -94,7 +95,6 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
*
* @author Benjamin Bentmann
*/
-@SuppressWarnings( { "checkstyle:methodname" } )
public class ModelMerger
{
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataInfoProvider.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataInfoProvider.java
index 629a23f..49b3aab 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataInfoProvider.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataInfoProvider.java
@@ -39,6 +39,9 @@ public interface PluginsMetadataInfoProvider
/**
* Returns {@link PluginInfo} corresponding for passed in {@link Artifact}, or {@code null}.
+ *
+ * @param artifact the artifact
+ * @return the plugin info
*/
PluginInfo getPluginInfo( Artifact artifact );
}
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
index a0a21e9..6dd05d6 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -152,4 +152,10 @@ public final class RelocatedArtifact
{
return message;
}
+
+ @Override
+ protected Artifact newInstance( String version, Map<String, String> properties, File file )
+ {
+ throw new IllegalStateException();
+ }
}
diff --git a/pom.xml b/pom.xml
index 1ff9ccf..af4eeb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath />
</parent>
@@ -60,12 +60,12 @@ under the License.
<guavaVersion>30.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<sisuVersion>0.3.5</sisuVersion>
- <wagonVersion>3.5.1</wagonVersion>
+ <wagonVersion>3.5.2-SNAPSHOT</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>2.0</cipherVersion>
<modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <resolverVersion>1.7.2</resolverVersion>
+ <resolverVersion>1.8.0-SNAPSHOT</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<xmlunitVersion>2.6.4</xmlunitVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -301,7 +301,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
@@ -594,7 +594,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.18</version>
+ <version>1.20</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
@@ -679,7 +679,8 @@ under the License.
<version>3.1.2</version>
<configuration>
<violationSeverity>info</violationSeverity>
- <suppressionsLocation>${maven.multiModuleProjectDirectory}/build/checkstyle-suppressions.xml</suppressionsLocation>
+ <violationIgnore>JavadocVariable,JavadocMethod,HiddenField</violationIgnore>
+<!-- <suppressionsLocation>${maven.multiModuleProjectDirectory}/build/checkstyle-suppressions.xml</suppressionsLocation>-->
</configuration>
<dependencies>
<dependency>