From 453940a997ef72f389a55de3e9a3c8f8428ae3d6 Mon Sep 17 00:00:00 2001

From: Michael Simacek <msimacek@redhat.com>

Date: Fri, 31 Mar 2017 13:00:10 +0200

Subject: [PATCH] Port to dom4j 2.0

---

 src/main/java/org/apache/velocity/tools/generic/XmlTool.java | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java

index 4ab748c..3d5feab 100644

--- a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java

+++ b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java

@@ -572,7 +572,7 @@ public class XmlTool extends SafeConfig

         {

             if (n instanceof Element)

             {

-                kids.addAll((List<Node>)((Element)n).elements());

+                kids.addAll(((Element)n).elements());

             }

         }

         return new XmlTool(kids);

-- 

2.9.3

diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java

--- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java	2007-12-12 18:04:38.000000000 +0100

+++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java	2015-06-19 15:50:41.054584752 +0200

@@ -36,6 +36,7 @@

 import javax.servlet.RequestDispatcher;

 import javax.servlet.ServletContext;

 import javax.servlet.ServletOutputStream;

+import javax.servlet.WriteListener;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 import javax.servlet.http.HttpServletResponseWrapper;

@@ -510,6 +511,14 @@

                     {

                         bos.write(b);

                     }

+

+                    public void setWriteListener(WriteListener listener) {

+                        throw new UnsupportedOperationException("Not implemented yet.");

+                    }

+

+                    public boolean isReady() {

+                        return false;

+                    }

                 };

             return sos;

         }

diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java

--- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java	2009-05-12 00:24:53.000000000 +0200

+++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java	2015-06-19 15:45:11.950303234 +0200

@@ -174,7 +174,7 @@

         Map source = super.getSource();

         if (source == null)

         {

-            source = expandSingletonArrays(getRequest().getParameterMap());

+            source = expandSingletonArrays((Map<String,Object>)(Object)getRequest().getParameterMap());

             super.setSource(source);

         }

         return source;

From 9787463683fe062c5f069180eebfe493933e31da Mon Sep 17 00:00:00 2001

From: Julien Lepiller <julien@lepiller.eu>

Date: Fri, 25 Jan 2019 14:12:19 +0100

Subject: [PATCH] Port to plexus-utils 3.

Patch adapted from fedora.

---

 .../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java  | 11 ++++++++++-

 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

index 13eea52..181c2c1 100644

--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

@@ -568,7 +568,16 @@ public class DefaultSiteRenderer

         // doxiaSiteRendererVersion

         InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/"

             + "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" );

-        Properties properties = PropertyUtils.loadProperties( inputStream );

+        Properties properties;

+        try

+        {

+            properties = PropertyUtils.loadProperties( inputStream );

+        }

+        catch ( IOException exc )

+        {

+            properties = null;

+        }

