[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/110: gnu: java-jarjar: unbundle maven-plugin-api.
From: |
guix-commits |
Subject: |
05/110: gnu: java-jarjar: unbundle maven-plugin-api. |
Date: |
Thu, 16 Jul 2020 22:23:10 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit e0ee843f77b495cc2d8f4a402358b4628a687bfa
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Sun Apr 5 21:31:30 2020 +0200
gnu: java-jarjar: unbundle maven-plugin-api.
* gnu/packages/java.scm (java-jarjar): Unbundle maven-plugin-api.
---
gnu/packages/java.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c74afa7..70d8b61 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3544,10 +3544,10 @@ documentation tools.")
(snippet
'(begin
;; Delete bundled thirds-party jar archives.
- ;; TODO: unbundle maven-plugin-api.
- (delete-file "lib/asm-4.0.jar")
- (delete-file "lib/asm-commons-4.0.jar")
- (delete-file "lib/junit-4.8.1.jar")
+ (delete-file-recursively "lib")
+ (delete-file "src/test/enumtest.jar")
+ ;; the CLASSPATH needs this directory, create an empty one
+ (mkdir-p "lib")
#t))))
(build-system ant-build-system)
(arguments
@@ -3576,6 +3576,13 @@ documentation tools.")
"<include name=\"org/objectweb/asm/"
"commons/SignatureRemapper.class\"/>")))
#t))
+ (add-before 'build 'remove-maven-dependency
+ (lambda _
+ ;; We do not need to build jarjar as a maven plugin just yet, so
+ ;; remove this file. Maven requires jarjar (but not that plugin),
+ ;; so removing it improves the bootstrap.
+ (delete-file "src/main/com/tonicsystems/jarjar/JarJarMojo.java")
+ #t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((target (string-append (assoc-ref outputs "out")
- branch master updated (5654eef -> 55b90c9), guix-commits, 2020/07/16
- 02/110: gnu: java-asm: Remove dependency on bnd libraries., guix-commits, 2020/07/16
- 03/110: gnu: Add java-hamcrest-library., guix-commits, 2020/07/16
- 01/110: guix: java-utils: Add Maven-related phases., guix-commits, 2020/07/16
- 04/110: gnu: java-junit: Enable tests., guix-commits, 2020/07/16
- 05/110: gnu: java-jarjar: unbundle maven-plugin-api.,
guix-commits <=
- 06/110: gnu: java-junit: Install from pom file., guix-commits, 2020/07/16
- 07/110: gnu: Add apache-parent-pom-13., guix-commits, 2020/07/16
- 10/110: gnu: Add apache-parent-pom-16., guix-commits, 2020/07/16
- 12/110: gnu: Add apache-parent-pom-18., guix-commits, 2020/07/16
- 13/110: gnu: Add apache-parent-pom-19., guix-commits, 2020/07/16
- 14/110: gnu: Add apache-parent-pom-21., guix-commits, 2020/07/16
- 08/110: gnu: Add apache-parent-pom-6., guix-commits, 2020/07/16
- 17/110: gnu: Add apache-commons-parent-pom-48., guix-commits, 2020/07/16
- 18/110: gnu: Add apache-commons-parent-pom-50., guix-commits, 2020/07/16
- 19/110: gnu: Add java-weld-parent-pom., guix-commits, 2020/07/16