[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/14: gnu: java-jmh: Switch to maven-build-system.
From: |
guix-commits |
Subject: |
14/14: gnu: java-jmh: Switch to maven-build-system. |
Date: |
Tue, 22 Jun 2021 07:11:39 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit 1b1eeb3b123162c4d73c939e9ca7bbbb4f79aef1
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Tue Jun 1 00:44:27 2021 +0200
gnu: java-jmh: Switch to maven-build-system.
* gnu/packages/java.scm (java-jmh): Switch to maven-build-system.
---
gnu/packages/java.scm | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7a9f1c3..270f248 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -44,6 +44,7 @@
#:use-module (guix utils)
#:use-module (guix build-system ant)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system maven)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages attr)
@@ -5879,26 +5880,27 @@ available in the Java programming language or Commons
Lang.")
(sha256
(base32
"0i7fa7l3gdqkkgz5ddayp6m46dgbj9rqlz35xffrcbyiz3gpljy0"))))
- (build-system ant-build-system)
+ (build-system maven-build-system)
(arguments
- `(#:jar-name "jmh-core.jar"
- #:source-dir "jmh-core/src/main"
- #:test-dir "jmh-core/src/test"
+ `(#:exclude
+ (("org.apache.maven.plugins" .
+ ("maven-source-plugin" "maven-archetype-plugin" "maven-shade-plugin"
+ "maven-site-plugin" "maven-javadoc-plugin" "maven-eclipse-plugin"))
+ ("com.mycila.maven-license-plugin" . ("maven-license-plugin"))
+ ("org.apache.maven.wagon" . ("wagon-ssh")))
+ #:maven-plugins
+ (("maven-enforcer-plugin" ,maven-enforcer-plugin)
+ ,@(default-maven-plugins))
#:phases
(modify-phases %standard-phases
- ;; This seems to be a bug in the JDK. It may not be necessary in
- ;; future versions of the JDK.
- (add-after 'unpack 'fix-bug
+ (add-after 'unpack 'remove-unnecessary
(lambda _
- (with-directory-excursion
- "jmh-core/src/main/java/org/openjdk/jmh/runner/options"
- (substitute* '("IntegerValueConverter.java"
- "ThreadsValueConverter.java")
- (("public Class<Integer> valueType")
- "public Class<? extends Integer> valueType")))
- #t)))))
- (inputs
- `(("java-jopt-simple" ,java-jopt-simple)
+ ;; requires org.apache.maven.archetype:archetype-packaging.
+ ;; Its subprojects also require groovy, kotlin and scala,
+ ;; respectively.
+ (delete-file-recursively "jmh-archetypes"))))))
+ (propagated-inputs
+ `(("java-jopt-simple" ,java-jopt-simple-4)
("java-commons-math3" ,java-commons-math3)))
(native-inputs
`(("java-junit" ,java-junit)
- 05/14: guix: maven: Support fixing modules., (continued)
- 05/14: guix: maven: Support fixing modules., guix-commits, 2021/06/22
- 02/14: guix: maven: Simplify finding version and group information., guix-commits, 2021/06/22
- 07/14: guix: maven: Use a temporary file to fix pom files., guix-commits, 2021/06/22
- 08/14: guix: java-utils: Look for actual jar files., guix-commits, 2021/06/22
- 11/14: gnu: maven-core: Hardcode versions we have in Guix., guix-commits, 2021/06/22
- 13/14: gnu: java-jmh: Update to 1.32., guix-commits, 2021/06/22
- 06/14: guix: maven: Look in local packages when searching for package version., guix-commits, 2021/06/22
- 09/14: gnu: Add java-jopt-simple-4., guix-commits, 2021/06/22
- 12/14: gnu: maven-enforcer-parent-pom: Fix pom., guix-commits, 2021/06/22
- 10/14: gnu: java-commons-math3: Install to maven repository., guix-commits, 2021/06/22
- 14/14: gnu: java-jmh: Switch to maven-build-system.,
guix-commits <=