maven: add http-wagon

Julien LepillerSun Oct 01 15:19:08+0200 2017

aa6defd

maven: add http-wagon

more/packages/java.scm

39983998 
       #:source-dir "gson/src/main/java"
39993999 
       #:test-dir "gson/src/test"))
40004000 
    (native-inputs
4001-
     `(("junit" ,java-junit)))
4001+
     `(("junit" ,java-junit)
4002+
       ("hamcrest" ,java-hamcrest-core)))
40024003 
    (home-page "")
40034004 
    (synopsis "")
40044005 
    (description "")

…

40184019 
    (build-system ant-build-system)
40194020 
    (arguments
40204021 
     `(#:jar-name "jsoup.jar"
4021-
       #:source-dir "src/main/java"))
4022+
       #:source-dir "src/main/java"
4023+
       #:phases
4024+
       (modify-phases %standard-phases
4025+
         (add-before 'build 'copy-resources
4026+
           (lambda _
4027+
             (let ((classes-dir (string-append (getcwd) "/build/classes")))
4028+
               (with-directory-excursion "src/main/java"
4029+
                 (for-each (lambda (file)
4030+
                             (let ((dist (string-append classes-dir "/" file)))
4031+
                               (mkdir-p (dirname dist))
4032+
                               (copy-file file dist)))
4033+
                   (find-files "." ".*.properties")))))))))
40224034 
    (native-inputs
4023-
     `(("junit" ,java-junit)))
