You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/10/03 19:30:48 UTC
[maven] branch MNG-6965 updated (7e7de12 -> ed0b82c)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 7e7de12 formatting
omit b2874fb Update maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
omit 0b858f6 Retain origin dep graph transformer
omit 69be879 [MNG-6965] Drop Maven 2 support - stop injecting old plexus-utils
add dd54c1e update ASF CI url
add e26f2f0 update ASF CI url
add 2a23d7b [MNG-6772] Prevent Super POM central entry from overriding
add 8b7f6f0 [MNG-6987] Reorder groupId before artifactId when writing an exclusion using maven-model
add 5fbe40a Bump ant from 1.10.4 to 1.10.8 in /maven-wrapper
add ac80f5c Refactor MavenCli.populateRequest
add 2c3949c Run Github CI builds with Java 8, 11, 15 and 16-ea
add 0e3c7a4 [MNG-6949] Get the correct PR origin user and branch name from the GitHub Actions context, in order to run the matching integration tests repo and branch.
add df67c00 [MNG-6991] Restore how the local repository is determined
add 39641ac [MNG-6983] Plugin key can get out of sync with artifactId and groupId
new f6713af [MNG-6965] Drop Maven 2 support - stop injecting old plexus-utils
new 7c81e18 Retain origin dep graph transformer
new 4e54ae7 Update maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
new ed0b82c formatting
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7e7de12)
\
N -- N -- N refs/heads/MNG-6965 (ed0b82c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 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.
Summary of changes:
.github/workflows/maven.yml | 15 +-
README.md | 12 +-
.../execution/DefaultMavenExecutionRequest.java | 6 +-
.../apache/maven/project/ProjectModelResolver.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 14 +
.../project-builder/MNG-6983/parent-pom.xml | 38 ++
.../test/projects/project-builder/MNG-6983/pom.xml | 22 +
.../main/java/org/apache/maven/cli/MavenCli.java | 492 ++++++++++++---------
.../java/org/apache/maven/cli/MavenCliTest.java | 91 +++-
maven-model/src/main/mdo/maven.mdo | 16 +-
.../repository/internal/DefaultModelResolver.java | 2 +-
maven-wrapper/pom.xml | 2 +-
pom.xml | 2 +-
13 files changed, 481 insertions(+), 233 deletions(-)
create mode 100644 maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml
create mode 100644 maven-core/src/test/projects/project-builder/MNG-6983/pom.xml
[maven] 03/04: Update
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4e54ae7a4f4a52f0bd475d889af883abb797c1d8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Oct 3 19:24:58 2020 +0200
Update maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
Co-authored-by: Piotrek Żygieło <pz...@users.noreply.github.com>
---
.../apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index 35ddc2f..1d6ea2d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -143,7 +143,7 @@ public class DefaultPluginDependenciesResolver
List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
- return resolveInternal( plugin, null /* pluginArtifact */, dependencyFilter, /* transformer */
+ return resolveInternal( plugin, null /* pluginArtifact */, dependencyFilter,
repositories, session );
}
[maven] 01/04: [MNG-6965] Drop Maven 2 support - stop injecting old
plexus-utils
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven.git
commit f6713af02c8f6d189e8c080fa3ff102fd5537995
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jul 24 01:59:50 2020 +0200
[MNG-6965] Drop Maven 2 support - stop injecting old plexus-utils
---
.../DefaultPluginDependenciesResolver.java | 13 +---
.../maven/plugin/internal/PlexusUtilsInjector.java | 87 ----------------------
2 files changed, 3 insertions(+), 97 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index d1f2834..2aeaf12 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -43,7 +43,6 @@ import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.DependencyCollectionException;
-import org.eclipse.aether.collection.DependencyGraphTransformer;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
@@ -61,7 +60,6 @@ import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
-import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
/**
@@ -145,20 +143,19 @@ public class DefaultPluginDependenciesResolver
List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
- return resolveInternal( plugin, null /* pluginArtifact */, dependencyFilter, null /* transformer */,
- repositories, session );
+ return resolveInternal( plugin, null /* pluginArtifact */, dependencyFilter, /* transformer */
+ repositories, session );
}
public DependencyNode resolve( Plugin plugin, Artifact pluginArtifact, DependencyFilter dependencyFilter,
List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
- return resolveInternal( plugin, pluginArtifact, dependencyFilter, new PlexusUtilsInjector(), repositories,
+ return resolveInternal( plugin, pluginArtifact, dependencyFilter, repositories,
session );
}
private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact, DependencyFilter dependencyFilter,
- DependencyGraphTransformer transformer,
List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
@@ -179,12 +176,8 @@ public class DefaultPluginDependenciesResolver
DependencySelector selector =
AndDependencySelector.newInstance( session.getDependencySelector(), new WagonExcluder() );
- transformer =
- ChainedDependencyGraphTransformer.newInstance( session.getDependencyGraphTransformer(), transformer );
-
DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
pluginSession.setDependencySelector( selector );
- pluginSession.setDependencyGraphTransformer( transformer );
CollectRequest request = new CollectRequest();
request.setRequestContext( REPOSITORY_CONTEXT );
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
deleted file mode 100644
index 16a0b63..0000000
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.apache.maven.plugin.internal;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.eclipse.aether.RepositoryException;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.collection.DependencyGraphTransformationContext;
-import org.eclipse.aether.collection.DependencyGraphTransformer;
-import org.eclipse.aether.graph.DefaultDependencyNode;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.util.artifact.JavaScopes;
-
-/**
- * Injects plexus-utils:1.1 into a plugin's class path if it doesn't already declare a dependency on plexus-utils. This
- * is another legacy bit to provide backward-compat with Maven 2.x.
- *
- * @author Benjamin Bentmann
- */
-class PlexusUtilsInjector
- implements DependencyGraphTransformer
-{
-
- private static final String GID = "org.codehaus.plexus";
-
- private static final String AID = "plexus-utils";
-
- private static final String VER = "1.1";
-
- private static final String EXT = "jar";
-
- public DependencyNode transformGraph( DependencyNode node, DependencyGraphTransformationContext context )
- throws RepositoryException
- {
- if ( findPlexusUtils( node ) == null )
- {
- Artifact pu = new DefaultArtifact( GID, AID, null, EXT, VER );
- DefaultDependencyNode child = new DefaultDependencyNode( new Dependency( pu, JavaScopes.RUNTIME ) );
- child.setRepositories( node.getRepositories() );
- child.setRequestContext( node.getRequestContext() );
- node.getChildren().add( child );
- }
-
- return node;
- }
-
- private DependencyNode findPlexusUtils( DependencyNode node )
- {
- Artifact artifact = node.getDependency().getArtifact();
-
- if ( AID.equals( artifact.getArtifactId() ) && GID.equals( artifact.getGroupId() )
- && EXT.equals( artifact.getExtension() ) && "".equals( artifact.getClassifier() ) )
- {
- return node;
- }
-
- for ( DependencyNode child : node.getChildren() )
- {
- DependencyNode result = findPlexusUtils( child );
- if ( result != null )
- {
- return result;
- }
- }
-
- return null;
- }
-
-}
[maven] 04/04: formatting
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ed0b82cd7dfd1eeba5d408afe1a78ebf0bdadfac
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Oct 3 20:00:45 2020 +0200
formatting
---
.../apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index 1d6ea2d..709bd72 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -144,7 +144,7 @@ public class DefaultPluginDependenciesResolver
throws PluginResolutionException
{
return resolveInternal( plugin, null /* pluginArtifact */, dependencyFilter,
- repositories, session );
+ repositories, session );
}
public DependencyNode resolve( Plugin plugin, Artifact pluginArtifact, DependencyFilter dependencyFilter,
[maven] 02/04: Retain origin dep graph transformer
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7c81e1870ae88dbc1b7e6a269cd9f0ff6e490803
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Oct 3 16:47:28 2020 +0200
Retain origin dep graph transformer
---
.../apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index 2aeaf12..35ddc2f 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -178,6 +178,7 @@ public class DefaultPluginDependenciesResolver
DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
pluginSession.setDependencySelector( selector );
+ pluginSession.setDependencyGraphTransformer( session.getDependencyGraphTransformer() );
CollectRequest request = new CollectRequest();
request.setRequestContext( REPOSITORY_CONTEXT );