You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/05/22 14:54:11 UTC
[maven-dependency-tree] branch MSHARED-816 created (now ae03c02)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MSHARED-816
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git.
at ae03c02 [MSHARED-816] Annotate DependencyNodes with dependency management metadata
This branch includes the following new commits:
new 350cbd2 Add support for pre-managed metadata to Maven31DependencyGraphBuilder
new ae03c02 [MSHARED-816] Annotate DependencyNodes with dependency management metadata
The 2 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-dependency-tree] 02/02: [MSHARED-816] Annotate
DependencyNodes with dependency management metadata
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSHARED-816
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git
commit ae03c028c1ca7857e0992db0825922406af4bec7
Author: Richard Atkins <ri...@atlassian.com>
AuthorDate: Sat May 22 16:53:53 2021 +0200
[MSHARED-816] Annotate DependencyNodes with dependency management metadata
Signed-off-by: rfscholte <rf...@apache.org>
---
.../internal/Maven31DependencyGraphBuilder.java | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
index c1f9ab4..532a507 100644
--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
+++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
@@ -19,6 +19,8 @@ package org.apache.maven.shared.dependency.graph.internal;
* under the License.
*/
+import static org.eclipse.aether.util.graph.manager.DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -42,9 +44,11 @@ import org.apache.maven.shared.dependency.graph.DependencyNode;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.Exclusion;
+import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
import org.eclipse.aether.version.VersionConstraint;
/**
@@ -111,12 +115,13 @@ public class Maven31DependencyGraphBuilder
RepositorySystemSession session =
(RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession", exceptionHandler );
- /*
- * if ( Boolean.TRUE != ( (Boolean) session.getConfigProperties().get(
- * DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION ) ) ) { DefaultRepositorySystemSession newSession = new
- * DefaultRepositorySystemSession( session ); newSession.setConfigProperty(
- * DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION, true ); session = newSession; }
- */
+
+ if ( Boolean.TRUE != ( (Boolean) session.getConfigProperties().get( NODE_DATA_PREMANAGED_VERSION ) ) )
+ {
+ DefaultRepositorySystemSession newSession = new DefaultRepositorySystemSession( session );
+ newSession.setConfigProperty( NODE_DATA_PREMANAGED_VERSION, true );
+ session = newSession;
+ }
final DependencyResolutionRequest request = new DefaultDependencyResolutionRequest();
request.setMavenProject( project );
@@ -220,8 +225,8 @@ public class Maven31DependencyGraphBuilder
private DependencyNode buildDependencyNode( DependencyNode parent, org.eclipse.aether.graph.DependencyNode node,
Artifact artifact, ArtifactFilter filter )
{
- String premanagedVersion = null; // DependencyManagerUtils.getPremanagedVersion( node );
- String premanagedScope = null; // DependencyManagerUtils.getPremanagedScope( node );
+ String premanagedVersion = DependencyManagerUtils.getPremanagedVersion( node );
+ String premanagedScope = DependencyManagerUtils.getPremanagedScope( node );
List<org.apache.maven.model.Exclusion> exclusions = null;
Boolean optional = null;
[maven-dependency-tree] 01/02: Add support for pre-managed metadata
to Maven31DependencyGraphBuilder
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSHARED-816
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git
commit 350cbd2db4c2b899349e06ca3bdf57ebece0f5f1
Author: Richard Atkins <ri...@atlassian.com>
AuthorDate: Mon Apr 15 11:57:09 2019 +1000
Add support for pre-managed metadata to Maven31DependencyGraphBuilder
* Simply uncomment existing commented out code, and reformat again
* Also update to maven-shared-components 33, and test against latest maven 3.0.5 bugfix release
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fbda3ca..65a1e14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.0.4</version>
+ <version>3.0.5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -173,7 +173,7 @@
These files contains the expected output of this component and can not contain a license header.
-->
<exclude>src/it/*/expected*.txt</exclude>
- </excludes>
+ </excludes>
</configuration>
<executions>
<execution>