[ant] branch master updated: Fix retrieval from non-default repositories

[bo...@apache.org]

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

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
     new 6594b8cd5 Fix retrieval from non-default repositories
     new 2920ea1d9 Merge pull request #191 from ppkarwasz/fetch-script
6594b8cd5 is described below

commit 6594b8cd51d277c1c3e64300a0c138ad54fd4c67
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu Aug 4 23:47:54 2022 +0200

    Fix retrieval from non-default repositories
    
    Since the `<remoterepo>` tag is not in the scope of the `<resolve>`
    target, fetching artifacts from repositories different from Maven
    Central fails (e.g. JAI).
---
 fetch.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fetch.xml b/fetch.xml
index ac231ea36..038ee120e 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -119,8 +119,8 @@ Set -Ddest=LOCATION on the command line
             </not>
           </condition>
         </fail>
-        <resolver:remoterepo url="@{repository}" id="@{id}"/>
         <resolver:resolve>
+          <resolver:remoterepo url="@{repository}" id="@{id}"/>
           <dependencies id="@{archive}.path">
             <dependency groupId="@{project}"
                         artifactId="@{archive}"