Changeset 14788

Timestamp:

06/30/15 18:21:36 (6 years ago)

Author:

Mark Evenson

Message:

Fix ABCL-ASDF usage with maven-3.3.x

Fixed

(ABCL-ASDF:INIT :force t)

so that a complete re-initialization is forced.

Addresses <​http://abcl.org/trac/ticket/390>.

File:

• trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp (modified) (5 diffs)

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

@@ -183 +183 @@
 function in order to bypass the dynamic introspection of the location
 of the mvn executable with an explicit value."
+  (when force
+    (setf *session* nil
+          *repository-system* nil))
   (unless (or force *mvn-libs-directory*)
     (setf *mvn-libs-directory* (find-mvn-libs)))
   (unless (and *mvn-libs-directory*
                (probe-file *mvn-libs-directory*))
-    (error "Please obtain and install maven-3.0.4 or lates locally from <http://maven.apache.org/download.html>, then set ABCL-ASDF:*MVN-LIBS-DIRECTORY* to the directory containing maven-core-3.*.jar et. al."))
+    (error "Please obtain and install maven-3.0.3 or later locally from <http://maven.apache.org/download.html>, then set ABCL-ASDF:*MVN-LIBS-DIRECTORY* to the directory containing maven-core-3.*.jar et. al."))
   (unless (ensure-mvn-version)
     (error "We need maven-3.0.4 or later."))  (add-directory-jars-to-class-path *mvn-libs-directory* nil)
@@ -251 +254 @@
         (wagon-provider-class 
          (or
+          (ignore-errors ;; Maven-3.3.x
+            (jss:find-java-class 'connector.transport.TransporterFactory))
           (ignore-errors ;; Maven-3.2.5
             (jss:find-java-class 'org.eclipse.aether.transport.wagon.WagonProvider))
@@ -281 +286 @@
           (ignore-errors
             (java:jclass "org.sonatype.aether.RepositorySystem")))))
-    (#"setServices" locator
-                    wagon-provider-class
-                    (java:jarray-from-list
-                     (list (make-wagon-provider))))
+
+    (if (equal wagon-provider-class (ignore-errors (jss:find-java-class 'TransporterFactory)))
+        ;;; Maven-3.3.3
+        (let ((wagon-transporter-factory (jss:new 'WagonTransporterFactory)))
+          (#"setWagonProvider" wagon-transporter-factory (make-wagon-provider))
+          (#"setServices" locator
+                          wagon-provider-class
+                          (java:jarray-from-list (list wagon-transporter-factory))))
+        (#"setServices" locator
+                        wagon-provider-class
+                        (java:jarray-from-list
+                         (list (make-wagon-provider)))))
     (#"addService" locator
                    repository-connector-factory-class
@@ -365 +378 @@
 (defun make-artifact (artifact-string)
   "Return an instance of aether.artifact.DefaultArtifact initialized from ARTIFACT-STRING." 
-  (or 
-   (ignore-errors
-     (jss:new "org.sonatype.aether.util.artifact.DefaultArtifact" artifact-string))
-   (ignore-errors
-     (jss:new 'aether.artifact.DefaultArtifact artifact-string))))
+  (or
+   (ignore-errors
+     (jss:new 'aether.artifact.DefaultArtifact artifact-string))
+   (ignore-errors
+     (jss:new "org.sonatype.aether.util.artifact.DefaultArtifact" artifact-string))))
 
 (defun make-artifact-request () 
@@ -454 +467 @@
          (dependency 
           (java:jnew (jss:find-java-class 'aether.graph.Dependency)
-                     artifact (java:jfield (jss:find-java-class "JavaScopes") "RUNTIME")))
+                     artifact (java:jfield (jss:find-java-class "JavaScopes") "COMPILE")))
          (collect-request (java:jnew (jss:find-java-class "CollectRequest"))))
     (#"setRoot" collect-request dependency)
-    (when repository
-      (#"addRepository" collect-request 
-                        (if repository-p
-                            (ensure-remote-repository :repository repository)
-                            (ensure-remote-repository))))
+    (#"addRepository" collect-request 
+                      (if repository-p
+                          (ensure-remote-repository :repository repository)
+                          (ensure-remote-repository)))
     (let* ((node 
             (#"getRoot" (#"collectDependencies" (ensure-repository-system) (ensure-session) collect-request)))
-           (dependency-request 
+           (dependency-request
+            ;;; pre Maven-3.3.x
+            #+nil
             (java:jnew (jss:find-java-class "DependencyRequest")
-                       node java:+null+))
+                       node java:+null+)
+            (jss:new 'DependencyRequest))
            (nlg 
             (java:jnew (jss:find-java-class "PreorderNodeListGenerator"))))
+      (#"setRoot" dependency-request node)
       (#"resolveDependencies" (ensure-repository-system) (ensure-session) dependency-request)
       (#"accept" node nlg)