~ruther/guix-local

004aedb98d97bbf45ffff1a95357acfca37a0666 — Hartmut Goebel a month ago 08a2d84
gnu: java-commons-lang3: Update to 3.20.0.

* gnu/packages/java.scm (java-commons-lang3): Update to 3.20.0.
  [source]: Remove patch.
* gnu/packages/patches/java-commons-lang-fix-dependency.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister patch.

Change-Id: I1d1c75d3e2204f6bc7d1eeaff29349024094d9f4
3 files changed, 2 insertions(+), 43 deletions(-)

M gnu/local.mk
M gnu/packages/java.scm
D gnu/packages/patches/java-commons-lang-fix-dependency.patch
M gnu/local.mk => gnu/local.mk +0 -1
@@ 1645,7 1645,6 @@ 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-guava-remove-annotation-deps.patch \
  %D%/packages/patches/java-jeromq-fix-tests.patch		\
  %D%/packages/patches/java-openjfx-build-jdk_version.patch     \

M gnu/packages/java.scm => gnu/packages/java.scm +2 -4
@@ 6180,16 6180,14 @@ included:
(define-public java-commons-lang3
  (package
    (name "java-commons-lang3")
    (version "3.12.0")
    (version "3.20.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://apache/commons/lang/source/"
                           "commons-lang3-" version "-src.tar.gz"))
       (sha256
        (base32 "09dcv1pkdx3hpf06py8p9511f1wkin6jpacdll0c8vxpbi3yfwzv"))
       (patches
        (search-patches "java-commons-lang-fix-dependency.patch"))))
        (base32 "05b2zfmw1y6bnzf7v32zkhix0c0sab82lmr3ilxciza0l5w6nwya"))))
    (build-system ant-build-system)
    (arguments
     `(#:jar-name "commons-lang3.jar"

D gnu/packages/patches/java-commons-lang-fix-dependency.patch => gnu/packages/patches/java-commons-lang-fix-dependency.patch +0 -38
@@ 1,38 0,0 @@
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.artyom@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