+

         if ( inputStream == null )

         {

             getLogger().debug( "pom.properties for doxia-site-renderer could not be found." );

-- 

2.11.0

             (copy-recursively "src/main/resources" "build/classes")

             #t))

         (add-before 'check 'copy-test-resource

             (copy-recursively "src/test/resources" "build/test-classes")

             #t)))))

    (inputs

     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)

       ("java-cglib" ,java-cglib)

       ("java-commons-beanutils", java-commons-beanutils)))

    (native-inputs

     `(("java-junit" ,java-junit)

       ("java-hamcrest-core" ,java-hamcrest-core)))

    (home-page "https://commons.apache.org/proper/commons-digester/")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

(define-public java-commons-digester-2

  (package

    (name "java-commons-digester-2")

    (version "2.1")

    (source (origin

              (method url-fetch)

              (uri (string-append "mirror://apache/commons/digester/source/"

                                  "commons-digester-" version "-src.tar.gz"))

              (sha256

               (base32

                "0gsli0qbi8h795ps7dpiccd3xfaqwrqcl7qzv59y5iyyd9xg04r7"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "commons-digester.jar"

       #:source-dir "src/main/java"

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'copy-resource

           (lambda _

             (copy-recursively "src/main/resources" "build/classes")

             #t))

         (add-before 'check 'copy-test-resource

           (lambda _

             (copy-recursively "src/test/resources" "build/test-classes")

             #t)))))

             (copy-recursively "src/main/resources" "build/classes")

             #t))

         (add-before 'check 'copy-test-resource

           (lambda _

             (copy-recursively "src/test/resources" "build/test-classes")

             #t)))))

         ;(add-before 'build 'fix-digester

         ;  (lambda _

         ;    ;; Port from digester 1 to digester 3.

         ;    (substitute* (find-files "src/main/java" ".*\\.java")

         ;      (("commons.digester") "commons.digester3")

         ;      (("org.apache.commons.digester3.xmlrules.DigesterLoader")

         ;       "org.apache.commons.digester3.binder.DigesterLoader"))

         ;    ;; digester is private in this class, so we use the getter

         ;    (substitute* "src/main/java/org/apache/commons/validator/FormSetFactory.java"

         ;      (("digester.peek") "getDigester().peek"))

         ;    (substitute* "src/main/java/org/apache/commons/validator/ValidatorResources.java"

         ;      (("// DEPRECATED")

         ;       "// DEPRECATED\nimport org.apache.commons.digester3.xmlrules.FromXmlRulesModule;")

         ;      (("private Digester initDigester")

         ;       (string-append

         ;         "private FromXmlRulesModule rulesModule(final URL url) {\n"

         ;         "  return new FromXmlRulesModule() {\n"

         ;         "    @Override\n"

         ;         "    protected void loadRules() {\n"

         ;         "      loadXMLRules(url);"

         ;         "    }\n"

         ;         "  };\n"

         ;         "}\n"

         ;         "private Digester initDigester"))

         ;      ;; Copied from digester tests

         ;      (("createDigester\\(rulesUrl\\)")

         ;       "newLoader(rulesModule(rulesUrl)).newDigester()")))))))

    (inputs

     `(("java-commons-digester-2" ,java-commons-digester-2)

(define-public java-myfaces-api

  (package

    (name "java-myfaces-api")

    (version "2.3.2")

    (source (origin

              (method url-fetch)

              (uri (string-append "mirror://apache/myfaces/source/"

                                  "myfaces-core-assembly-" version "-src.tar.gz"))

              (sha256

               (base32

                "0nixl958pi7f61vgnaj0nshdpifdg4m0rlxb9ckdmabr6x2fsnvc"))))

              ; version 2.3.1:

              ;(method svn-fetch)

              ;(uri (svn-reference

              ;       (url (string-append "http://svn.apache.org/repos/asf/"

              ;                           "myfaces/core/tags/myfaces-core-module-"

              ;                           version))

              ;       (revision 1830627)))

              ;(file-name (string-append name "-" version))

              ;(sha256

              ; (base32

              ;  "1wag19756ahys8cms4snsqbqifkpfy578x3zkjkr5ba0424v5yvz"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "myfaces-api.jar"

       #:source-dir "api/src/main/java"

       #:test-dir "api/src/test"

       #:phases

       (modify-phases %standard-phases

         (add-after 'unpack 'double-unpack

           (lambda _

             (chdir "src")

             (invoke "unzip" (car (find-files "." "source-release")))

             (chdir (car (find-files "." "core-module" #:directories? #t)))

             ;; Require a maven-2 plugin :/

             (delete-file-recursively "api/src/main/java/javax/faces/component")

             #t)))))

    (inputs

     `(("java-javax-inject" ,java-javax-inject)

       ;; for javax-el (el-api)

       ("java-tomcat" ,java-tomcat)))

    (native-inputs

     `(("unzip" ,unzip)))

    (home-page "https://commons.apache.org/proper/commons-chain")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

(define-public java-commons-chain

  (package

    (name "java-commons-chain")

    (version "1.2")

    (source (origin

              (method url-fetch)

              (uri (string-append "mirror://apache//commons/chain/source/"

                                  "commons-chain-" version "-src.tar.gz"))

              (sha256

               (base32

                "0lgib3dpkympp8ajlgpfavbzfal9bv685gfa9ygyv091ja772rsd"))))

    (build-system ant-build-system)

    (arguments

     `(#:test-target "test"

       ;; TODO: incompatibilities with current versions of portlet

       #:tests? #f

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'prepare

           (lambda* (#:key inputs #:allow-other-keys)

         ;    ;; Replace digester with digester3

         ;    (substitute* (find-files "src" ".*\\.java")

         ;      (("commons.digester") "commons.digester3"))

             (with-directory-excursion "src/java/org/apache/commons/chain"

         ;      ;; Remove a dependency to myfaces

               (delete-file-recursively "web/faces"))

         ;      ;; digester is now private: use a public accessor

         ;      (substitute* '("config/ConfigCatalogRule.java"

         ;                     "config/ConfigDefineRule.java"

         ;                     "config/ConfigRegisterRule.java")

         ;        (("digester\\.") "getDigester().")))

             #t))

         (replace 'install

           (install-jars ".")))))

    (inputs

     `(("java-classpathx-servletapi" ,java-classpathx-servletapi)

       ("java-commons-beanutils" ,java-commons-beanutils)

       ("java-commons-digester-2" ,java-commons-digester-2)

       ("java-commons-logging-minimal" ,java-commons-logging-minimal)

       ("java-portlet-api" ,java-portlet-api)))

    ;(native-inputs

    ; `(("java-junit" ,java-junit)))

    (home-page "https://commons.apache.org/proper/commons-chain")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

       #:test-dir "src/core/src/test"))

       ;#:phases

       ;(modify-phases %standard-phases

       ;  (add-before 'build 'copy-required-classes

       ;    (lambda* (#:key inputs #:allow-other-keys)

       ;      (let ((tools (assoc-ref inputs "java-velocity-tools"))

       ;            (velocity-dir "build/velocity")

       ;            (tools-dir (string-append "build/velocity/velocity-tools-"

       ;                                      ,(package-version java-velocity-tools)

       ;                                      "-src")))

       ;        (mkdir-p velocity-dir)

       ;        (with-directory-excursion velocity-dir

       ;          (invoke "tar" "xf" tools))

       ;        (with-directory-excursion tools-dir

       ;          (for-each

       ;            (lambda (file)

       ;              (install-file file (string-append "../../../src/core/"

       ;                                                (dirname file))))

       ;            (find-files "." "."))))

       ;              ;(find-files "." "ToolboxManager.java$")

       ;              ;(find-files "." "^ToolInfo.java$")

       ;              ;(find-files "." "^ServletUtils.java$")

       ;              ;(find-files "." "^SkipSetters.java$")

       ;              ;(find-files "." "^ViewToolContext.java$")

       ;              ;(find-files "." "^ViewContext.java$")

       ;              ;(find-files "." "^ChainedContext.java$")))))

       ;      #t)))))

       ("java-spring-framework-web" ,java-spring-framework-web)

(define-public java-apache-struts-1

  (package

    (name "java-apache-struts-1")

    (version "1.3.10")

    (source (origin

              (method url-fetch)

              (uri (string-append "mirror://apache/struts/"

                                  version "/struts-" version "-src.zip"))

              (sha256

               (base32

                "05mxari6m8vrirz3i7rdvjpc637s11fjl6qk9hpvl1yyy7bigmn1"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "struts.jar"

       #:source-dir "src/core/src/main/java"

       #:test-dir "src/core/src/test"

       #:tests? #f; require deleted files

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'prepare

           (lambda* (#:key inputs #:allow-other-keys)

             (with-directory-excursion "src/core/src/main/java"

               (for-each delete-file (find-files "." "^Test"))

               (delete-file-recursively "org/apache/struts/mock"))

             #t)))))

    (inputs

     `(("antlr2" ,antlr2)

       ("java-classpathx-servletapi" ,java-classpathx-servletapi)

       ("java-commons-beanutils" ,java-commons-beanutils)

       ("java-commons-chain" ,java-commons-chain)

       ("java-commons-digester-2" ,java-commons-digester-2)

       ("java-commons-logging-minimal" ,java-commons-logging-minimal)

       ("java-commons-fileupload" ,java-commons-fileupload)

       ("java-commons-validator" ,java-commons-validator)))

    (native-inputs

     `(("unzip" ,unzip)))

    (home-page "")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

(define-public java-apache-struts-taglib-1

  (package

    (inherit java-apache-struts-1)

    (name "java-apache-struts-taglib-1")

    (arguments

     `(#:jar-name "struts.jar"

       #:source-dir "src/taglib/src/main/java"

       #:tests? #f; require deleted files

       #:test-dir "src/taglib/src/test"))

    (inputs

     `(("java-apache-struts-1" ,java-apache-struts-1)

       ,@(package-inputs java-apache-struts-1)))))

(define-public java-apache-struts-tiles-1

  (package

    (inherit java-apache-struts-1)

    (name "java-apache-struts-tiles-1")

    (arguments

     `(#:jar-name "struts.jar"

       #:source-dir "src/tiles/src/main/java"

       #:tests? #f; require deleted files

       #:test-dir "src/tiles/src/test"))

    (inputs

     `(("java-apache-struts-1" ,java-apache-struts-1)

       ,@(package-inputs java-apache-struts-1)))))

(define-public java-sslext

  (package

    (name "java-sslext")

    (version "1.2")

    (source (origin

              (method url-fetch)

              (uri (string-append "mirror://sourceforge/sslext/sslext%20for%20"

                                  "Struts%201.2/Release%200/"

                                  "sslext-struts1.2-src.tar.gz"))

              (sha256

               (base32

                "1a2axpq719smfc37lnj1flprpdhi8m1rmkdp90z2fv13rdg2dlq5"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "sslext.jar"

       #:source-dir "."

       #:tests? #f

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'fix-enum

           (lambda _

             (substitute* "build.xml"

               (("<javac") "<javac source=\"1.4\"")))))))

    (inputs

     `(("java-commons-digester-2" ,java-commons-digester-2)

       ("java-commons-logging-minimal" ,java-commons-logging-minimal)

       ("java-apache-struts-1" ,java-apache-struts-1)

       ("java-apache-struts-taglib-1" ,java-apache-struts-taglib-1)

       ("java-apache-struts-tiles-1" ,java-apache-struts-tiles-1)

       ("java-tomcat" ,java-tomcat)))

    (home-page "https://velocity.apache.org/tools/devel")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

                "0d93v8nj95jfdgx7n72axaavdq2h800vxyi4vx35rdphndy1xg51"))

              (patches

                (search-patches

                  "java-velocity-tools-2.0-servlet.patch"

                  "java-velocity-tools-2.0-port-to-dom4j-2.0.patch"))))

           (install-jars "dist")))))

     `(("java-apache-struts-1" ,java-apache-struts-1)

       ("java-apache-struts-taglib-1" ,java-apache-struts-taglib-1)

       ("java-apache-struts-tiles-1" ,java-apache-struts-tiles-1)

       ("java-commons-digester-2" ,java-commons-digester-2)

       ("java-sslext" ,java-sslext)

(define-public java-plexus-i18n

  (package

    (name "java-plexus-i18n")

    (version "1.0-beta12")

    (source (origin

              (method git-fetch)

              (uri (git-reference

                     (url "https://github.com/codehaus-plexus/plexus-i18n.git")

                     (commit "e5b25dd280af2db4d91742a0d93571335e09c46a")))

              (file-name (git-file-name name version))

              (sha256

               (base32

                "1nkq3c6ba8hv01qi30k50lwa18iswnl9q6i6lrcxdvyzq015jqcl"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "java-plexus-i18n.jar"

       #:source-dir "src/main/java"))

    (inputs

     `(("java-plexus-classworlds" ,java-plexus-classworlds)

       ("java-plexus-component-annotations" ,java-plexus-component-annotations)

       ("java-plexus-container-default" ,java-plexus-container-default)

       ("java-plexus-utils" ,java-plexus-utils)))

    (native-inputs

     `(("java-commons-collections" ,java-commons-collections)

       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)

       ("java-guava" ,java-guava)

       ("java-junit" ,java-junit)))

    (home-page "https://codehaus-plexus.github.io/plexus-i18n/")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

;;; Copyright ?? 2017, 2019 Julien Lepiller <julien@lepiller.eu>

  #:use-module (guix git-download)

       #:tests? #f)); no tests

              (method url-fetch)

              (uri (string-append "https://archive.apache.org/dist/maven/"

                                  "shared/maven-filtering-" version

                                  "-source-release.zip"))

              (sha256

               (base32

                "09wrdhchnszd2l6h4z30ra0bv1a19qyjgac9z8zf1pn0m4nw05yz"))))

         (add-before 'build 'remove-failing-test

           (lambda _

             (delete-file "src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java")

             (substitute* "src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java"

               (("org.sonatype.aether.RepositorySystemSession")

                "org.eclipse.aether.RepositorySystemSession"))

             #t)))))

              (method url-fetch)

              (uri (string-append "https://github.com/apache/maven-plugin-testing/"

                                  "archive/maven-plugin-testing-" version ".tar.gz"))

              (sha256

               (base32

                "010jp44vq75fk6260zvqz41ai3l1sqrjz56yyzv9pgshx27vpshy"))))

       #:test-dir "maven-plugin-testing-harness/src/test"))

              (method url-fetch)

              (uri (string-append "https://github.com/apache/maven-doxia/"

                                  "archive/doxia-" version ".tar.gz"))

              (sha256

               (base32

                "07qckb1fsycnz5b08xbm8b1hjz8295ri6xi47s47rlwxg53hvf4s"))))

       #:tests? #f)); No tests

       #:tests? #f)); No tests

             ;; requires network

             "**/XmlValidatorTest.java"

             "**/Abstract*Test.java")

         (add-before 'build 'copy-resources

           (lambda _

             (copy-recursively "doxia-core/src/main/resources"

                               "build/classes")

             #t))

             ;; requires network

             "**/XmlValidatorTest.java"

             "**/Abstract*Test.java")

         (add-before 'build 'copy-test-classes

           (lambda _

             (copy-recursively "doxia-core/src/test/java" "doxia-modules/doxia-module-xhtml/src/test/java")

             (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java"

                        "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java")

             (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java"

                        "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java")

             (mkdir-p "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/sink/impl")

             (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java"

                        "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java")

             #t))

              (method url-fetch)

              (uri (string-append "https://github.com/apache/maven-doxia-sitetools/"

                                  "archive/doxia-sitetools-" version ".tar.gz"))

              (sha256

               (base32

                "02dgblm6n07jwr7r90wzc8ax9vz3ax7rh5w12wmvfyd5aybh691w"))

              (patches

                (search-patches "maven-doxia-sitetools-fix-plexus-utils.patch"))))

       #:tests? #f; require gargoylesoftware-htmlunit

             (copy-recursively "doxia-site-renderer/src/main/resources"

                               "build/classes")

       ("java-plexus-i18n" ,java-plexus-i18n)

       ("maven-doxia-module-xhtml" ,maven-doxia-module-xhtml)

              (method url-fetch)

              (uri (string-append "https://github.com/apache/maven-reporting-api/"

                                  "archive/maven-reporting-api-" version ".tar.gz"))

              (sha256

               (base32

                "1dc94n7czax7vrniv4xyqlza2mjqdlzzvq6wh6cmcqnnmgggya91"))))

       #:tests? #f)); no tests

(define-public maven-reporting-impl

  (package

    (name "maven-reporting-impl")

    (version "3.0")

    (source (origin

              (method git-fetch)

              (uri (git-reference

                     (url "https://github.com/apache/maven-reporting-impl.git")

                     (commit "ff10bba47b9ecf728a0f16e096fb410b74711a5d")))

              (file-name (git-file-name name version))

              (sha256

               (base32

                "02da8pqa17lmkwjhqyq39ygf4lfa483bbdvhbvjginmpw3ydkbw5"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "maven-reporting-impl.jar"

       #:source-dir "src/main/java"

       #:test-dir "src/test"

       ;; Require junitx.util.PrivateAccessor (?)

       #:tests? #f))

    (inputs

     `(("java-plexus-utils" ,java-plexus-utils)

       ("maven-core" ,maven-core)

       ("maven-doxia-core" ,maven-doxia-core)

       ("maven-doxia-decoration-model" ,maven-doxia-decoration-model)

       ("maven-doxia-logging-api" ,maven-doxia-logging-api)

       ("maven-doxia-module-xhtml" ,maven-doxia-module-xhtml)

       ("maven-doxia-sink-api" ,maven-doxia-sink-api)

       ("maven-doxia-site-renderer" ,maven-doxia-site-renderer)

       ("maven-plugin-annotations" ,maven-plugin-annotations)

       ("maven-plugin-api" ,maven-plugin-api)

       ("maven-reporting-api" ,maven-reporting-api)

       ("maven-shared-utils" ,maven-shared-utils)))

    (native-inputs

     `(("java-junit" ,java-junit)))

    (home-page "")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

    (version "3.6.0")

              (method url-fetch)

              (uri (string-append "https://github.com/apache/maven-plugin-tools/"

                                  "archive/maven-plugin-tools-" version ".tar.gz"))

              (sha256

               (base32

                "1miq87ywh48v0hwl3a4q95rxbgg58zpk59v6z34bl715hcawbv80"))))

       #:tests? #f)); disabled for now. Require maven-plugin-testing that doesn't build yet

(define-public maven-plugin-annotations

  (package

    (inherit maven-plugin-tools-api)

    (name "maven-plugin-annotations")

    (arguments

     `(#:jar-name "maven-plugin-annotations.jar"

       #:tests? #f; no tests

       #:source-dir "maven-plugin-annotations/src/main/java"))

    (inputs

     `(("maven-artifact" ,maven-artifact)))

    (description "")))

        (add-before 'build 'fix-exception

          (lambda _

            (substitute* "maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java"

              (("Properties properties = PropertyUtils.*")

               "Properties properties;

            #t)))))

       #:tests? #f; no tests

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'copy-resources

           (lambda _

             (copy-recursively "maven-plugin-plugin/src/main/resources"

                               "build/classes")

             (copy-recursively "maven-plugin-plugin/src/main/filtered-resources"

                               "build/classes")

             #t))

         (add-before 'build 'generate-models

           (lambda* (#:key inputs #:allow-other-keys)

             (define (modello-single-mode file version mode)

               (invoke "java" "org.codehaus.modello.ModelloCli"

                       file mode "maven-plugin-plugin/src/main/java" version

                       "false" "true"))

             (modello-single-mode "maven-plugin-plugin/src/main/mdo/pluginRequirements.mdo"

                                  "1.0.0" "java"))))))

       ("maven-doxia-logging-api" ,maven-doxia-logging-api)

       ("maven-plugin-tools-generators" ,maven-plugin-tools-generators)

       ("maven-reporting-api" ,maven-reporting-api)

       ("maven-reporting-impl" ,maven-reporting-impl)

       ("maven-repository-metadata" ,maven-repository-metadata)))

    (native-inputs

     `(("java-modello-core" ,java-modello-core)

       ;; for modello:

       ("java-asm" ,java-asm)

       ("java-cglib" ,java-cglib)

       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)

       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)

       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)

       ("java-guava" ,java-guava)

       ("java-guice" ,java-guice)

       ("java-javax-inject" ,java-javax-inject)

       ("java-plexus-classworlds" ,java-plexus-classworlds)

       ("java-plexus-component-annotations" ,java-plexus-component-annotations)

       ("java-sisu-build-api" ,java-sisu-build-api)

       ;; modello plugins:

       ("java-modello-plugins-java" ,java-modello-plugins-java)))

              (method url-fetch)

              (uri (string-append "https://github.com/apache/"

                                  "maven-resources-plugin/archive/"

                                  "maven-resources-plugin-" version ".tar.gz"))

              (sha256

               (base32

                "1f5gnjg2xmqfxml6k0ydyd1sxxwzgnb24qn6avcc4mijwd8a84pl"))))

         (add-before 'build 'copy-pom

           (lambda _

             (mkdir-p "build/classes/META-INF/maven")

             (copy-file "pom.xml" "build/classes/META-INF/pom.xml")))

         (add-after 'install 'install-pom

           (lambda* (#:key outputs #:allow-other-keys)

             (install-file "pom.xml" (string-append (assoc-ref outputs "out")

                                     "/share/pom.xml")))))))

    (version "0.3.2")

              (uri (pypi-uri "pynvim" version))

                "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g"))))

    (home-page "https://github.com/neovim/pynvim")

