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/patches | |
| 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/patches')
| -rw-r--r-- | gnu/packages/patches/java-guava-remove-annotation-deps.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/gnu/packages/patches/java-guava-remove-annotation-deps.patch b/gnu/packages/patches/java-guava-remove-annotation-deps.patch new file mode 100644 index 0000000000..6f038b1ba4 --- /dev/null +++ b/gnu/packages/patches/java-guava-remove-annotation-deps.patch @@ -0,0 +1,37 @@ +From 41d216ca7993991d32a077d0650ccfad8a846942 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller <julien@lepiller.eu> +Date: Sat, 25 Feb 2023 10:02:11 +0100 +Subject: [PATCH] Remove annotation dependencies + +This is used to prevent a failure when guix creates the Maven directory +structure and fails to find these dependencies. +--- + guava/pom.xml | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/guava/pom.xml b/guava/pom.xml +index 81a2005..5237047 100644 +--- a/guava/pom.xml ++++ b/guava/pom.xml +@@ -31,18 +31,6 @@ + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> +- <dependency> +- <groupId>org.checkerframework</groupId> +- <artifactId>checker-qual</artifactId> +- </dependency> +- <dependency> +- <groupId>com.google.errorprone</groupId> +- <artifactId>error_prone_annotations</artifactId> +- </dependency> +- <dependency> +- <groupId>com.google.j2objc</groupId> +- <artifactId>j2objc-annotations</artifactId> +- </dependency> + <!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? --> + <!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text --> + </dependencies> +-- +2.38.1 + |