[armedbear-cvs] r13901 - trunk/abcl/contrib/abcl-asdf

[mevenson at common-lisp.net]

Author: mevenson
Date: Sun Apr  1 12:15:35 2012
New Revision: 13901

Log:
Part of Fix #204:  require the use of maven-3.0.4.

Slyrus reports that some parts don't work with maven-3.0.3, so as a
favor to user bump requirement.

Underneath: Aether is a mess, but looks like it is getting better.

Modified:
   trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Sun Apr  1 11:35:49 2012	(r13900)
+++ trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Sun Apr  1 12:15:35 2012	(r13901)
@@ -22,6 +22,8 @@
 
 |#
 
+;;; N.b. evaluated *after* we load the ABCL specific modifications of ASDF in abcl-asdf.lisp
+
 (in-package :abcl-asdf)
 
 (require :abcl-contrib)
@@ -134,7 +136,7 @@
           (>= minor 1))
      (and (>= major 3)
           (>= major 0)
-          (>= patch 3)))))
+          (>= patch 4)))))
 
 (defparameter *init* nil)
 
@@ -143,13 +145,14 @@
   (unless (or force *mvn-libs-directory*)
     (setf *mvn-libs-directory* (find-mvn-libs)))
   (unless (probe-file *mvn-libs-directory*)
-    (error "You must download maven-3.0.3 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
+    (error "You must download maven-3.0.4 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
   (unless (ensure-mvn-version)
-    (error "We need maven-3.0.3 or later."))
+    (error "We need maven-3.0.4 or later."))
   (add-directory-jars-to-class-path *mvn-libs-directory* nil)
   (setf *init* t))
 
 (defparameter *http-wagon-implementations*
+  ;;; maven-3.0.3 reported as not working with all needed functionality
   `("org.apache.maven.wagon.providers.http.HttpWagon" ;; introduced as default with maven-3.0.4
     "org.apache.maven.wagon.providers.http.LightweightHttpWagon")
   "A list of possible candidate implementations that provide access to http and https resources.