;;; GNU Guix --- Functional package management for GNU

;;; Copyright ?? 2019 Kei Julien Lepiller <julien@lepiller.eu>

;;;

;;; This file is part of GNU Guix.

;;;

;;; GNU Guix is free software; you can redistribute it and/or modify it

;;; under the terms of the GNU General Public License as published by

;;; the Free Software Foundation; either version 3 of the License, or (at

;;; your option) any later version.

;;;

;;; GNU Guix is distributed in the hope that it will be useful, but

;;; WITHOUT ANY WARRANTY; without even the implied warranty of

;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

;;; GNU General Public License for more details.

;;;

;;; You should have received a copy of the GNU General Public License

;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

(define-module (more packages vim)

  #:use-module (guix packages)

  #:use-module (guix download)

  #:use-module (guix git-download)

  #:use-module (guix build-system gnu)

  #:use-module (gnu packages)

  #:use-module (more packages python)

  #:use-module ((guix licenses) #:prefix license:))

(define-public neovim-coquille

  (package

    (name "neovim-coquille")

    (version "0")

    (source (origin

              (method git-fetch)

              (uri (git-reference

                     (url "https://framagit.org/tyreunom/coquille.git")

                     (commit "6a7833312fe6156df568815ff1b4bae9241fd4a3")))

              (file-name (git-file-name name version))

              (sha256

               (base32

                "0gmlb9g29cky8acr0zq9fy7r7lp9jvp6sik3srmggrsbmf2wzng1"))))

    (build-system gnu-build-system)

    (arguments

     `(#:tests? #f

       #:phases

       (modify-phases %standard-phases

         (delete 'configure)

         (delete 'build)

         (replace 'install

           (lambda* (#:key outputs #:allow-other-keys)

             (let* ((out (assoc-ref outputs "out"))

                    (nvim (string-append out "/share/nvim/site/coquille")))

               (delete-file ".travis.yml")

               (delete-file ".gitignore")

               (for-each

                 (lambda (file)

                   (install-file file (string-append nvim "/" (dirname file))))

                 (find-files "." ".")))

             #t)))))

    (propagated-inputs

     `(("python-neovim" ,python-neovim)))

    (home-page "https://framagit.org/tyreunom/coquille")

    (synopsis "")

    (description "")

    (license license:expat)))