Add maven-plugin-plugin
java-velocity-tools-2.0-port-to-dom4j-2.0.patch unknown status 1
1 | + | From 453940a997ef72f389a55de3e9a3c8f8428ae3d6 Mon Sep 17 00:00:00 2001 | |
2 | + | From: Michael Simacek <msimacek@redhat.com> | |
3 | + | Date: Fri, 31 Mar 2017 13:00:10 +0200 | |
4 | + | Subject: [PATCH] Port to dom4j 2.0 | |
5 | + | ||
6 | + | --- | |
7 | + | src/main/java/org/apache/velocity/tools/generic/XmlTool.java | 2 +- | |
8 | + | 1 file changed, 1 insertion(+), 1 deletion(-) | |
9 | + | ||
10 | + | diff --git a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java | |
11 | + | index 4ab748c..3d5feab 100644 | |
12 | + | --- a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java | |
13 | + | +++ b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java | |
14 | + | @@ -572,7 +572,7 @@ public class XmlTool extends SafeConfig | |
15 | + | { | |
16 | + | if (n instanceof Element) | |
17 | + | { | |
18 | + | - kids.addAll((List<Node>)((Element)n).elements()); | |
19 | + | + kids.addAll(((Element)n).elements()); | |
20 | + | } | |
21 | + | } | |
22 | + | return new XmlTool(kids); | |
23 | + | -- | |
24 | + | 2.9.3 | |
25 | + |
java-velocity-tools-2.0-servlet.patch unknown status 1
1 | + | 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 | |
2 | + | --- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2007-12-12 18:04:38.000000000 +0100 | |
3 | + | +++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2015-06-19 15:50:41.054584752 +0200 | |
4 | + | @@ -36,6 +36,7 @@ | |
5 | + | import javax.servlet.RequestDispatcher; | |
6 | + | import javax.servlet.ServletContext; | |
7 | + | import javax.servlet.ServletOutputStream; | |
8 | + | +import javax.servlet.WriteListener; | |
9 | + | import javax.servlet.http.HttpServletRequest; | |
10 | + | import javax.servlet.http.HttpServletResponse; | |
11 | + | import javax.servlet.http.HttpServletResponseWrapper; | |
12 | + | @@ -510,6 +511,14 @@ | |
13 | + | { | |
14 | + | bos.write(b); | |
15 | + | } | |
16 | + | + | |
17 | + | + public void setWriteListener(WriteListener listener) { | |
18 | + | + throw new UnsupportedOperationException("Not implemented yet."); | |
19 | + | + } | |
20 | + | + | |
21 | + | + public boolean isReady() { | |
22 | + | + return false; | |
23 | + | + } | |
24 | + | }; | |
25 | + | return sos; | |
26 | + | } | |
27 | + | 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 | |
28 | + | --- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2009-05-12 00:24:53.000000000 +0200 | |
29 | + | +++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2015-06-19 15:45:11.950303234 +0200 | |
30 | + | @@ -174,7 +174,7 @@ | |
31 | + | Map source = super.getSource(); | |
32 | + | if (source == null) | |
33 | + | { | |
34 | + | - source = expandSingletonArrays(getRequest().getParameterMap()); | |
35 | + | + source = expandSingletonArrays((Map<String,Object>)(Object)getRequest().getParameterMap()); | |
36 | + | super.setSource(source); | |
37 | + | } | |
38 | + | return source; |
maven-doxia-sitetools-fix-plexus-utils.patch unknown status 1
1 | + | From 9787463683fe062c5f069180eebfe493933e31da Mon Sep 17 00:00:00 2001 | |
2 | + | From: Julien Lepiller <julien@lepiller.eu> | |
3 | + | Date: Fri, 25 Jan 2019 14:12:19 +0100 | |
4 | + | Subject: [PATCH] Port to plexus-utils 3. | |
5 | + | ||
6 | + | Patch adapted from fedora. | |
7 | + | --- | |
8 | + | .../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 11 ++++++++++- | |
9 | + | 1 file changed, 10 insertions(+), 1 deletion(-) | |
10 | + | ||
11 | + | 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 | |
12 | + | index 13eea52..181c2c1 100644 | |
13 | + | --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | |
14 | + | +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | |
15 | + | @@ -568,7 +568,16 @@ public class DefaultSiteRenderer | |
16 | + | // doxiaSiteRendererVersion | |
17 | + | InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/" | |
18 | + | + "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" ); | |
19 | + | - Properties properties = PropertyUtils.loadProperties( inputStream ); | |
20 | + | + Properties properties; | |
21 | + | + try | |
22 | + | + { | |
23 | + | + properties = PropertyUtils.loadProperties( inputStream ); | |
24 | + | + } | |
25 | + | + catch ( IOException exc ) | |
26 | + | + { | |
27 | + | + properties = null; | |
28 | + | + } | |
29 | + | + | |
30 | + | if ( inputStream == null ) | |
31 | + | { | |
32 | + | getLogger().debug( "pom.properties for doxia-site-renderer could not be found." ); | |
33 | + | -- | |
34 | + | 2.11.0 | |
35 | + |
more/packages/java.scm
3978 | 3978 | (modify-phases %standard-phases | |
3979 | 3979 | (add-before 'build 'copy-resource | |
3980 | 3980 | (lambda _ | |
3981 | - | (copy-recursively "src/main/resources" "build/classes"))) | |
3982 | - | (add-before 'test 'copy-test-resource | |
3981 | + | (copy-recursively "src/main/resources" "build/classes") | |
3982 | + | #t)) | |
3983 | + | (add-before 'check 'copy-test-resource | |
3983 | 3984 | (lambda _ | |
3984 | - | (copy-recursively "src/test/resources" "build/test-classes")))))) | |
3985 | + | (copy-recursively "src/test/resources" "build/test-classes") | |
3986 | + | #t))))) | |
3987 | + | (inputs | |
3988 | + | `(("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
3989 | + | ("java-cglib" ,java-cglib) | |
3990 | + | ("java-commons-beanutils", java-commons-beanutils))) | |
3991 | + | (native-inputs | |
3992 | + | `(("java-junit" ,java-junit) | |
3993 | + | ("java-hamcrest-core" ,java-hamcrest-core))) | |
3994 | + | (home-page "https://commons.apache.org/proper/commons-digester/") | |
3995 | + | (synopsis "") | |
3996 | + | (description "") | |
3997 | + | (license license:asl2.0))) | |
3998 | + | ||
3999 | + | (define-public java-commons-digester-2 | |
4000 | + | (package | |
4001 | + | (name "java-commons-digester-2") | |
4002 | + | (version "2.1") | |
4003 | + | (source (origin | |
4004 | + | (method url-fetch) | |
4005 | + | (uri (string-append "mirror://apache/commons/digester/source/" | |
4006 | + | "commons-digester-" version "-src.tar.gz")) | |
4007 | + | (sha256 | |
4008 | + | (base32 | |
4009 | + | "0gsli0qbi8h795ps7dpiccd3xfaqwrqcl7qzv59y5iyyd9xg04r7")))) | |
4010 | + | (build-system ant-build-system) | |
4011 | + | (arguments | |
4012 | + | `(#:jar-name "commons-digester.jar" | |
4013 | + | #:source-dir "src/main/java" | |
4014 | + | #:phases | |
4015 | + | (modify-phases %standard-phases | |
4016 | + | (add-before 'build 'copy-resource | |
4017 | + | (lambda _ | |
4018 | + | (copy-recursively "src/main/resources" "build/classes") | |
4019 | + | #t)) | |
4020 | + | (add-before 'check 'copy-test-resource | |
4021 | + | (lambda _ | |
4022 | + | (copy-recursively "src/test/resources" "build/test-classes") | |
4023 | + | #t))))) | |
3985 | 4024 | (inputs | |
3986 | 4025 | `(("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
3987 | 4026 | ("java-cglib" ,java-cglib) | |
… | |||
4023 | 4062 | (modify-phases %standard-phases | |
4024 | 4063 | (add-before 'build 'copy-resource | |
4025 | 4064 | (lambda _ | |
4026 | - | (copy-recursively "src/main/resources" "build/classes"))) | |
4027 | - | (add-before 'test 'copy-test-resource | |
4028 | - | (lambda _ | |
4029 | - | (copy-recursively "src/test/resources" "build/test-classes"))) | |
4030 | - | (add-before 'build 'fix-digester | |
4031 | - | (lambda _ | |
4032 | - | ;; Port from digester 1 to digester 3. | |
4033 | - | (substitute* (find-files "src/main/java" ".*\\.java") | |
4034 | - | (("commons.digester") "commons.digester3") | |
4035 | - | (("org.apache.commons.digester3.xmlrules.DigesterLoader") | |
4036 | - | "org.apache.commons.digester3.binder.DigesterLoader")) | |
4037 | - | ;; digester is private in this class, so we use the getter | |
4038 | - | (substitute* "src/main/java/org/apache/commons/validator/FormSetFactory.java" | |
4039 | - | (("digester.peek") "getDigester().peek")) | |
4040 | - | (substitute* "src/main/java/org/apache/commons/validator/ValidatorResources.java" | |
4041 | - | (("// DEPRECATED") | |
4042 | - | "// DEPRECATED\nimport org.apache.commons.digester3.xmlrules.FromXmlRulesModule;") | |
4043 | - | (("private Digester initDigester") | |
4044 | - | (string-append | |
4045 | - | "private FromXmlRulesModule rulesModule(final URL url) {\n" | |
4046 | - | " return new FromXmlRulesModule() {\n" | |
4047 | - | " @Override\n" | |
4048 | - | " protected void loadRules() {\n" | |
4049 | - | " loadXMLRules(url);" | |
4050 | - | " }\n" | |
4051 | - | " };\n" | |
4052 | - | "}\n" | |
4053 | - | "private Digester initDigester")) | |
4054 | - | ;; Copied from digester tests | |
4055 | - | (("createDigester\\(rulesUrl\\)") | |
4056 | - | "newLoader(rulesModule(rulesUrl)).newDigester()"))))))) | |
4057 | - | (inputs | |
4058 | - | `(("java-commons-digester" ,java-commons-digester) | |
4065 | + | (copy-recursively "src/main/resources" "build/classes") | |
4066 | + | #t)) | |
4067 | + | (add-before 'check 'copy-test-resource | |
4068 | + | (lambda _ | |
4069 | + | (copy-recursively "src/test/resources" "build/test-classes") | |
4070 | + | #t))))) | |
4071 | + | ;(add-before 'build 'fix-digester | |
4072 | + | ; (lambda _ | |
4073 | + | ; ;; Port from digester 1 to digester 3. | |
4074 | + | ; (substitute* (find-files "src/main/java" ".*\\.java") | |
4075 | + | ; (("commons.digester") "commons.digester3") | |
4076 | + | ; (("org.apache.commons.digester3.xmlrules.DigesterLoader") | |
4077 | + | ; "org.apache.commons.digester3.binder.DigesterLoader")) | |
4078 | + | ; ;; digester is private in this class, so we use the getter | |
4079 | + | ; (substitute* "src/main/java/org/apache/commons/validator/FormSetFactory.java" | |
4080 | + | ; (("digester.peek") "getDigester().peek")) | |
4081 | + | ; (substitute* "src/main/java/org/apache/commons/validator/ValidatorResources.java" | |
4082 | + | ; (("// DEPRECATED") | |
4083 | + | ; "// DEPRECATED\nimport org.apache.commons.digester3.xmlrules.FromXmlRulesModule;") | |
4084 | + | ; (("private Digester initDigester") | |
4085 | + | ; (string-append | |
4086 | + | ; "private FromXmlRulesModule rulesModule(final URL url) {\n" | |
4087 | + | ; " return new FromXmlRulesModule() {\n" | |
4088 | + | ; " @Override\n" | |
4089 | + | ; " protected void loadRules() {\n" | |
4090 | + | ; " loadXMLRules(url);" | |
4091 | + | ; " }\n" | |
4092 | + | ; " };\n" | |
4093 | + | ; "}\n" | |
4094 | + | ; "private Digester initDigester")) | |
4095 | + | ; ;; Copied from digester tests | |
4096 | + | ; (("createDigester\\(rulesUrl\\)") | |
4097 | + | ; "newLoader(rulesModule(rulesUrl)).newDigester()"))))))) | |
4098 | + | (inputs | |
4099 | + | `(("java-commons-digester-2" ,java-commons-digester-2) | |
4059 | 4100 | ("java-commons-beanutils" ,java-commons-beanutils) | |
4060 | 4101 | ("java-commons-collections" ,java-commons-collections) | |
4061 | 4102 | ("java-commons-logging-minimal" ,java-commons-logging-minimal))) | |
… | |||
4066 | 4107 | (description "") | |
4067 | 4108 | (license license:asl2.0))) | |
4068 | 4109 | ||
4110 | + | (define-public java-myfaces-api | |
4111 | + | (package | |
4112 | + | (name "java-myfaces-api") | |
4113 | + | (version "2.3.2") | |
4114 | + | (source (origin | |
4115 | + | (method url-fetch) | |
4116 | + | (uri (string-append "mirror://apache/myfaces/source/" | |
4117 | + | "myfaces-core-assembly-" version "-src.tar.gz")) | |
4118 | + | (sha256 | |
4119 | + | (base32 | |
4120 | + | "0nixl958pi7f61vgnaj0nshdpifdg4m0rlxb9ckdmabr6x2fsnvc")))) | |
4121 | + | ; version 2.3.1: | |
4122 | + | ;(method svn-fetch) | |
4123 | + | ;(uri (svn-reference | |
4124 | + | ; (url (string-append "http://svn.apache.org/repos/asf/" | |
4125 | + | ; "myfaces/core/tags/myfaces-core-module-" | |
4126 | + | ; version)) | |
4127 | + | ; (revision 1830627))) | |
4128 | + | ;(file-name (string-append name "-" version)) | |
4129 | + | ;(sha256 | |
4130 | + | ; (base32 | |
4131 | + | ; "1wag19756ahys8cms4snsqbqifkpfy578x3zkjkr5ba0424v5yvz")))) | |
4132 | + | (build-system ant-build-system) | |
4133 | + | (arguments | |
4134 | + | `(#:jar-name "myfaces-api.jar" | |
4135 | + | #:source-dir "api/src/main/java" | |
4136 | + | #:test-dir "api/src/test" | |
4137 | + | #:phases | |
4138 | + | (modify-phases %standard-phases | |
4139 | + | (add-after 'unpack 'double-unpack | |
4140 | + | (lambda _ | |
4141 | + | (chdir "src") | |
4142 | + | (invoke "unzip" (car (find-files "." "source-release"))) | |
4143 | + | (chdir (car (find-files "." "core-module" #:directories? #t))) | |
4144 | + | ;; Require a maven-2 plugin :/ | |
4145 | + | (delete-file-recursively "api/src/main/java/javax/faces/component") | |
4146 | + | #t))))) | |
4147 | + | (inputs | |
4148 | + | `(("java-javax-inject" ,java-javax-inject) | |
4149 | + | ;; for javax-el (el-api) | |
4150 | + | ("java-tomcat" ,java-tomcat))) | |
4151 | + | (native-inputs | |
4152 | + | `(("unzip" ,unzip))) | |
4153 | + | (home-page "https://commons.apache.org/proper/commons-chain") | |
4154 | + | (synopsis "") | |
4155 | + | (description "") | |
4156 | + | (license license:asl2.0))) | |
4157 | + | ||
4158 | + | (define-public java-commons-chain | |
4159 | + | (package | |
4160 | + | (name "java-commons-chain") | |
4161 | + | (version "1.2") | |
4162 | + | (source (origin | |
4163 | + | (method url-fetch) | |
4164 | + | (uri (string-append "mirror://apache//commons/chain/source/" | |
4165 | + | "commons-chain-" version "-src.tar.gz")) | |
4166 | + | (sha256 | |
4167 | + | (base32 | |
4168 | + | "0lgib3dpkympp8ajlgpfavbzfal9bv685gfa9ygyv091ja772rsd")))) | |
4169 | + | (build-system ant-build-system) | |
4170 | + | (arguments | |
4171 | + | `(#:test-target "test" | |
4172 | + | ;; TODO: incompatibilities with current versions of portlet | |
4173 | + | #:tests? #f | |
4174 | + | #:phases | |
4175 | + | (modify-phases %standard-phases | |
4176 | + | (add-before 'build 'prepare | |
4177 | + | (lambda* (#:key inputs #:allow-other-keys) | |
4178 | + | ; ;; Replace digester with digester3 | |
4179 | + | ; (substitute* (find-files "src" ".*\\.java") | |
4180 | + | ; (("commons.digester") "commons.digester3")) | |
4181 | + | (with-directory-excursion "src/java/org/apache/commons/chain" | |
4182 | + | ; ;; Remove a dependency to myfaces | |
4183 | + | (delete-file-recursively "web/faces")) | |
4184 | + | ; ;; digester is now private: use a public accessor | |
4185 | + | ; (substitute* '("config/ConfigCatalogRule.java" | |
4186 | + | ; "config/ConfigDefineRule.java" | |
4187 | + | ; "config/ConfigRegisterRule.java") | |
4188 | + | ; (("digester\\.") "getDigester()."))) | |
4189 | + | #t)) | |
4190 | + | (replace 'install | |
4191 | + | (install-jars "."))))) | |
4192 | + | (inputs | |
4193 | + | `(("java-classpathx-servletapi" ,java-classpathx-servletapi) | |
4194 | + | ("java-commons-beanutils" ,java-commons-beanutils) | |
4195 | + | ("java-commons-digester-2" ,java-commons-digester-2) | |
4196 | + | ("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
4197 | + | ("java-portlet-api" ,java-portlet-api))) | |
4198 | + | ;(native-inputs | |
4199 | + | ; `(("java-junit" ,java-junit))) | |
4200 | + | (home-page "https://commons.apache.org/proper/commons-chain") | |
4201 | + | (synopsis "") | |
4202 | + | (description "") | |
4203 | + | (license license:asl2.0))) | |
4204 | + | ||
4069 | 4205 | (define-public java-ognl | |
4070 | 4206 | (package | |
4071 | 4207 | (name "java-ognl") | |
… | |||
4128 | 4264 | (arguments | |
4129 | 4265 | `(#:jar-name "apache-struts.jar" | |
4130 | 4266 | #:source-dir "src/core/src/main/java" | |
4131 | - | #:test-dir "src/core/src/test" | |
4132 | - | #:phases | |
4133 | - | (modify-phases %standard-phases | |
4134 | - | (add-before 'build 'copy-required-classes | |
4135 | - | (lambda* (#:key inputs #:allow-other-keys) | |
4136 | - | (let ((tools (assoc-ref inputs "java-velocity-tools")) | |
4137 | - | (velocity-dir "build/velocity") | |
4138 | - | (tools-dir (string-append "build/velocity/velocity-tool-" | |
4139 | - | ,(package-version java-velocity-tools) | |
4140 | - | "-src"))) | |
4141 | - | (mkdir-p velocity-dir) | |
4142 | - | (with-directory-excursion velocity-dir | |
4143 | - | (invoke "tar" "xf" tools)) | |
4144 | - | (with-directory-excursion tools-dir | |
4145 | - | (for-each | |
4146 | - | (lambda (file) | |
4147 | - | (install-file file (string-append "../../src/core/" file))) | |
4148 | - | (append (find-files "." "ServletToolboxManager.java"))))) | |
4149 | - | #t))))) | |
4267 | + | #:test-dir "src/core/src/test")) | |
4268 | + | ;#:phases | |
4269 | + | ;(modify-phases %standard-phases | |
4270 | + | ; (add-before 'build 'copy-required-classes | |
4271 | + | ; (lambda* (#:key inputs #:allow-other-keys) | |
4272 | + | ; (let ((tools (assoc-ref inputs "java-velocity-tools")) | |
4273 | + | ; (velocity-dir "build/velocity") | |
4274 | + | ; (tools-dir (string-append "build/velocity/velocity-tools-" | |
4275 | + | ; ,(package-version java-velocity-tools) | |
4276 | + | ; "-src"))) | |
4277 | + | ; (mkdir-p velocity-dir) | |
4278 | + | ; (with-directory-excursion velocity-dir | |
4279 | + | ; (invoke "tar" "xf" tools)) | |
4280 | + | ; (with-directory-excursion tools-dir | |
4281 | + | ; (for-each | |
4282 | + | ; (lambda (file) | |
4283 | + | ; (install-file file (string-append "../../../src/core/" | |
4284 | + | ; (dirname file)))) | |
4285 | + | ; (find-files "." ".")))) | |
4286 | + | ; ;(find-files "." "ToolboxManager.java$") | |
4287 | + | ; ;(find-files "." "^ToolInfo.java$") | |
4288 | + | ; ;(find-files "." "^ServletUtils.java$") | |
4289 | + | ; ;(find-files "." "^SkipSetters.java$") | |
4290 | + | ; ;(find-files "." "^ViewToolContext.java$") | |
4291 | + | ; ;(find-files "." "^ViewContext.java$") | |
4292 | + | ; ;(find-files "." "^ChainedContext.java$"))))) | |
4293 | + | ; #t))))) | |
4150 | 4294 | (inputs | |
4151 | 4295 | `(("java-apache-freemarker" ,java-apache-freemarker) | |
4152 | 4296 | ("java-log4j-api" ,java-log4j-api) | |
… | |||
4160 | 4304 | ("java-spring-framework-beans" ,java-spring-framework-beans) | |
4161 | 4305 | ("java-spring-framework-context" ,java-spring-framework-context) | |
4162 | 4306 | ("java-spring-framework-core" ,java-spring-framework-core) | |
4163 | - | ;("java-spring-framework-web" ,java-spring-framework-web) | |
4307 | + | ("java-spring-framework-web" ,java-spring-framework-web) | |
4164 | 4308 | ("java-velocity" ,java-velocity) | |
4165 | 4309 | ("java-velocity-tools" ,(package-source java-velocity-tools)) | |
4166 | 4310 | ("java-testng" ,java-testng))) | |
… | |||
4172 | 4316 | (description "") | |
4173 | 4317 | (license license:asl2.0))) | |
4174 | 4318 | ||
4319 | + | (define-public java-apache-struts-1 | |
4320 | + | (package | |
4321 | + | (name "java-apache-struts-1") | |
4322 | + | (version "1.3.10") | |
4323 | + | (source (origin | |
4324 | + | (method url-fetch) | |
4325 | + | (uri (string-append "mirror://apache/struts/" | |
4326 | + | version "/struts-" version "-src.zip")) | |
4327 | + | (sha256 | |
4328 | + | (base32 | |
4329 | + | "05mxari6m8vrirz3i7rdvjpc637s11fjl6qk9hpvl1yyy7bigmn1")))) | |
4330 | + | (build-system ant-build-system) | |
4331 | + | (arguments | |
4332 | + | `(#:jar-name "struts.jar" | |
4333 | + | #:source-dir "src/core/src/main/java" | |
4334 | + | #:test-dir "src/core/src/test" | |
4335 | + | #:tests? #f; require deleted files | |
4336 | + | #:phases | |
4337 | + | (modify-phases %standard-phases | |
4338 | + | (add-before 'build 'prepare | |
4339 | + | (lambda* (#:key inputs #:allow-other-keys) | |
4340 | + | (with-directory-excursion "src/core/src/main/java" | |
4341 | + | (for-each delete-file (find-files "." "^Test")) | |
4342 | + | (delete-file-recursively "org/apache/struts/mock")) | |
4343 | + | #t))))) | |
4344 | + | (inputs | |
4345 | + | `(("antlr2" ,antlr2) | |
4346 | + | ("java-classpathx-servletapi" ,java-classpathx-servletapi) | |
4347 | + | ("java-commons-beanutils" ,java-commons-beanutils) | |
4348 | + | ("java-commons-chain" ,java-commons-chain) | |
4349 | + | ("java-commons-digester-2" ,java-commons-digester-2) | |
4350 | + | ("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
4351 | + | ("java-commons-fileupload" ,java-commons-fileupload) | |
4352 | + | ("java-commons-validator" ,java-commons-validator))) | |
4353 | + | (native-inputs | |
4354 | + | `(("unzip" ,unzip))) | |
4355 | + | (home-page "") | |
4356 | + | (synopsis "") | |
4357 | + | (description "") | |
4358 | + | (license license:asl2.0))) | |
4359 | + | ||
4360 | + | (define-public java-apache-struts-taglib-1 | |
4361 | + | (package | |
4362 | + | (inherit java-apache-struts-1) | |
4363 | + | (name "java-apache-struts-taglib-1") | |
4364 | + | (arguments | |
4365 | + | `(#:jar-name "struts.jar" | |
4366 | + | #:source-dir "src/taglib/src/main/java" | |
4367 | + | #:tests? #f; require deleted files | |
4368 | + | #:test-dir "src/taglib/src/test")) | |
4369 | + | (inputs | |
4370 | + | `(("java-apache-struts-1" ,java-apache-struts-1) | |
4371 | + | ,@(package-inputs java-apache-struts-1))))) | |
4372 | + | ||
4373 | + | (define-public java-apache-struts-tiles-1 | |
4374 | + | (package | |
4375 | + | (inherit java-apache-struts-1) | |
4376 | + | (name "java-apache-struts-tiles-1") | |
4377 | + | (arguments | |
4378 | + | `(#:jar-name "struts.jar" | |
4379 | + | #:source-dir "src/tiles/src/main/java" | |
4380 | + | #:tests? #f; require deleted files | |
4381 | + | #:test-dir "src/tiles/src/test")) | |
4382 | + | (inputs | |
4383 | + | `(("java-apache-struts-1" ,java-apache-struts-1) | |
4384 | + | ,@(package-inputs java-apache-struts-1))))) | |
4385 | + | ||
4175 | 4386 | (define-public java-velocity | |
4176 | 4387 | (package | |
4177 | 4388 | (name "java-velocity") | |
… | |||
4279 | 4490 | ("java-commons-lang" ,java-commons-lang3) | |
4280 | 4491 | ("java-slf4j-api" ,java-slf4j-api))))) | |
4281 | 4492 | ||
4493 | + | (define-public java-sslext | |
4494 | + | (package | |
4495 | + | (name "java-sslext") | |
4496 | + | (version "1.2") | |
4497 | + | (source (origin | |
4498 | + | (method url-fetch) | |
4499 | + | (uri (string-append "mirror://sourceforge/sslext/sslext%20for%20" | |
4500 | + | "Struts%201.2/Release%200/" | |
4501 | + | "sslext-struts1.2-src.tar.gz")) | |
4502 | + | (sha256 | |
4503 | + | (base32 | |
4504 | + | "1a2axpq719smfc37lnj1flprpdhi8m1rmkdp90z2fv13rdg2dlq5")))) | |
4505 | + | (build-system ant-build-system) | |
4506 | + | (arguments | |
4507 | + | `(#:jar-name "sslext.jar" | |
4508 | + | #:source-dir "." | |
4509 | + | #:tests? #f | |
4510 | + | #:phases | |
4511 | + | (modify-phases %standard-phases | |
4512 | + | (add-before 'build 'fix-enum | |
4513 | + | (lambda _ | |
4514 | + | (substitute* "build.xml" | |
4515 | + | (("<javac") "<javac source=\"1.4\""))))))) | |
4516 | + | (inputs | |
4517 | + | `(("java-commons-digester-2" ,java-commons-digester-2) | |
4518 | + | ("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
4519 | + | ("java-apache-struts-1" ,java-apache-struts-1) | |
4520 | + | ("java-apache-struts-taglib-1" ,java-apache-struts-taglib-1) | |
4521 | + | ("java-apache-struts-tiles-1" ,java-apache-struts-tiles-1) | |
4522 | + | ("java-tomcat" ,java-tomcat))) | |
4523 | + | (home-page "https://velocity.apache.org/tools/devel") | |
4524 | + | (synopsis "") | |
4525 | + | (description "") | |
4526 | + | (license license:asl2.0))) | |
4527 | + | ||
4282 | 4528 | (define-public java-velocity-tools | |
4283 | 4529 | (package | |
4284 | 4530 | (name "java-velocity-tools") | |
… | |||
4289 | 4535 | "/velocity-tools-" version "-src.tar.gz")) | |
4290 | 4536 | (sha256 | |
4291 | 4537 | (base32 | |
4292 | - | "0d93v8nj95jfdgx7n72axaavdq2h800vxyi4vx35rdphndy1xg51")))) | |
4538 | + | "0d93v8nj95jfdgx7n72axaavdq2h800vxyi4vx35rdphndy1xg51")) | |
4539 | + | (patches | |
4540 | + | (search-patches | |
4541 | + | "java-velocity-tools-2.0-servlet.patch" | |
4542 | + | "java-velocity-tools-2.0-port-to-dom4j-2.0.patch")))) | |
4293 | 4543 | (build-system ant-build-system) | |
4294 | 4544 | (arguments | |
4295 | 4545 | `(#:test-target "test-main" | |
… | |||
4301 | 4551 | ;; Don't download anything | |
4302 | 4552 | (substitute* "build.xml" | |
4303 | 4553 | ((".*download.xml.*") "")) | |
4304 | - | ;; Replace digester with digester3 | |
4305 | - | (substitute* (find-files "src/main/java" ".*\\.java") | |
4306 | - | (("commons.digester") "commons.digester3")) | |
4307 | 4554 | #t)) | |
4308 | 4555 | (replace 'install | |
4309 | - | (install-jars "../bin"))))) | |
4556 | + | (install-jars "dist"))))) | |
4310 | 4557 | (inputs | |
4311 | - | ;`(("java-apache-struts" ,java-apache-struts))) | |
4312 | - | `(("java-commons-digester" ,java-commons-digester) | |
4558 | + | `(("java-apache-struts-1" ,java-apache-struts-1) | |
4559 | + | ("java-apache-struts-taglib-1" ,java-apache-struts-taglib-1) | |
4560 | + | ("java-apache-struts-tiles-1" ,java-apache-struts-tiles-1) | |
4561 | + | ("java-commons-digester-2" ,java-commons-digester-2) | |
4313 | 4562 | ("java-commons-validator" ,java-commons-validator) | |
4314 | 4563 | ("java-commons-beanutils", java-commons-beanutils) | |
4315 | 4564 | ("java-dom4j" ,java-dom4j) | |
4565 | + | ("java-sslext" ,java-sslext) | |
4316 | 4566 | ("java-velocity" ,java-velocity))) | |
4317 | 4567 | (home-page "https://velocity.apache.org/tools/devel") | |
4318 | 4568 | (synopsis "") | |
4319 | 4569 | (description "") | |
4320 | 4570 | (license license:asl2.0))) | |
4321 | 4571 | ||
4572 | + | (define-public java-plexus-i18n | |
4573 | + | (package | |
4574 | + | (name "java-plexus-i18n") | |
4575 | + | (version "1.0-beta12") | |
4576 | + | (source (origin | |
4577 | + | (method git-fetch) | |
4578 | + | (uri (git-reference | |
4579 | + | (url "https://github.com/codehaus-plexus/plexus-i18n.git") | |
4580 | + | (commit "e5b25dd280af2db4d91742a0d93571335e09c46a"))) | |
4581 | + | (file-name (git-file-name name version)) | |
4582 | + | (sha256 | |
4583 | + | (base32 | |
4584 | + | "1nkq3c6ba8hv01qi30k50lwa18iswnl9q6i6lrcxdvyzq015jqcl")))) | |
4585 | + | (build-system ant-build-system) | |
4586 | + | (arguments | |
4587 | + | `(#:jar-name "java-plexus-i18n.jar" | |
4588 | + | #:source-dir "src/main/java")) | |
4589 | + | (inputs | |
4590 | + | `(("java-plexus-classworlds" ,java-plexus-classworlds) | |
4591 | + | ("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
4592 | + | ("java-plexus-container-default" ,java-plexus-container-default) | |
4593 | + | ("java-plexus-utils" ,java-plexus-utils))) | |
4594 | + | (native-inputs | |
4595 | + | `(("java-commons-collections" ,java-commons-collections) | |
4596 | + | ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) | |
4597 | + | ("java-guava" ,java-guava) | |
4598 | + | ("java-junit" ,java-junit))) | |
4599 | + | (home-page "https://codehaus-plexus.github.io/plexus-i18n/") | |
4600 | + | (synopsis "") | |
4601 | + | (description "") | |
4602 | + | (license license:asl2.0))) | |
4603 | + | ||
4322 | 4604 | (define-public java-plexus-velocity-component | |
4323 | 4605 | (package | |
4324 | 4606 | (name "java-plexus-velocity-component") |
more/packages/maven.scm
1 | 1 | ;;; GNU Guix --- Functional package management for GNU | |
2 | - | ;;; Copyright ?? 2017 Julien Lepiller <julien@lepiller.eu> | |
2 | + | ;;; Copyright ?? 2017, 2019 Julien Lepiller <julien@lepiller.eu> | |
3 | 3 | ;;; | |
4 | 4 | ;;; This file is part of GNU Guix. | |
5 | 5 | ;;; | |
… | |||
21 | 21 | #:use-module (gnu packages) | |
22 | 22 | #:use-module (guix packages) | |
23 | 23 | #:use-module (guix download) | |
24 | + | #:use-module (guix git-download) | |
24 | 25 | #:use-module (guix utils) | |
25 | 26 | #:use-module (guix build-system ant) | |
26 | 27 | #:use-module (guix build-system trivial) | |
… | |||
50 | 51 | `(#:jar-name "maven-polyglot-common.jar" | |
51 | 52 | #:source-dir "polyglot-common/src/main/java" | |
52 | 53 | #:tests? #f; No test | |
53 | - | #:jdk ,icedtea-8 | |
54 | 54 | #:phases | |
55 | 55 | (modify-phases %standard-phases | |
56 | 56 | (add-before 'build 'copy-resources | |
… | |||
107 | 107 | `(#:jar-name "maven-polyglot-java.jar" | |
108 | 108 | #:source-dir "polyglot-java/src/main/java" | |
109 | 109 | #:tests? #f; No test | |
110 | - | #:jdk ,icedtea-8 | |
111 | 110 | #:phases | |
112 | 111 | (modify-phases %standard-phases | |
113 | 112 | (add-before 'build 'copy-resources | |
… | |||
143 | 142 | `(#:jar-name "maven-polyglot-groovy.jar" | |
144 | 143 | #:source-dir "polyglot-groovy/src/main/java:polyglot-groovy/src/main/groovy" | |
145 | 144 | #:tests? #f; No test | |
146 | - | #:jdk ,icedtea-8 | |
147 | 145 | #:phases | |
148 | 146 | (modify-phases %standard-phases | |
149 | 147 | (add-before 'build 'use-groovy | |
… | |||
197 | 195 | (arguments | |
198 | 196 | `(#:jar-name "maven-slf4j-provider.jar" | |
199 | 197 | #:source-dir "maven-slf4j-provider/src/main/java" | |
200 | - | #:tests? #f; no tests | |
201 | - | #:jdk ,icedtea-8)) | |
198 | + | #:tests? #f)); no tests | |
202 | 199 | (inputs | |
203 | 200 | `(("maven-shared-utils" ,maven-shared-utils) | |
204 | 201 | ("java-slf4j-api" ,java-slf4j-api) | |
… | |||
212 | 209 | (name "maven-filtering") | |
213 | 210 | (version "3.1.1") | |
214 | 211 | (source (origin | |
215 | - | (method url-fetch) | |
216 | - | (uri (string-append "https://archive.apache.org/dist/maven/" | |
217 | - | "shared/maven-filtering-" version | |
218 | - | "-source-release.zip")) | |
219 | - | (sha256 | |
220 | - | (base32 | |
221 | - | "09wrdhchnszd2l6h4z30ra0bv1a19qyjgac9z8zf1pn0m4nw05yz")))) | |
212 | + | (method url-fetch) | |
213 | + | (uri (string-append "https://archive.apache.org/dist/maven/" | |
214 | + | "shared/maven-filtering-" version | |
215 | + | "-source-release.zip")) | |
216 | + | (sha256 | |
217 | + | (base32 | |
218 | + | "09wrdhchnszd2l6h4z30ra0bv1a19qyjgac9z8zf1pn0m4nw05yz")))) | |
222 | 219 | (build-system ant-build-system) | |
223 | 220 | (arguments | |
224 | 221 | `(#:jar-name "maven-filtering.jar" | |
225 | 222 | #:source-dir "src/main/java" | |
226 | 223 | #:test-dir "src/test" | |
227 | 224 | #:tests? #f; tests fail for now... | |
228 | - | #:jdk ,icedtea-8 | |
229 | 225 | #:phases | |
230 | 226 | (modify-phases %standard-phases | |
231 | - | (add-before 'build 'remove-failing-test | |
232 | - | (lambda _ | |
233 | - | (delete-file "src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java") | |
234 | - | (substitute* "src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java" | |
235 | - | (("org.sonatype.aether.RepositorySystemSession") | |
236 | - | "org.eclipse.aether.RepositorySystemSession")) | |
237 | - | #t))))) | |
227 | + | (add-before 'build 'remove-failing-test | |
228 | + | (lambda _ | |
229 | + | (delete-file "src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java") | |
230 | + | (substitute* "src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java" | |
231 | + | (("org.sonatype.aether.RepositorySystemSession") | |
232 | + | "org.eclipse.aether.RepositorySystemSession")) | |
233 | + | #t))))) | |
238 | 234 | (inputs | |
239 | 235 | `(("java-jsr305" ,java-jsr305) | |
240 | 236 | ("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
… | |||
265 | 261 | (name "maven-plugin-testing") | |
266 | 262 | (version "3.3.0") | |
267 | 263 | (source (origin | |
268 | - | (method url-fetch) | |
269 | - | (uri (string-append "https://github.com/apache/maven-plugin-testing/" | |
270 | - | "archive/maven-plugin-testing-" version ".tar.gz")) | |
271 | - | (sha256 | |
272 | - | (base32 | |
273 | - | "010jp44vq75fk6260zvqz41ai3l1sqrjz56yyzv9pgshx27vpshy")))) | |
264 | + | (method url-fetch) | |
265 | + | (uri (string-append "https://github.com/apache/maven-plugin-testing/" | |
266 | + | "archive/maven-plugin-testing-" version ".tar.gz")) | |
267 | + | (sha256 | |
268 | + | (base32 | |
269 | + | "010jp44vq75fk6260zvqz41ai3l1sqrjz56yyzv9pgshx27vpshy")))) | |
274 | 270 | (build-system ant-build-system) | |
275 | 271 | (arguments | |
276 | 272 | `(#:jar-name "maven-plugin-testing.jar" | |
277 | 273 | #:source-dir "maven-plugin-testing-harness/src/main/java" | |
278 | - | #:test-dir "maven-plugin-testing-harness/src/test" | |
279 | - | #:jdk ,icedtea-8)) | |
274 | + | #:test-dir "maven-plugin-testing-harness/src/test")) | |
280 | 275 | (inputs | |
281 | 276 | `(("java-commons-io" ,java-commons-io) | |
282 | 277 | ("java-guice" ,java-guice) | |
… | |||
305 | 300 | (name "maven-doxia-logging-api") | |
306 | 301 | (version "1.8") | |
307 | 302 | (source (origin | |
308 | - | (method url-fetch) | |
309 | - | (uri (string-append "https://github.com/apache/maven-doxia/" | |
310 | - | "archive/doxia-" version ".tar.gz")) | |
311 | - | (sha256 | |
312 | - | (base32 | |
313 | - | "07qckb1fsycnz5b08xbm8b1hjz8295ri6xi47s47rlwxg53hvf4s")))) | |
303 | + | (method url-fetch) | |
304 | + | (uri (string-append "https://github.com/apache/maven-doxia/" | |
305 | + | "archive/doxia-" version ".tar.gz")) | |
306 | + | (sha256 | |
307 | + | (base32 | |
308 | + | "07qckb1fsycnz5b08xbm8b1hjz8295ri6xi47s47rlwxg53hvf4s")))) | |
314 | 309 | (build-system ant-build-system) | |
315 | 310 | (arguments | |
316 | 311 | `(#:jar-name "maven-doxia-logging-api.jar" | |
317 | 312 | #:source-dir "doxia-logging-api/src/main/java" | |
318 | - | #:tests? #f; No tests | |
319 | - | #:jdk ,icedtea-8)) | |
313 | + | #:tests? #f)); No tests | |
320 | 314 | (inputs | |
321 | 315 | `(("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
322 | 316 | ("java-plexus-container-default" ,java-plexus-container-default))) | |
… | |||
333 | 327 | (arguments | |
334 | 328 | `(#:jar-name "maven-doxia-sink-api.jar" | |
335 | 329 | #:source-dir "doxia-sink-api/src/main/java" | |
336 | - | #:tests? #f; No tests | |
337 | - | #:jdk ,icedtea-8)) | |
330 | + | #:tests? #f)); No tests | |
338 | 331 | (inputs | |
339 | 332 | `(("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
340 | 333 | ("java-plexus-container-default" ,java-plexus-container-default) | |
… | |||
351 | 344 | #:test-exclude | |
352 | 345 | ;; test fails for unknown reason | |
353 | 346 | (list "**/SnippetMacroTest.java" | |
354 | - | ;; requires network | |
355 | - | "**/XmlValidatorTest.java" | |
356 | - | "**/Abstract*Test.java") | |
357 | - | #:jdk ,icedtea-8 | |
347 | + | ;; requires network | |
348 | + | "**/XmlValidatorTest.java" | |
349 | + | "**/Abstract*Test.java") | |
358 | 350 | #:phases | |
359 | 351 | (modify-phases %standard-phases | |
360 | - | (add-before 'build 'copy-resources | |
361 | - | (lambda _ | |
362 | - | (copy-recursively "doxia-core/src/main/resources" | |
363 | - | "build/classes") | |
364 | - | #t)) | |
352 | + | (add-before 'build 'copy-resources | |
353 | + | (lambda _ | |
354 | + | (copy-recursively "doxia-core/src/main/resources" | |
355 | + | "build/classes") | |
356 | + | #t)) | |
365 | 357 | (add-before 'build 'generate-models | |
366 | 358 | (lambda* (#:key inputs #:allow-other-keys) | |
367 | 359 | (define (modello-single-mode file version mode) | |
… | |||
439 | 431 | #:test-exclude | |
440 | 432 | ;; test fails for unknown reason | |
441 | 433 | (list "**/SnippetMacroTest.java" | |
442 | - | ;; requires network | |
443 | - | "**/XmlValidatorTest.java" | |
444 | - | "**/Abstract*Test.java") | |
445 | - | #:jdk ,icedtea-8 | |
434 | + | ;; requires network | |
435 | + | "**/XmlValidatorTest.java" | |
436 | + | "**/Abstract*Test.java") | |
446 | 437 | #:phases | |
447 | 438 | (modify-phases %standard-phases | |
448 | - | (add-before 'build 'copy-test-classes | |
449 | - | (lambda _ | |
450 | - | (copy-recursively "doxia-core/src/test/java" "doxia-modules/doxia-module-xhtml/src/test/java") | |
451 | - | (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java" | |
452 | - | "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java") | |
453 | - | (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java" | |
454 | - | "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java") | |
455 | - | (mkdir-p "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/sink/impl") | |
456 | - | (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java" | |
457 | - | "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java") | |
458 | - | #t)) | |
439 | + | (add-before 'build 'copy-test-classes | |
440 | + | (lambda _ | |
441 | + | (copy-recursively "doxia-core/src/test/java" "doxia-modules/doxia-module-xhtml/src/test/java") | |
442 | + | (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java" | |
443 | + | "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java") | |
444 | + | (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java" | |
445 | + | "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java") | |
446 | + | (mkdir-p "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/sink/impl") | |
447 | + | (copy-file "doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java" | |
448 | + | "doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java") | |
449 | + | #t)) | |
459 | 450 | (add-after 'build 'generate-metadata | |
460 | 451 | (lambda _ | |
461 | 452 | (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes") | |
… | |||
502 | 493 | (name "maven-doxia-skin-model") | |
503 | 494 | (version "1.8.1") | |
504 | 495 | (source (origin | |
505 | - | (method url-fetch) | |
506 | - | (uri (string-append "https://github.com/apache/maven-doxia-sitetools/" | |
507 | - | "archive/doxia-sitetools-" version ".tar.gz")) | |
508 | - | (sha256 | |
509 | - | (base32 | |
510 | - | "02dgblm6n07jwr7r90wzc8ax9vz3ax7rh5w12wmvfyd5aybh691w")))) | |
496 | + | (method url-fetch) | |
497 | + | (uri (string-append "https://github.com/apache/maven-doxia-sitetools/" | |
498 | + | "archive/doxia-sitetools-" version ".tar.gz")) | |
499 | + | (sha256 | |
500 | + | (base32 | |
501 | + | "02dgblm6n07jwr7r90wzc8ax9vz3ax7rh5w12wmvfyd5aybh691w")) | |
502 | + | (patches | |
503 | + | (search-patches "maven-doxia-sitetools-fix-plexus-utils.patch")))) | |
511 | 504 | (build-system ant-build-system) | |
512 | 505 | (arguments | |
513 | 506 | `(#:jar-name "maven-doxia-skin-model.jar" | |
514 | 507 | #:source-dir "doxia-skin-model/src/main/java" | |
515 | 508 | #:tests? #f; no tests | |
516 | - | #:jdk ,icedtea-8 | |
517 | 509 | #:phases | |
518 | 510 | (modify-phases %standard-phases | |
519 | 511 | (add-before 'build 'generate-models | |
… | |||
563 | 555 | `(#:jar-name "maven-doxia-decoration-model.jar" | |
564 | 556 | #:source-dir "doxia-decoration-model/src/main/java" | |
565 | 557 | #:test-dir "doxia-decoration-model/src/test" | |
566 | - | #:jdk ,icedtea-8 | |
567 | 558 | #:phases | |
568 | 559 | (modify-phases %standard-phases | |
569 | 560 | (add-before 'build 'generate-models | |
… | |||
591 | 582 | `(#:jar-name "maven-doxia-site-renderer.jar" | |
592 | 583 | #:source-dir "doxia-site-renderer/src/main/java" | |
593 | 584 | #:test-dir "doxia-site-renderer/src/test" | |
594 | - | #:jdk ,icedtea-8 | |
585 | + | #:tests? #f; require gargoylesoftware-htmlunit | |
595 | 586 | #:phases | |
596 | 587 | (modify-phases %standard-phases | |
597 | 588 | (add-before 'build 'copy-resources | |
598 | 589 | (lambda _ | |
599 | - | (copy-recursively "doxia-site-renderer/src/main/resources" | |
600 | - | "build/classes") | |
590 | + | (copy-recursively "doxia-site-renderer/src/main/resources" | |
591 | + | "build/classes") | |
601 | 592 | #t))))) | |
602 | 593 | (inputs | |
603 | 594 | `(("java-commons-lang3" ,java-commons-lang3) | |
604 | 595 | ("java-plexus-container-default" ,java-plexus-container-default) | |
605 | 596 | ("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
597 | + | ("java-plexus-i18n" ,java-plexus-i18n) | |
606 | 598 | ("java-plexus-utils" ,java-plexus-utils) | |
607 | 599 | ("java-plexus-velocity-component" ,java-plexus-velocity-component) | |
608 | 600 | ("java-velocity" ,java-velocity) | |
… | |||
611 | 603 | ("maven-doxia-core" ,maven-doxia-core) | |
612 | 604 | ("maven-doxia-decoration-model" ,maven-doxia-decoration-model) | |
613 | 605 | ("maven-doxia-logging-api" ,maven-doxia-logging-api) | |
606 | + | ("maven-doxia-module-xhtml" ,maven-doxia-module-xhtml) | |
614 | 607 | ("maven-doxia-skin-model" ,maven-doxia-skin-model) | |
615 | 608 | ("maven-doxia-sink-api" ,maven-doxia-sink-api))) | |
616 | 609 | (native-inputs | |
… | |||
622 | 615 | (name "maven-reporting-api") | |
623 | 616 | (version "3.0") | |
624 | 617 | (source (origin | |
625 | - | (method url-fetch) | |
626 | - | (uri (string-append "https://github.com/apache/maven-reporting-api/" | |
627 | - | "archive/maven-reporting-api-" version ".tar.gz")) | |
628 | - | (sha256 | |
629 | - | (base32 | |
630 | - | "1dc94n7czax7vrniv4xyqlza2mjqdlzzvq6wh6cmcqnnmgggya91")))) | |
618 | + | (method url-fetch) | |
619 | + | (uri (string-append "https://github.com/apache/maven-reporting-api/" | |
620 | + | "archive/maven-reporting-api-" version ".tar.gz")) | |
621 | + | (sha256 | |
622 | + | (base32 | |
623 | + | "1dc94n7czax7vrniv4xyqlza2mjqdlzzvq6wh6cmcqnnmgggya91")))) | |
631 | 624 | (build-system ant-build-system) | |
632 | 625 | (arguments | |
633 | 626 | `(#:jar-name "maven-reporting-api.jar" | |
634 | 627 | #:source-dir "src/main/java" | |
635 | - | #:tests? #f; no tests | |
636 | - | #:jdk ,icedtea-8)) | |
628 | + | #:tests? #f)); no tests | |
637 | 629 | (inputs | |
638 | 630 | `(("maven-doxia-sink-api" ,maven-doxia-sink-api))) | |
639 | 631 | (native-inputs | |
… | |||
643 | 635 | (description "") | |
644 | 636 | (license license:asl2.0))) | |
645 | 637 | ||
638 | + | (define-public maven-reporting-impl | |
639 | + | (package | |
640 | + | (name "maven-reporting-impl") | |
641 | + | (version "3.0") | |
642 | + | (source (origin | |
643 | + | (method git-fetch) | |
644 | + | (uri (git-reference | |
645 | + | (url "https://github.com/apache/maven-reporting-impl.git") | |
646 | + | (commit "ff10bba47b9ecf728a0f16e096fb410b74711a5d"))) | |
647 | + | (file-name (git-file-name name version)) | |
648 | + | (sha256 | |
649 | + | (base32 | |
650 | + | "02da8pqa17lmkwjhqyq39ygf4lfa483bbdvhbvjginmpw3ydkbw5")))) | |
651 | + | (build-system ant-build-system) | |
652 | + | (arguments | |
653 | + | `(#:jar-name "maven-reporting-impl.jar" | |
654 | + | #:source-dir "src/main/java" | |
655 | + | #:test-dir "src/test" | |
656 | + | ;; Require junitx.util.PrivateAccessor (?) | |
657 | + | #:tests? #f)) | |
658 | + | (inputs | |
659 | + | `(("java-plexus-utils" ,java-plexus-utils) | |
660 | + | ("maven-core" ,maven-core) | |
661 | + | ("maven-doxia-core" ,maven-doxia-core) | |
662 | + | ("maven-doxia-decoration-model" ,maven-doxia-decoration-model) | |
663 | + | ("maven-doxia-logging-api" ,maven-doxia-logging-api) | |
664 | + | ("maven-doxia-module-xhtml" ,maven-doxia-module-xhtml) | |
665 | + | ("maven-doxia-sink-api" ,maven-doxia-sink-api) | |
666 | + | ("maven-doxia-site-renderer" ,maven-doxia-site-renderer) | |
667 | + | ("maven-plugin-annotations" ,maven-plugin-annotations) | |
668 | + | ("maven-plugin-api" ,maven-plugin-api) | |
669 | + | ("maven-reporting-api" ,maven-reporting-api) | |
670 | + | ("maven-shared-utils" ,maven-shared-utils))) | |
671 | + | (native-inputs | |
672 | + | `(("java-junit" ,java-junit))) | |
673 | + | (home-page "") | |
674 | + | (synopsis "") | |
675 | + | (description "") | |
676 | + | (license license:asl2.0))) | |
677 | + | ||
646 | 678 | (define-public maven-plugin-tools-api | |
647 | 679 | (package | |
648 | 680 | (name "maven-plugin-tools-api") | |
649 | - | (version "3.5.2") | |
681 | + | (version "3.6.0") | |
650 | 682 | (source (origin | |
651 | - | (method url-fetch) | |
652 | - | (uri (string-append "https://github.com/apache/maven-plugin-tools/" | |
653 | - | "archive/maven-plugin-tools-" version ".tar.gz")) | |
654 | - | (sha256 | |
655 | - | (base32 | |
656 | - | "12va9d3zf5va1a4nvcij49k4h4z36s3mlj1fx500i5qxsjpwsydi")))) | |
683 | + | (method url-fetch) | |
684 | + | (uri (string-append "https://github.com/apache/maven-plugin-tools/" | |
685 | + | "archive/maven-plugin-tools-" version ".tar.gz")) | |
686 | + | (sha256 | |
687 | + | (base32 | |
688 | + | "1miq87ywh48v0hwl3a4q95rxbgg58zpk59v6z34bl715hcawbv80")))) | |
657 | 689 | (build-system ant-build-system) | |
658 | 690 | (arguments | |
659 | 691 | `(#:jar-name "maven-plugin-tools-api.jar" | |
660 | 692 | #:source-dir "maven-plugin-tools-api/src/main/java" | |
661 | 693 | #:test-dir "maven-plugin-tools-api/src/test" | |
662 | - | #:tests? #f; disabled for now. Require maven-plugin-testing that doesn't build yet | |
663 | - | #:jdk ,icedtea-8)) | |
694 | + | #:tests? #f)); disabled for now. Require maven-plugin-testing that doesn't build yet | |
664 | 695 | (inputs | |
665 | 696 | `(("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
666 | 697 | ("java-plexus-container-default" ,java-plexus-container-default) | |
… | |||
676 | 707 | (description "") | |
677 | 708 | (license license:asl2.0))) | |
678 | 709 | ||
710 | + | (define-public maven-plugin-annotations | |
711 | + | (package | |
712 | + | (inherit maven-plugin-tools-api) | |
713 | + | (name "maven-plugin-annotations") | |
714 | + | (arguments | |
715 | + | `(#:jar-name "maven-plugin-annotations.jar" | |
716 | + | #:tests? #f; no tests | |
717 | + | #:source-dir "maven-plugin-annotations/src/main/java")) | |
718 | + | (inputs | |
719 | + | `(("maven-artifact" ,maven-artifact))) | |
720 | + | (description ""))) | |
721 | + | ||
679 | 722 | (define-public maven-plugin-tools-generators | |
680 | 723 | (package | |
681 | 724 | (inherit maven-plugin-tools-api) | |
… | |||
684 | 727 | `(#:jar-name "maven-plugin-tools-generators.jar" | |
685 | 728 | #:source-dir "maven-plugin-tools-generators/src/main/java" | |
686 | 729 | #:test-dir "maven-plugin-tools-generators/src/test" | |
687 | - | #:jdk ,icedtea-8 | |
688 | 730 | #:tests? #f; require maven-plugin-testing | |
689 | 731 | #:phases | |
690 | 732 | (modify-phases %standard-phases | |
691 | - | (add-before 'build 'fix-exception | |
692 | - | (lambda _ | |
693 | - | (substitute* "maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java" | |
694 | - | (("Properties properties = PropertyUtils.*") | |
695 | - | "Properties properties; | |
733 | + | (add-before 'build 'fix-exception | |
734 | + | (lambda _ | |
735 | + | (substitute* "maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java" | |
736 | + | (("Properties properties = PropertyUtils.*") | |
737 | + | "Properties properties; | |
696 | 738 | try { | |
697 | 739 | properties = PropertyUtils.loadProperties( tmpPropertiesFile ); | |
698 | 740 | } catch(IOException e) { | |
… | |||
700 | 742 | return; | |
701 | 743 | } | |
702 | 744 | ")) | |
703 | - | #t))))) | |
745 | + | #t))))) | |
704 | 746 | (inputs | |
705 | 747 | `(("java-asm" ,java-asm) | |
706 | 748 | ("java-jtidy" ,java-jtidy) | |
… | |||
725 | 767 | `(#:jar-name "maven-plugin-plugin.jar" | |
726 | 768 | #:source-dir "maven-plugin-plugin/src/main/java" | |
727 | 769 | #:test-dir "maven-plugin-plugin/src/test" | |
728 | - | #:jdk ,icedtea-8 | |
729 | - | #:tests? #f)); no tests | |
770 | + | #:tests? #f; no tests | |
771 | + | #:phases | |
772 | + | (modify-phases %standard-phases | |
773 | + | (add-before 'build 'copy-resources | |
774 | + | (lambda _ | |
775 | + | (copy-recursively "maven-plugin-plugin/src/main/resources" | |
776 | + | "build/classes") | |
777 | + | (copy-recursively "maven-plugin-plugin/src/main/filtered-resources" | |
778 | + | "build/classes") | |
779 | + | #t)) | |
780 | + | (add-before 'build 'generate-models | |
781 | + | (lambda* (#:key inputs #:allow-other-keys) | |
782 | + | (define (modello-single-mode file version mode) | |
783 | + | (invoke "java" "org.codehaus.modello.ModelloCli" | |
784 | + | file mode "maven-plugin-plugin/src/main/java" version | |
785 | + | "false" "true")) | |
786 | + | (modello-single-mode "maven-plugin-plugin/src/main/mdo/pluginRequirements.mdo" | |
787 | + | "1.0.0" "java")))))) | |
730 | 788 | (inputs | |
731 | 789 | `(("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
732 | 790 | ("java-plexus-container-default" ,java-plexus-container-default) | |
… | |||
739 | 797 | ("maven-doxia-sink-api" ,maven-doxia-sink-api) | |
740 | 798 | ("maven-doxia-site-renderer" ,maven-doxia-site-renderer) | |
741 | 799 | ("maven-doxia-core" ,maven-doxia-core) | |
800 | + | ("maven-doxia-logging-api" ,maven-doxia-logging-api) | |
742 | 801 | ("maven-model" ,maven-model) | |
743 | - | ("maven-reporting-api" ,maven-reporting-api) | |
744 | - | ("maven-repository-metadata" ,maven-repository-metadata) | |
745 | 802 | ("maven-plugin-annotations" ,maven-plugin-annotations) | |
746 | 803 | ("maven-plugin-api" ,maven-plugin-api) | |
747 | 804 | ("maven-plugin-tools-api" ,maven-plugin-tools-api) | |
748 | - | ("maven-plugin-tools-generators" ,maven-plugin-tools-generators))) | |
805 | + | ("maven-plugin-tools-generators" ,maven-plugin-tools-generators) | |
806 | + | ("maven-reporting-api" ,maven-reporting-api) | |
807 | + | ("maven-reporting-impl" ,maven-reporting-impl) | |
808 | + | ("maven-repository-metadata" ,maven-repository-metadata))) | |
809 | + | (native-inputs | |
810 | + | `(("java-modello-core" ,java-modello-core) | |
811 | + | ;; for modello: | |
812 | + | ("java-asm" ,java-asm) | |
813 | + | ("java-cglib" ,java-cglib) | |
814 | + | ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) | |
815 | + | ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) | |
816 | + | ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) | |
817 | + | ("java-guava" ,java-guava) | |
818 | + | ("java-guice" ,java-guice) | |
819 | + | ("java-javax-inject" ,java-javax-inject) | |
820 | + | ("java-plexus-classworlds" ,java-plexus-classworlds) | |
821 | + | ("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
822 | + | ("java-sisu-build-api" ,java-sisu-build-api) | |
823 | + | ;; modello plugins: | |
824 | + | ("java-modello-plugins-java" ,java-modello-plugins-java))) | |
749 | 825 | (description ""))) | |
750 | 826 | ||
751 | 827 | (define-public maven-resources-plugin | |
… | |||
753 | 829 | (name "maven-resources-plugin") | |
754 | 830 | (version "3.1.0") | |
755 | 831 | (source (origin | |
756 | - | (method url-fetch) | |
757 | - | (uri (string-append "https://github.com/apache/" | |
758 | - | "maven-resources-plugin/archive/" | |
759 | - | "maven-resources-plugin-" version ".tar.gz")) | |
760 | - | (sha256 | |
761 | - | (base32 | |
762 | - | "1f5gnjg2xmqfxml6k0ydyd1sxxwzgnb24qn6avcc4mijwd8a84pl")))) | |
832 | + | (method url-fetch) | |
833 | + | (uri (string-append "https://github.com/apache/" | |
834 | + | "maven-resources-plugin/archive/" | |
835 | + | "maven-resources-plugin-" version ".tar.gz")) | |
836 | + | (sha256 | |
837 | + | (base32 | |
838 | + | "1f5gnjg2xmqfxml6k0ydyd1sxxwzgnb24qn6avcc4mijwd8a84pl")))) | |
763 | 839 | (build-system ant-build-system) | |
764 | 840 | (arguments | |
765 | 841 | `(#:jar-name "maven-resources-plugin.jar" | |
766 | 842 | #:source-dir "src/main/java" | |
767 | 843 | #:test-dir "src/test" | |
768 | 844 | #:tests? #f; test depends on maven-plugin-test-harness | |
769 | - | #:jdk ,icedtea-8 | |
770 | 845 | ;; Need maven-plugin-tools and a corresponding phase | |
771 | 846 | #:phases | |
772 | 847 | (modify-phases %standard-phases | |
773 | - | (add-before 'build 'copy-pom | |
774 | - | (lambda _ | |
775 | - | (mkdir-p "build/classes/META-INF/maven") | |
776 | - | (copy-file "pom.xml" "build/classes/META-INF/pom.xml"))) | |
777 | - | (add-after 'install 'install-pom | |
778 | - | (lambda* (#:key outputs #:allow-other-keys) | |
779 | - | (install-file "pom.xml" (string-append (assoc-ref outputs "out") "/share/pom.xml"))))))) | |
848 | + | (add-before 'build 'copy-pom | |
849 | + | (lambda _ | |
850 | + | (mkdir-p "build/classes/META-INF/maven") | |
851 | + | (copy-file "pom.xml" "build/classes/META-INF/pom.xml"))) | |
852 | + | (add-after 'install 'install-pom | |
853 | + | (lambda* (#:key outputs #:allow-other-keys) | |
854 | + | (install-file "pom.xml" (string-append (assoc-ref outputs "out") | |
855 | + | "/share/pom.xml"))))))) | |
780 | 856 | (inputs | |
781 | 857 | `(("java-plexus-component-annotations" ,java-plexus-component-annotations) | |
782 | 858 | ("java-plexus-container-default" ,java-plexus-container-default) |
more/packages/python.scm
330 | 330 | (define-public python-neovim | |
331 | 331 | (package | |
332 | 332 | (name "python-neovim") | |
333 | - | (version "0.2.6") | |
333 | + | (version "0.3.2") | |
334 | 334 | (source (origin | |
335 | 335 | (method url-fetch) | |
336 | - | (uri (pypi-uri "neovim" version)) | |
336 | + | (uri (pypi-uri "pynvim" version)) | |
337 | 337 | (sha256 | |
338 | 338 | (base32 | |
339 | - | "0xlj54w9bnmq4vidk6r08hwa6az7drahi08w1qf4j9q45rs8mrbc")))) | |
339 | + | "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g")))) | |
340 | 340 | (build-system python-build-system) | |
341 | 341 | (propagated-inputs | |
342 | 342 | `(("python-greenlet" ,python-greenlet) | |
343 | 343 | ("python-msgpack" ,python-msgpack))) | |
344 | 344 | (arguments | |
345 | 345 | `(#:tests? #f)) | |
346 | - | (home-page "https://github.com/neovim/python-client") | |
346 | + | (home-page "https://github.com/neovim/pynvim") | |
347 | 347 | (synopsis "") | |
348 | 348 | (description "") | |
349 | 349 | (license license:asl2.0))) |
more/packages/vim.scm unknown status 1
1 | + | ;;; GNU Guix --- Functional package management for GNU | |
2 | + | ;;; Copyright ?? 2019 Kei Julien Lepiller <julien@lepiller.eu> | |
3 | + | ;;; | |
4 | + | ;;; This file is part of GNU Guix. | |
5 | + | ;;; | |
6 | + | ;;; GNU Guix is free software; you can redistribute it and/or modify it | |
7 | + | ;;; under the terms of the GNU General Public License as published by | |
8 | + | ;;; the Free Software Foundation; either version 3 of the License, or (at | |
9 | + | ;;; your option) any later version. | |
10 | + | ;;; | |
11 | + | ;;; GNU Guix is distributed in the hope that it will be useful, but | |
12 | + | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 | + | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 | + | ;;; GNU General Public License for more details. | |
15 | + | ;;; | |
16 | + | ;;; You should have received a copy of the GNU General Public License | |
17 | + | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | |
18 | + | ||
19 | + | (define-module (more packages vim) | |
20 | + | #:use-module (guix packages) | |
21 | + | #:use-module (guix download) | |
22 | + | #:use-module (guix git-download) | |
23 | + | #:use-module (guix build-system gnu) | |
24 | + | #:use-module (gnu packages) | |
25 | + | #:use-module (more packages python) | |
26 | + | #:use-module ((guix licenses) #:prefix license:)) | |
27 | + | ||
28 | + | (define-public neovim-coquille | |
29 | + | (package | |
30 | + | (name "neovim-coquille") | |
31 | + | (version "0") | |
32 | + | (source (origin | |
33 | + | (method git-fetch) | |
34 | + | (uri (git-reference | |
35 | + | (url "https://framagit.org/tyreunom/coquille.git") | |
36 | + | (commit "6a7833312fe6156df568815ff1b4bae9241fd4a3"))) | |
37 | + | (file-name (git-file-name name version)) | |
38 | + | (sha256 | |
39 | + | (base32 | |
40 | + | "0gmlb9g29cky8acr0zq9fy7r7lp9jvp6sik3srmggrsbmf2wzng1")))) | |
41 | + | (build-system gnu-build-system) | |
42 | + | (arguments | |
43 | + | `(#:tests? #f | |
44 | + | #:phases | |
45 | + | (modify-phases %standard-phases | |
46 | + | (delete 'configure) | |
47 | + | (delete 'build) | |
48 | + | (replace 'install | |
49 | + | (lambda* (#:key outputs #:allow-other-keys) | |
50 | + | (let* ((out (assoc-ref outputs "out")) | |
51 | + | (nvim (string-append out "/share/nvim/site/coquille"))) | |
52 | + | (delete-file ".travis.yml") | |
53 | + | (delete-file ".gitignore") | |
54 | + | (for-each | |
55 | + | (lambda (file) | |
56 | + | (install-file file (string-append nvim "/" (dirname file)))) | |
57 | + | (find-files "." "."))) | |
58 | + | #t))))) | |
59 | + | (propagated-inputs | |
60 | + | `(("python-neovim" ,python-neovim))) | |
61 | + | (home-page "https://framagit.org/tyreunom/coquille") | |
62 | + | (synopsis "") | |
63 | + | (description "") | |
64 | + | (license license:expat))) |