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/05/29 20:13:34 UTC

[maven-resolver-ant-tasks] branch pr/1 updated (9dac999 -> e881e1c)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch pr/1
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git.


 discard 9dac999  use a FileResource instead of PathElement for easier copy
     add 721b5a4  added README
     add 11f50aa  [MRESOLVER-100] Resolver Ant Task taskdef failing
     add 6b67ffa  Use maven-shade-plugin 3.2.3
     add 88c22b5  [MRESOLVER-110] Upgrade to Maven 3.6.3
     add 7d7128d  [MRESOLVER-111] Upgrade to Maven Resolver 1.4.2
     add 2d85aa1  [MRESOLVER-112] Upgrade to Maven Antrun Plugin 3.0.0
     new e881e1c  [MRESOLVER-113] Use a FileResource instead of PathElement for easier copy of path created by Resolve

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   (9dac999)
            \
             N -- N -- N   refs/heads/pr/1 (e881e1c)

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 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.


Summary of changes:
 .asf.yaml                                          |  10 +
 README.md                                          | 342 ++++++---------------
 pom.xml                                            |   8 +-
 .../internal/ant/AntSettingsDecryptorFactory.java  |  19 +-
 src/site/markdown/index.md.vm                      | 241 ++++++++++++++-
 5 files changed, 356 insertions(+), 264 deletions(-)
 create mode 100644 .asf.yaml


[maven-resolver-ant-tasks] 01/01: [MRESOLVER-113] Use a FileResource instead of PathElement for easier copy of path created by Resolve

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch pr/1
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git

commit e881e1c676b25fee517e4a0cd22cefbbae08ded1
Author: dprunier <do...@emc.com>
AuthorDate: Tue Jun 4 10:50:50 2019 -0400

    [MRESOLVER-113] Use a FileResource instead of PathElement for easier copy of path created by Resolve
    
    This closes #1
---
 .../java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java
index 62b944a..c17e359 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java
@@ -294,7 +294,8 @@ public class Resolve
                 path = new org.apache.tools.ant.types.Path( getProject() );
                 getProject().addReference( refid, path );
             }
-            path.setLocation( artifact.getFile() );
+            File file = artifact.getFile();
+            path.add( new FileResource( file.getParentFile(), file.getName() ) );
         }
 
     }