Changeset 14747

Timestamp:

01/07/15 23:13:26 (8 years ago)

Author:

Mark Evenson

Message:

abcl-asdf: keep up with maven 3.2.5 API changes.

Thanks to Cyrus Harmon.

Location:

trunk/abcl/contrib/abcl-asdf

Files:

• abcl-asdf.asd (modified) (1 diff)
• maven-embedder.lisp (modified) (2 diffs)

trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

@@ -3 +3 @@
 (asdf:defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "1.4.0"
-  :description "<> asdf:defsystem <urn:abcl.org/release/1.4.0-dev/contrib/abcl-asdf#1.4.0>"
+  :version "1.4.1"
+  :description "<> asdf:defsystem <urn:abcl.org/release/1.4.0-dev/contrib/abcl-asdf#1.4.1>"
   :depends-on (jss)
   :components 

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

@@ -211 +211 @@
    (#"getName" 
     (or
+     (ignore-errors  ;; Maven 3.2.5+
+       (jss:find-java-class 'aether.transport.wagon.WagonProvider))
      (ignore-errors  ;; Maven 3.1.0+
        (jss:find-java-class 'aether.connector.wagon.WagonProvider))
      (ignore-errors  ;; Maven 3.0.x
-      (jss:find-java-class 'org.sonatype.aether.connector.wagon.WagonProvider))))
+       (jss:find-java-class 'org.sonatype.aether.connector.wagon.WagonProvider))))
    "lookup"
    (lambda (role-hint)
@@ -245 +247 @@
          (find-service-locator))
         (wagon-provider-class 
-   (or 
-    (ignore-errors 
-      (java:jclass "org.sonatype.aether.connector.wagon.WagonProvider"))
+   (or
+          (ignore-errors ;; Maven-3.2.5
+            (jss:find-java-class 'org.eclipse.aether.transport.wagon.WagonProvider))
     (ignore-errors  ;; Maven-3.1.x 
-      (jss:find-java-class 'aether.connector.wagon.WagonProvider))))
+      (jss:find-java-class 'aether.connector.wagon.WagonProvider))
+          (ignore-errors 
+      (java:jclass "org.sonatype.aether.connector.wagon.WagonProvider"))))
         (wagon-repository-connector-factory-class
    (or 
+          (ignore-errors 
+      (jss:find-java-class 'org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory))
     (ignore-errors 
-      (java:jclass "org.sonatype.aether.connector.wagon.WagonRepositoryConnectorFactory"))
-    (ignore-errors 
-      (jss:find-java-class 'aether.connector.wagon.WagonRepositoryConnectorFactory))))
+      (jss:find-java-class 'aether.connector.wagon.WagonRepositoryConnectorFactory))
+          (ignore-errors 
+      (java:jclass "org.sonatype.aether.connector.wagon.WagonRepositoryConnectorFactory"))))
         (repository-connector-factory-class 
-   (or 
-    (ignore-errors 
-      (java:jclass "org.sonatype.aether.spi.connector.RepositoryConnectorFactory"))
+   (or
+          (ignore-errors
+      (jss:find-java-class 'org.eclipse.aether.spi.connector.RepositoryConnectorFactory))
     (ignore-errors
-      (jss:find-java-class 'aether.spi.connector.RepositoryConnectorFactory))))
+      (jss:find-java-class 'aether.spi.connector.RepositoryConnectorFactory))
+          (ignore-errors 
+      (java:jclass "org.sonatype.aether.spi.connector.RepositoryConnectorFactory"))))
         (repository-system-class
    (or
-    (ignore-errors
-      (java:jclass "org.sonatype.aether.RepositorySystem"))
     (ignore-errors 
-      (jss:find-java-class 'aether.RepositorySystem)))))
+      (jss:find-java-class 'org.eclipse.aether.RepositorySystem))
+          (ignore-errors 
+      (jss:find-java-class 'aether.RepositorySystem))
+          (ignore-errors
+      (java:jclass "org.sonatype.aether.RepositorySystem")))))
     (#"setServices" locator
                     wagon-provider-class