diff options
author | Julien Lepiller <julien@lepiller.eu> | 2023-02-25 21:30:29 +0100 |
---|---|---|
committer | Julien Lepiller <julien@lepiller.eu> | 2024-04-20 18:31:34 +0200 |
commit | 7ce7464934aa9ba26b4ec2708c964af7b1d0deb2 (patch) | |
tree | c773171dd9f63b528c41c9764673aca3f2bb8e63 /gnu/packages/maven.scm | |
parent | f1ed3d4699a726cd13985afa32b9c97e72505970 (diff) | |
download | guix-7ce7464934aa9ba26b4ec2708c964af7b1d0deb2.tar guix-7ce7464934aa9ba26b4ec2708c964af7b1d0deb2.tar.gz |
gnu: java-guava: Update to 31.1.
* gnu/packages/patches/java-guava-remove-annotation-deps.patch: New
file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/java.scm (java-guava): Update to 31.1.
[source]: Use patch.
(java-guava-futures-failureaccess): New variable.
* gnu/packages/bioinformatics.scm (java-picard, java-picard-2.10.3): Fix for
newer guava.
* gnu/packages/maven.scm (maven): Add java-guava-futures-failureaccess.
Change-Id: Id2553c48e11c6001fb45a0589720cef1551804d9
Diffstat (limited to 'gnu/packages/maven.scm')
-rw-r--r-- | gnu/packages/maven.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f941bf0dd0..3ab8b6dffc 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2170,7 +2170,8 @@ layer for plugins that need to keep Maven2 compatibility."))) "java-javax-inject" "java-plexus-component-annotations" "java-plexus-utils" "java-plexus-interpolation" "java-plexus-sec-dispatcher" "java-plexus-cipher" "java-guava" - "java-jansi" "java-jsr250" "java-cdi-api" "java-commons-cli" + "java-guava-futures-failureaccess" "java-jansi" + "java-jsr250" "java-cdi-api" "java-commons-cli" "java-commons-io" "java-commons-lang3" "java-slf4j-api")))) (substitute* "apache-maven/src/bin/mvn" (("cygwin=false;") @@ -2239,6 +2240,7 @@ layer for plugins that need to keep Maven2 compatibility."))) java-plexus-sec-dispatcher java-plexus-cipher java-guava + java-guava-futures-failureaccess java-jansi java-jsr250 java-cdi-api |