This is an automated email from the git hooks/post-receive script.
roptat pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 4ff9f1689d gnu: java-commons-lang3: Update to 3.12.0
4ff9f1689d is described below
commit 4ff9f1689d0d8f3c7555c472ce67aaa928af564d
Author: Artyom V. Poptsov <poptsov.art...@gmail.com>
AuthorDate: Sun Jun 12 22:34:28 2022 +0300
gnu: java-commons-lang3: Update to 3.12.0
* gnu/packages/java.scm (java-commons-lang3): Update to 3.12.0.
* gnu/packages/patches/java-commons-lang-fix-dependency.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Julien Lepiller <jul...@lepiller.eu>
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 7 ++--
.../patches/java-commons-lang-fix-dependency.patch | 38 ++++++++++++++++++++++
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ad6b5591a3..0176585485 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1317,6 +1317,7 @@ dist_patch_DATA =
\
%D%/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch
\
%D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch
\
%D%/packages/patches/java-commons-collections-fix-java8.patch \
+ %D%/packages/patches/java-commons-lang-fix-dependency.patch \
%D%/packages/patches/java-jeromq-fix-tests.patch \
%D%/packages/patches/java-openjfx-build-jdk_version.patch \
%D%/packages/patches/java-powermock-fix-java-files.patch \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index fcac0c2367..d2fbf840a0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2021 Mike Gerwitz <m...@gnu.org>
;;; Copyright © 2021 Pierre Langlois <pierre.langl...@gmx.com>
;;; Copyright © 2021 Guillaume Le Vaillant <g...@posteo.net>
+;;; Copyright © 2022 Artyom V. Poptsov <poptsov.art...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -6206,14 +6207,16 @@ included:
(define-public java-commons-lang3
(package
(name "java-commons-lang3")
- (version "3.9")
+ (version "3.12.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/lang/source/"
"commons-lang3-" version "-src.tar.gz"))
(sha256
- (base32 "0s4ffbvsyl16c90l45ximsg4dwd8hmz7wsza3p308fw43h6mwhb6"))))
+ (base32 "09dcv1pkdx3hpf06py8p9511f1wkin6jpacdll0c8vxpbi3yfwzv"))
+ (patches
+ (search-patches "java-commons-lang-fix-dependency.patch"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "commons-lang3.jar"
diff --git a/gnu/packages/patches/java-commons-lang-fix-dependency.patch
b/gnu/packages/patches/java-commons-lang-fix-dependency.patch
new file mode 100644
index 0000000000..4e0d42d2ed
--- /dev/null
+++ b/gnu/packages/patches/java-commons-lang-fix-dependency.patch
@@ -0,0 +1,38 @@
+Prevent java-commons-lang3 from depending on junit-bom when used with
+maven.
+
+From 5c15b04ff9d05235460ea58f303fcf3502a943f2 Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.art...@gmail.com>
+Date: Mon, 13 Jun 2022 09:25:42 +0300
+Subject: [PATCH] pom.xml: Remove dependency on 'junit-bom'
+
+---
+ pom.xml | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 167a85a47..6cd9be57b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -513,18 +513,6 @@
+ </contributor>
+ </contributors>
+
+- <dependencyManagement>
+- <dependencies>
+- <dependency>
+- <groupId>org.junit</groupId>
+- <artifactId>junit-bom</artifactId>
+- <version>5.7.1</version>
+- <type>pom</type>
+- <scope>import</scope>
+- </dependency>
+- </dependencies>
+- </dependencyManagement>
+-
+ <!-- Lang should depend on very little -->
+ <dependencies>
+ <!-- testing -->
+--
+2.25.1
+
