Changeset 14747


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

    r14746 r14747  
    33(asdf:defsystem :abcl-asdf
    44  :author "Mark Evenson"
    5   :version "1.4.0"
    6   :description "<> asdf:defsystem <urn:abcl.org/release/1.4.0-dev/contrib/abcl-asdf#1.4.0>"
     5  :version "1.4.1"
     6  :description "<> asdf:defsystem <urn:abcl.org/release/1.4.0-dev/contrib/abcl-asdf#1.4.1>"
    77  :depends-on (jss)
    88  :components
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r14744 r14747  
    211211   (#"getName"
    212212    (or
     213     (ignore-errors  ;; Maven 3.2.5+
     214       (jss:find-java-class 'aether.transport.wagon.WagonProvider))
    213215     (ignore-errors  ;; Maven 3.1.0+
    214216       (jss:find-java-class 'aether.connector.wagon.WagonProvider))
    215217     (ignore-errors  ;; Maven 3.0.x
    216       (jss:find-java-class 'org.sonatype.aether.connector.wagon.WagonProvider))))
     218       (jss:find-java-class 'org.sonatype.aether.connector.wagon.WagonProvider))))
    217219   "lookup"
    218220   (lambda (role-hint)
     
    245247         (find-service-locator))
    246248        (wagon-provider-class
    247    (or 
    248     (ignore-errors
    249       (java:jclass "org.sonatype.aether.connector.wagon.WagonProvider"))
     249   (or
     250          (ignore-errors ;; Maven-3.2.5
     251            (jss:find-java-class 'org.eclipse.aether.transport.wagon.WagonProvider))
    250252    (ignore-errors  ;; Maven-3.1.x
    251       (jss:find-java-class 'aether.connector.wagon.WagonProvider))))
     253      (jss:find-java-class 'aether.connector.wagon.WagonProvider))
     254          (ignore-errors
     255      (java:jclass "org.sonatype.aether.connector.wagon.WagonProvider"))))
    252256        (wagon-repository-connector-factory-class
    253257   (or
     258          (ignore-errors
     259      (jss:find-java-class 'org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory))
    254260    (ignore-errors
    255       (java:jclass "org.sonatype.aether.connector.wagon.WagonRepositoryConnectorFactory"))
    256     (ignore-errors
    257       (jss:find-java-class 'aether.connector.wagon.WagonRepositoryConnectorFactory))))
     261      (jss:find-java-class 'aether.connector.wagon.WagonRepositoryConnectorFactory))
     262          (ignore-errors
     263      (java:jclass "org.sonatype.aether.connector.wagon.WagonRepositoryConnectorFactory"))))
    258264        (repository-connector-factory-class
    259    (or 
    260     (ignore-errors
    261       (java:jclass "org.sonatype.aether.spi.connector.RepositoryConnectorFactory"))
     265   (or
     266          (ignore-errors
     267      (jss:find-java-class 'org.eclipse.aether.spi.connector.RepositoryConnectorFactory))
    262268    (ignore-errors
    263       (jss:find-java-class 'aether.spi.connector.RepositoryConnectorFactory))))
     269      (jss:find-java-class 'aether.spi.connector.RepositoryConnectorFactory))
     270          (ignore-errors
     271      (java:jclass "org.sonatype.aether.spi.connector.RepositoryConnectorFactory"))))
    264272        (repository-system-class
    265273   (or
    266     (ignore-errors
    267       (java:jclass "org.sonatype.aether.RepositorySystem"))
    268274    (ignore-errors
    269       (jss:find-java-class 'aether.RepositorySystem)))))
     275      (jss:find-java-class 'org.eclipse.aether.RepositorySystem))
     276          (ignore-errors
     277      (jss:find-java-class 'aether.RepositorySystem))
     278          (ignore-errors
     279      (java:jclass "org.sonatype.aether.RepositorySystem")))))
    270280    (#"setServices" locator
    271281                    wagon-provider-class
Note: See TracChangeset for help on using the changeset viewer.