[Git][java-team/maven-resolver][upstream] New upstream version 1.4.2
Emmanuel Bourg
gitlab at salsa.debian.org
Sun Jun 7 21:35:47 BST 2020
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / maven-resolver
Commits:
2f69ebea by Emmanuel Bourg at 2020-06-07T22:27:33+02:00
New upstream version 1.4.2
- - - - -
19 changed files:
- + .asf.yaml
- + README.md
- maven-resolver-api/pom.xml
- maven-resolver-connector-basic/pom.xml
- maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
- maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
- maven-resolver-demos/pom.xml
- maven-resolver-impl/pom.xml
- maven-resolver-spi/pom.xml
- maven-resolver-test-util/pom.xml
- maven-resolver-transport-classpath/pom.xml
- maven-resolver-transport-file/pom.xml
- maven-resolver-transport-http/pom.xml
- maven-resolver-transport-wagon/pom.xml
- maven-resolver-util/pom.xml
- maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java
- maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java
- + maven-resolver-util/src/test/resources/visitor/path-recorder/cycle-3paths.txt
- pom.xml
Changes:
=====================================
.asf.yaml
=====================================
@@ -0,0 +1,9 @@
+# see https://s.apache.org/asfyaml
+github:
+ description: "Apache Maven Artifact Resolver"
+ homepage: https://maven.apache.org/resolver/
+ labels:
+ - java
+ - build-management
+ - apache-maven
+ - maven
=====================================
README.md
=====================================
@@ -0,0 +1,99 @@
+<!---
+ 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.
+-->
+Contributing to [Apache Maven Artifact Resolver](https://maven.apache.org/resolver/)
+======================
+
+[][jira]
+[][license]
+[](https://search.maven.org/artifact/org.apache.maven.resolver/maven-resolver)
+[][build]
+[][test-results]
+
+
+You have found a bug or you have an idea for a cool new feature? Contributing
+code is a great way to give something back to the open source community. Before
+you dig right into the code, there are a few guidelines that we need
+contributors to follow so that we can have a chance of keeping on top of
+things.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature, it makes sense to discuss your changes
+ on the [dev list][ml-list] first.
+ This way you can make sure you're not wasting your time on something that isn't
+ considered to be in Apache Maven's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+ + Clearly describe the issue, including steps to reproduce when it is a bug.
+ + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making and Submitting Changes
+--------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][ml-list] is the
+main channel of communication for contributors.
+There are some guidelines which will make applying PRs easier for us:
++ Create a topic branch from where you want to base your work (this is usually the master branch).
+ Push your changes to a topic branch in your fork of the repository.
++ Make commits of logical units.
++ Respect the original code style: by using the same [codestyle][code-style],
+ patches should only highlight the actual difference, not being disturbed by any formatting issues:
+ + Only use spaces for indentation.
+ + Create minimal diffs - disable on save actions like reformat source code or organize imports.
+ If you feel the source code should be reformatted, create a separate PR for this change.
+ + Check for unnecessary whitespace with `git diff --check` before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
+```
+[MRESOLVER-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/IT) for your changes.
++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
++ Submit a pull request to the repository in the Apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always
+necessary to create a new ticket in JIRA. In this case, it is appropriate to
+start the first line of a commit with '(doc)' instead of a ticket number.
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
++ [Apache Maven Artifact Resolver project page][jira]
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
++ #Maven IRC channel on freenode.org
+
+[jira]: https://issues.apache.org/jira/projects/MRESOLVER/
+[license]: https://www.apache.org/licenses/LICENSE-2.0
+[ml-list]: https://maven.apache.org/mailing-lists.html
+[code-style]: https://maven.apache.org/developers/conventions/code.html
+[cla]: https://www.apache.org/licenses/#clas
+[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
+[test-results]: https://builds.apache.org/job/maven-box/job/maven-resolver/job/master/lastCompletedBuild/testReport/
+[build]: https://builds.apache.org/job/maven-box/job/maven-resolver/job/master/
=====================================
maven-resolver-api/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-api</artifactId>
=====================================
maven-resolver-connector-basic/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-connector-basic</artifactId>
=====================================
maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-demos</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-demo-maven-plugin</artifactId>
@@ -82,6 +82,18 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <!-- This is needed to prevent jar plugin to fail based on wrong automatic module name. -->
+ <archive combine.self="override" />
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>run-its</id>
=====================================
maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-demos</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-demo-snippets</artifactId>
=====================================
maven-resolver-demos/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-demos</artifactId>
=====================================
maven-resolver-impl/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-impl</artifactId>
=====================================
maven-resolver-spi/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-spi</artifactId>
=====================================
maven-resolver-test-util/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-test-util</artifactId>
=====================================
maven-resolver-transport-classpath/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-transport-classpath</artifactId>
=====================================
maven-resolver-transport-file/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-transport-file</artifactId>
=====================================
maven-resolver-transport-http/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-transport-http</artifactId>
=====================================
maven-resolver-transport-wagon/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-transport-wagon</artifactId>
=====================================
maven-resolver-util/pom.xml
=====================================
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
</parent>
<artifactId>maven-resolver-util</artifactId>
=====================================
maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java
=====================================
@@ -21,9 +21,7 @@ package org.eclipse.aether.util.graph.visitor;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.IdentityHashMap;
import java.util.List;
-import java.util.Map;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
@@ -42,8 +40,6 @@ public final class PathRecordingDependencyVisitor
private final Stack<DependencyNode> parents;
- private final Map<DependencyNode, Object> visited;
-
private final boolean excludeChildrenOfMatches;
/**
@@ -72,7 +68,6 @@ public final class PathRecordingDependencyVisitor
this.excludeChildrenOfMatches = excludeChildrenOfMatches;
paths = new ArrayList<>();
parents = new Stack<>();
- visited = new IdentityHashMap<>( 128 );
}
/**
@@ -101,6 +96,7 @@ public final class PathRecordingDependencyVisitor
{
boolean accept = filter == null || filter.accept( node, parents );
+ boolean hasDuplicateNodeInParent = parents.contains( node );
parents.push( node );
if ( accept )
@@ -118,18 +114,12 @@ public final class PathRecordingDependencyVisitor
}
}
- if ( visited.put( node, Boolean.TRUE ) != null )
- {
- return false;
- }
-
- return true;
+ return !hasDuplicateNodeInParent;
}
public boolean visitLeave( DependencyNode node )
{
parents.pop();
- visited.remove( node );
return true;
}
=====================================
maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java
=====================================
@@ -135,6 +135,20 @@ public class PathRecordingDependencyVisitorTest
assertPath( paths.get( 3 ), "a", "x", "x" );
}
+ @Test
+ public void testGetPaths_HandlesCycles_threePaths()
+ throws Exception
+ {
+ DependencyNode root = parse( "cycle-3paths.txt" );
+
+ PathRecordingDependencyVisitor visitor = new PathRecordingDependencyVisitor( new ArtifactMatcher() );
+ root.accept( visitor );
+
+ List<List<DependencyNode>> paths = visitor.getPaths();
+ assertEquals( paths.toString(), 1, paths.size() );
+ assertPath( paths.get( 0 ), "a", "b");
+ }
+
private static class ArtifactMatcher
implements DependencyFilter
{
=====================================
maven-resolver-util/src/test/resources/visitor/path-recorder/cycle-3paths.txt
=====================================
@@ -0,0 +1,8 @@
+gid:a:1 (1)
++- gid:b:0
+| \- ^1
++- gid:b:1
+| \- ^1
++- gid:b:2
+| \- ^1
+\- match:b:3
=====================================
pom.xml
=====================================
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>33</version>
+ <version>34</version>
</parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
<packaging>pom</packaging>
<name>Maven Artifact Resolver</name>
@@ -50,7 +50,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-resolver.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-resolver.git</developerConnection>
<url>https://github.com/apache/maven-resolver/tree/${project.scm.tag}</url>
- <tag>maven-resolver-1.4.1</tag>
+ <tag>maven-resolver-1.4.2</tag>
</scm>
<issueManagement>
<system>jira</system>
@@ -74,6 +74,7 @@
<checkstyle.violation.ignore>None</checkstyle.violation.ignore>
<sisuVersion>0.3.3</sisuVersion>
<slf4jVersion>1.7.25</slf4jVersion>
+ <project.build.outputTimestamp>2020-04-24T12:25:33Z</project.build.outputTimestamp>
</properties>
<modules>
View it on GitLab: https://salsa.debian.org/java-team/maven-resolver/-/commit/2f69ebeaa3205e6e59334bec8932edad9548b649
--
View it on GitLab: https://salsa.debian.org/java-team/maven-resolver/-/commit/2f69ebeaa3205e6e59334bec8932edad9548b649
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200607/223c4316/attachment.html>
More information about the pkg-java-commits
mailing list