4035+
     `(("junit" ,java-junit)
4036+
       ("hamcrest" ,java-hamcrest-core)
4037+
       ("gson" ,java-gson)))
40244038 
    (home-page "https://jsoup.org")
40254039 
    (synopsis "HTML Parser")
40264040 
    (description "jsoup is a Java library for working with real-world HTML.  It

…

71947208 
     `(#:jar-name "eclipse-sisu-plexus.jar"
71957209 
       #:source-dir "org.eclipse.sisu.plexus/src"
71967210 
       #:jdk ,icedtea-8
7197-
       #:tests? #f)); no tests
7211+
       #:tests? #f; no tests
7212+
       #:phases
7213+
       (modify-phases %standard-phases
7214+
         (add-before 'build 'copy-resources
7215+
           (lambda _
7216+
             (install-file "org.eclipse.sisu.plexus/META-INF/plexus/components.xml"
7217+
                           "build/classes/META-INF/plexus")
7218+
             #t)))))
71987219 
    (inputs
71997220 
     `(("classworlds" ,java-plexus-classworlds)
72007221 
       ("util" ,java-plexus-utils)

…

76557676 
     `(("util" ,java-eclipse-jetty-util-9.2)
76567677 
       ("http" ,java-eclipse-jetty-http-9.2)
76577678 
       ("server" ,java-eclipse-jetty-server-9.2)
7658-
       ;("continuation" ,java-eclipse-jetty-continuation-9.2)
7679+
       ,@(package-inputs java-eclipse-jetty-util-9.2)))
7680+
    (native-inputs
7681+
     `(("io" ,java-eclipse-jetty-io-9.2)
7682+
       ,@(package-native-inputs java-eclipse-jetty-util-9.2)))))
7683+
7684+
(define-public java-eclipse-jetty-xml
7685+
  (package
7686+
    (inherit java-eclipse-jetty-util)
7687+
    (name "java-eclipse-jetty-xml")
7688+
    (arguments
7689+
     `(#:jar-name "eclipse-jetty-xml.jar"
7690+
       #:source-dir "src/main/java"
7691+
       #:jdk ,icedtea-8
7692+
       #:tests? #f; most tests require network
7693+
       #:phases
7694+
       (modify-phases %standard-phases
7695+
         (add-before 'configure 'chdir
7696+
           (lambda _
7697+
             (chdir "jetty-xml"))))))
7698+
    (inputs
7699+
     `(("util" ,java-eclipse-jetty-util)))
7700+
    (native-inputs
7701+
     `(("io" ,java-eclipse-jetty-io)
7702+
       ,@(package-native-inputs java-eclipse-jetty-util)))))
7703+
7704+
(define-public java-eclipse-jetty-xml-9.2
7705+
  (package
7706+
    (inherit java-eclipse-jetty-xml)
7707+
    (version (package-version java-eclipse-jetty-util-9.2))
7708+
    (source (package-source java-eclipse-jetty-util-9.2))
7709+
    (arguments
7710+
     `(#:jar-name "eclipse-jetty-xml.jar"
7711+
       #:source-dir "src/main/java"
7712+
       #:jdk ,icedtea-8
7713+
       #:tests? #f; most tests require network
7714+
       #:phases
7715+
       (modify-phases %standard-phases
7716+
         (add-before 'configure 'chdir
7717+
           (lambda _
7718+
             (chdir "jetty-xml"))))))
7719+
    (inputs
7720+
     `(("util" ,java-eclipse-jetty-util-9.2)
7721+
       ,@(package-inputs java-eclipse-jetty-util-9.2)))
7722+
    (native-inputs
7723+
     `(("io" ,java-eclipse-jetty-io-9.2)
7724+
       ,@(package-native-inputs java-eclipse-jetty-util-9.2)))))
7725+
7726+
(define-public java-eclipse-jetty-webapp
7727+
  (package
7728+
    (inherit java-eclipse-jetty-util)
7729+
    (name "java-eclipse-jetty-webapp")
7730+
    (arguments
7731+
     `(#:jar-name "eclipse-jetty-webapp.jar"
7732+
       #:source-dir "src/main/java"
7733+
       #:jdk ,icedtea-8
7734+
       #:test-exclude (list
7735+
                        ;; Fails, but I don't know why
7736+
                        "**/WebAppContextTest.java")
7737+
       #:phases
7738+
       (modify-phases %standard-phases
7739+
         (add-before 'configure 'chdir
7740+
           (lambda _
7741+
             (chdir "jetty-webapp"))))))
7742+
    (inputs
7743+
     `(("util" ,java-eclipse-jetty-util)
7744+
       ("http" ,java-eclipse-jetty-http)
7745+
       ("server" ,java-eclipse-jetty-server)
7746+
       ("servlet" ,java-eclipse-jetty-servlet)
7747+
       ("security" ,java-eclipse-jetty-security)
7748+
       ("xml" ,java-eclipse-jetty-xml)
7749+
       ("servlet" ,java-tomcat)))
7750+
    (native-inputs
7751+
     `(("io" ,java-eclipse-jetty-io)
7752+
       ,@(package-native-inputs java-eclipse-jetty-util)))))
7753+
7754+
(define-public java-eclipse-jetty-webapp-9.2
7755+
  (package
7756+
    (inherit java-eclipse-jetty-webapp)
7757+
    (version (package-version java-eclipse-jetty-util-9.2))
7758+
    (source (package-source java-eclipse-jetty-util-9.2))
7759+
    (arguments
7760+
     `(#:jar-name "eclipse-jetty-webapp.jar"
7761+
       #:source-dir "src/main/java"
7762+
       #:jdk ,icedtea-8
7763+
       #:test-exclude (list
7764+
                        ;; Fails, but I don't know why
7765+
                        "**/WebAppContextTest.java")
7766+
       #:phases
7767+
       (modify-phases %standard-phases
7768+
         (add-before 'configure 'chdir
7769+
           (lambda _
7770+
             (chdir "jetty-webapp"))))))
7771+
    (inputs
7772+
     `(("util" ,java-eclipse-jetty-util-9.2)
7773+
       ("http" ,java-eclipse-jetty-http-9.2)
7774+
       ("server" ,java-eclipse-jetty-server-9.2)
7775+
       ("servlet" ,java-eclipse-jetty-servlet-9.2)
7776+
       ("security" ,java-eclipse-jetty-security-9.2)
7777+
       ("xml" ,java-eclipse-jetty-xml-9.2)
7778+
       ("servlet" ,java-tomcat)
76597779 
       ,@(package-inputs java-eclipse-jetty-util-9.2)))
76607780 
    (native-inputs
76617781 
     `(("io" ,java-eclipse-jetty-io-9.2)
…
80838203 
       ("transport-wagon" ,maven-resolver-transport-wagon)
80848204 
       ("wagon" ,maven-wagon-provider-api)
80858205 
       ("wagon-file" ,maven-wagon-file)
8206+
       ("wagon-http" ,maven-wagon-http)
8207+
       ("logging" ,java-commons-logging-minimal)
8208+
       ("httpclient" ,java-httpcomponents-client)
8209+
       ("httpcore" ,java-httpcomponents-core)
8210+
       ("wagon-http-shared" ,maven-wagon-http-shared)
8211+
       ("wagon-tck-http" ,maven-wagon-tck-http)
80868212 
       ("container" ,java-eclipse-sisu-plexus)
80878213 
       ("guice" ,java-guice)
80888214 
       ("aop" ,java-aopalliance)
…
87768902 
       #:jdk ,icedtea-8
87778903 
       #:phases
87788904 
       (modify-phases %standard-phases
8779-
         ;(add-before 'check 'fix-paths
8780-
         ;  (lambda _
8781-
         ;    (substitute* "wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java"
8782-
         ;      (("target") "build"))))
87838905 
         (add-after 'build 'generate-metadata
87848906 
           (lambda _
87858907 
             (zero? (system* "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes")
…
87988920 
       ("httpclient" ,java-httpcomponents-client)
87998921 
       ("httpcore" ,java-httpcomponents-core)
88008922 
       ("io" ,java-commons-io)
8923+
       ("jsoup" ,java-jsoup)
88018924 
       ("provider-api" ,maven-wagon-provider-api)))
88028925 
    (native-inputs
88038926 
     `(("provider-test" ,maven-wagon-provider-test)
…
88248947 
       ("xbean" ,java-geronimo-xbean-reflect)
88258948 
       ,@(package-native-inputs maven-wagon-provider-api)))))
88268949 
8827-
(define-public maven-wagon-http
8950+
(define-public maven-wagon-tck-http
88288951 
  (package
88298952 
    (inherit maven-wagon-provider-api)
8830-
    (name "maven-wagon-http")
8953+
    (name "maven-wagon-tck-http")
88318954 
    (arguments
8832-
     `(#:jar-name "maven-wagon-http.jar"
8833-
       #:source-dir "wagon-providers/wagon-http/src/main/java"
8834-
       #:test-dir "wagon-providers/wagon-http/src/test"
8955+
     `(#:jar-name "maven-wagon-tck-http.jar"
8956+
       #:source-dir "wagon-tcks/wagon-tck-http/src/main/java"
8957+
       #:tests? #f; no tests
8958+
       #:jdk ,icedtea-8))
8959+
    (inputs
8960+
     `(("util" ,java-plexus-utils)
8961+
       ("provider-api" ,maven-wagon-provider-api)
8962+
       ("servlet" ,java-tomcat)
8963+
       ("slf4j" ,java-slf4j-api)
8964+
       ("codec" ,java-commons-codec)
8965+
       ("container" ,java-eclipse-sisu-plexus)
8966+
       ("classworlds" ,java-plexus-classworlds)
8967+
       ("jetty-util" ,java-eclipse-jetty-util-9.2)
8968+
       ("jetty-webapp" ,java-eclipse-jetty-webapp-9.2)
8969+
       ("jetty-security" ,java-eclipse-jetty-security-9.2)
8970+
       ("jetty-server" ,java-eclipse-jetty-server-9.2)
8971+
       ("jetty-servlet" ,java-eclipse-jetty-servlet-9.2)))))
8972+
8973+
(define-public maven-wagon-http-lightweight
8974+
  (package
8975+
    (inherit maven-wagon-provider-api)
8976+
    (name "maven-wagon-http-lightweight")
8977+
    (arguments
8978+
     `(#:jar-name "maven-wagon-http-lightweight.jar"
8979+
       #:source-dir "wagon-providers/wagon-http-lightweight/src/main/java"
8980+
       #:test-dir "wagon-providers/wagon-http-lightweight/src/test"
88358981 
       #:jdk ,icedtea-8
88368982 
       #:phases
88378983 
       (modify-phases %standard-phases
8838-
         ;(add-before 'check 'fix-paths
8839-
         ;  (lambda _
8840-
         ;    (substitute* "wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java"
8841-
         ;      (("target") "build"))))
88428984 
         (add-after 'build 'generate-metadata
88438985 
           (lambda _
88448986 
             (zero? (system* "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes")
88458987 
                             "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
8846-
                             "--source" "wagon-providers/wagon-http/src/main/java"
8988+
                             "--source" "wagon-providers/wagon-http-lightweight/src/main/java"
88478989 
                             "--output" "build/classes/META-INF/plexus/components.xml"
88488990 
                             ;; I don't know what these two options do, but if
88498991 
                             ;; not present, it ends with a NullPointerException.
…
88518993 
                             "--descriptors" "build/classes/META-INF"))))
88528994 
         (add-after 'generate-metadata 'rebuild
88538995 
           (lambda _
8854-
             (zero? (system* "ant" "jar")))))))
8996+
             (zero? (system* "ant" "jar"))))
8997+
         (add-before 'check 'fix-resource-path
8998+
           (lambda _
8999+
             (substitute* "wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpsWagonTest.java"
9000+
               (("src/test") "wagon-providers/wagon-http-lightweight/src/test"))
9001+
             #t)))))
9002+
    (inputs
9003+
     `(("utils" ,java-plexus-utils)
9004+
       ("httpclient" ,java-httpcomponents-client)
9005+
       ("httpcore" ,java-httpcomponents-core)
9006+
       ("wagon-http-shared" ,maven-wagon-http-shared)
9007+
       ("wagon-tck-http" ,maven-wagon-tck-http)
9008+
       ("provider-api" ,maven-wagon-provider-api)
9009+
       ("io" ,java-commons-io)))
9010+
    (native-inputs
9011+
     `(("provider-test" ,maven-wagon-provider-test)
9012+
       ("metadata" ,java-plexus-component-metadata)
9013+
       ("annotations" ,java-plexus-component-annotations)
9014+
       ("container" ,java-eclipse-sisu-plexus)
9015+
       ("sisu-inject" ,java-eclipse-sisu-inject)
9016+
       ("classworlds" ,java-plexus-classworlds)
9017+
       ("guava" ,java-guava)
9018+
       ("guice" ,java-guice)
9019+
       ("inject" ,java-javax-inject)
9020+
       ("cglib" ,java-cglib)
9021+
       ("slf4j" ,java-slf4j-api)
9022+
       ("utils" ,java-plexus-utils)
9023+
       ("cli" ,java-plexus-cli)
9024+
       ("plugin-api" ,maven-plugin-api)
9025+
       ("plugin-annotations" ,maven-plugin-annotations)
9026+
       ("core" ,maven-core)
9027+
       ("model" ,maven-model)
9028+
       ("cli" ,java-commons-cli)
9029+
       ("qdox" ,java-qdox)
9030+
       ("jdom2" ,java-jdom2)
9031+
       ("asm" ,java-asm)
9032+
       ("xbean" ,java-geronimo-xbean-reflect)
9033+
       ("servlet" ,java-tomcat)
9034+
       ("jetty-util" ,java-eclipse-jetty-util-9.2)
9035+
       ("jetty-io" ,java-eclipse-jetty-io-9.2)
9036+
       ("jetty-http" ,java-eclipse-jetty-http-9.2)
9037+
       ("jetty-server" ,java-eclipse-jetty-server-9.2)
9038+
       ("jetty-servlet" ,java-eclipse-jetty-servlet-9.2)
9039+
       ("jetty-security" ,java-eclipse-jetty-security-9.2)
9040+
       ("jsoup" ,java-jsoup)
9041+
       ("hamcrest" ,java-hamcrest-core)
9042+
       ("logging" ,java-commons-logging-minimal)
9043+
       ("simple" ,java-slf4j-simple)
9044+
       ,@(package-native-inputs maven-wagon-provider-api)))))
9045+
9046+
(define-public maven-wagon-http
9047+
  (package
9048+
    (inherit maven-wagon-provider-api)
9049+
    (name "maven-wagon-http")
9050+
    (arguments
9051+
     `(#:jar-name "maven-wagon-http.jar"
9052+
       #:source-dir "wagon-providers/wagon-http/src/main/java"
9053+
       #:test-dir "wagon-providers/wagon-http/src/test"
9054+
       #:test-exclude (list
9055+
                        "**/Abstract*.java"
9056+
                        ;; FIXME: javax.net.ssl.SSLHandshakeException:
9057+
                        ;; sun.security.validator.ValidatorException:
9058+
                        ;; PKIX path building failed:
9059+
                        ;; sun.security.provider.certpath.SunCertPathBuilderException:
9060+
                        ;; unable to find valid certification path to requested target
9061+
                        "**/HttpsWagonPreemptiveTest.java"
9062+
                        "**/HttpsWagonTest.java"
9063+
                        ;; Injection errors
9064+
                        "**/TckTest.java")
9065+
       #:jdk ,icedtea-8
9066+
       #:phases
9067+
       (modify-phases %standard-phases
9068+
         (add-before 'build 'copy-resources
9069+
           (lambda _
9070+
             (install-file "wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml"
9071+
                           "build/classes/META-INF/plexus")
9072+
             #t))
9073+
         (add-before 'check 'fix-resource-path
9074+
           (lambda _
9075+
             (substitute* '("wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java"
9076+
                            "wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonTest.java")
9077+
               (("src/test") "wagon-providers/wagon-http/src/test"))
9078+
             #t)))))
88559079 
    (inputs
88569080 
     `(("utils" ,java-plexus-utils)
88579081 
       ("httpclient" ,java-httpcomponents-client)
88589082 
       ("httpcore" ,java-httpcomponents-core)
9083+
       ("wagon-http-shared" ,maven-wagon-http-shared)
9084+
       ("wagon-tck-http" ,maven-wagon-tck-http)
88599085 
       ("provider-api" ,maven-wagon-provider-api)))
88609086 
    (native-inputs
88619087 
     `(("provider-test" ,maven-wagon-provider-test)
88629088 
       ("metadata" ,java-plexus-component-metadata)
88639089 
       ("annotations" ,java-plexus-component-annotations)
88649090 
       ("container" ,java-eclipse-sisu-plexus)
9091+
       ("container" ,java-plexus-container-default)
88659092 
       ("sisu-inject" ,java-eclipse-sisu-inject)
88669093 
       ("classworlds" ,java-plexus-classworlds)
88679094 
       ("guava" ,java-guava)
…
88809107 
       ("jdom2" ,java-jdom2)
88819108 
       ("asm" ,java-asm)
88829109 
       ("xbean" ,java-geronimo-xbean-reflect)
9110+
       ("servlet" ,java-tomcat)
9111+
       ("jetty-util" ,java-eclipse-jetty-util-9.2)
9112+
       ("jetty-io" ,java-eclipse-jetty-io-9.2)
9113+
       ("jetty-http" ,java-eclipse-jetty-http-9.2)
9114+
       ("jetty-server" ,java-eclipse-jetty-server-9.2)
9115+
       ("jetty-servlet" ,java-eclipse-jetty-servlet-9.2)
9116+
       ("jetty-security" ,java-eclipse-jetty-security-9.2)
9117+
       ("hamcrest" ,java-hamcrest-core)
9118+
       ("logging" ,java-commons-logging-minimal)
9119+
       ("codec" ,java-commons-codec)
9120+
       ("io" ,java-commons-io)
9121+
       ("jsoup" ,java-jsoup)
9122+
       ("simple" ,java-slf4j-simple)
88839123 
       ,@(package-native-inputs maven-wagon-provider-api)))))
88849124 
88859125 
(define-public maven-embedder