01/02: gnu: Fix apache mirror URIs.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 9a01efa262cef9a102823122b2deee9b38402bcc
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Fri Jun 12 18:04:01 2020 +0300

    gnu: Fix apache mirror URIs.
    
    * gnu/packages/web.scm (serf)[source]: Remove redundant part of URI.
    * gnu/packages/java.scm (ant-bootstrap, java-commons-httpclient,
    java-jakarta-oro)[source]: Same.
    * gnu/packages/maven.scm (maven-shared-utils, maven-plugin-annotations,
    maven-wagon-provider-api, maven-artifact)[source]: Same.
---
 gnu/packages/java.scm  | 6 +++---
 gnu/packages/maven.scm | 8 ++++----
 gnu/packages/web.scm   | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 885086f..d5bc713 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -276,7 +276,7 @@ JNI.")
     (version "1.8.4")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://apache/dist/"
+              (uri (string-append "mirror://apache/"
                                   "ant/source/apache-ant-"
                                   version "-src.tar.bz2"))
               (sha256
@@ -10832,7 +10832,7 @@ graphs, and pie charts.")
     (version "3.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://apache/dist/httpcomponents/"
+              (uri (string-append "mirror://apache/httpcomponents/"
                                   
"commons-httpclient/source/commons-httpclient-"
                                   version "-src.tar.gz"))
               (sha256
@@ -10928,7 +10928,7 @@ inside a Zip archive.")
     (version "2.0.8")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://apache/dist/jakarta/oro/"
+              (uri (string-append "mirror://apache/jakarta/oro/"
                                   "jakarta-oro-" version ".tar.gz"))
               (sha256
                (base32
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index a62eb74..66c6e3a 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -340,7 +340,7 @@ Maven Wagon, for use in Maven.")))
     (version "3.2.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://apache/dist/maven/shared/"
+              (uri (string-append "mirror://apache/maven/shared/"
                                   "maven-shared-utils-" version 
"-source-release.zip"))
               (sha256
                (base32
@@ -380,7 +380,7 @@ replacement with improvements.")
     (version "3.5")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://apache/dist/maven/"
+              (uri (string-append "mirror://apache/maven/"
                                   "plugin-tools/maven-plugin-tools-" version
                                   "-source-release.zip"))
               (sha256 (base32 
"1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2"))))
@@ -404,7 +404,7 @@ replacement with improvements.")
     (version "3.1.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://apache/dist/maven/wagon/"
+              (uri (string-append "mirror://apache/maven/wagon/"
                                   "wagon-" version "-source-release.zip"))
               (sha256 (base32 
"0r07j6xdzdnrvqnv8ida7dx1m05pznh5qgmcfcfpyvg9nxbj3l1n"))))
     (build-system ant-build-system)
@@ -691,7 +691,7 @@ gets and puts artifacts through HTTP(S) using Apache 
HttpClient-4.x.")))
     (version "3.6.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://apache/dist/maven/"
+              (uri (string-append "mirror://apache/maven/"
                                   "maven-3/" version "/source/"
                                   "apache-maven-" version "-src.tar.gz"))
               (sha256 (base32 
"0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82"))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a04d755..f6a0fc2 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1575,7 +1575,7 @@ from streaming URLs.  It is a command-line wrapper for 
the libquvi library.")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://apache/dist/serf/serf-"
+       (uri (string-append "mirror://apache/serf/serf-"
                            version ".tar.bz2"))
        (sha256
         (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"))))