branch master updated: news: Add 'de' translation.

2024-04-20 Thread guix-commits 
This is an automated email from the git hooks/post-receive script.

pelzflorian pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 8600726d38 news: Add 'de' translation.
8600726d38 is described below

commit 8600726d388da2c1e20820c8835953d6844a0d87
Author: Florian Pelz 
AuthorDate: Sat Apr 20 09:07:24 2024 +0200

news: Add 'de' translation.

* etc/news.scm: Add German translation for nss-certs entry.

Change-Id: I82343fdc81c370a2a11e0c7bce55e5914187861f
---
 etc/news.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/etc/news.scm b/etc/news.scm
index 3dbe0e0e67..ce17729147 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -5,7 +5,7 @@
 ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas 
 ;; Copyright © 2019, 2020 Konrad Hinsen 
 ;; Copyright © 2019, 2020, 2021, 2023 Julien Lepiller 
-;; Copyright © 2019–2023 Florian Pelz 
+;; Copyright © 2019–2024 Florian Pelz 
 ;; Copyright © 2020, 2022 Marius Bakke 
 ;; Copyright © 2020, 2021 Mathieu Othacehe 
 ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen 
@@ -34,11 +34,15 @@
  (entry (commit "fdfd7667c66cf9ce746330f39bcd366e124460e1")
 (title
  (en "@code{nss-certs} is now included in @code{%base-packages}")
+ (de "@code{nss-certs} ist jetzt Teil von @code{%base-packages}")
  (fr "@code{nss-certs} est maintenant inclus dans 
@code{%base-packages}"))
 (body
  (en "The @code{nss-certs} package is now included in the
 @code{%base-packages}, the default value for the @code{packages} field of the
 @code{operating-system} record.")
+ (de "Das Paket @code{nss-certs} ist jetzt in @code{%base-packages}
+enthalten, dem Vorgabewert des @code{packages}-Felds im
+@code{operating-system}-Verbundstyp.")
  (fr "Le paquet @code{nss-certs} est maintenant inclus dans
 @code{%base-packages}, la valeur par défaut du champ @code{packages} de
 l'enregistrement @code{operating-system}.")))

branch master updated (8600726d38 -> 0f68306268)

2024-04-20 Thread guix-commits 
lilyp pushed a change to branch master
in repository guix.

from 8600726d38 news: Add 'de' translation.
 new e14bc39a97 doc: Update gnome-desktop-configuration.
 new 0f68306268 doc: Correct the "guix shell --container" example.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/guix.texi | 48 +++-
 1 file changed, 43 insertions(+), 5 deletions(-)

02/02: doc: Correct the "guix shell --container" example.

2024-04-20 Thread guix-commits 
lilyp pushed a commit to branch master
in repository guix.

commit 0f68306268773f0eaa4327e1f6fdcb39442e4a34
Author: Rostislav Svoboda 
AuthorDate: Tue Apr 2 18:54:06 2024 +0200

doc: Correct the "guix shell --container" example.

* doc/guix.texi (Invoking @command{guix shell}): Add missing parameters
to preserve and expose $XAUTHORITY.  Adjust corresponding textual 
description.

Change-Id: Ib99c81c107ff9784708ae807ec9b3ab93ad75603
Signed-off-by: Liliana Marie Prikler 
---
 doc/guix.texi | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 59da6528cc..65af136e61 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5983,12 +5983,18 @@ such as @file{/usr/bin} on foreign distros.
 This @option{--container} option can also prove useful if you wish to
 run a security-sensitive application, such as a web browser, in an
 isolated environment.  For example, the command below launches
-Ungoogled-Chromium in an isolated environment, this time sharing network
-access with the host and preserving its @code{DISPLAY} environment
-variable, but without even sharing the current directory:
+Ungoogled-Chromium in an isolated environment, which:
+@itemize
+@item shares network access with the host
+@item inherits host's environment variables @code{DISPLAY} and 
@code{XAUTHORITY}
+@item has access to host's authentication records from the @code{XAUTHORITY}
+file
+@item has no information about host's current directory
+@end itemize
 
 @example
 guix shell --container --network --no-cwd ungoogled-chromium \
+  --preserve='^XAUTHORITY$' --expose="$@{XAUTHORITY@}" \
   --preserve='^DISPLAY$' -- chromium
 @end example

01/02: doc: Update gnome-desktop-configuration.

2024-04-20 Thread guix-commits 
lilyp pushed a commit to branch master
in repository guix.

commit e14bc39a97524d93068b2c6bc773ea45b6659fc5
Author: Liliana Marie Prikler 
AuthorDate: Sat Apr 6 07:21:19 2024 +0200

doc: Update gnome-desktop-configuration.

* doc/guix.texi (gnome-desktop-configuration): Fill in missing fields.
[gnome]: Talk about the deprecation.
---
 doc/guix.texi | 36 ++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index edd464c2fd..59da6528cc 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -24463,10 +24463,42 @@ polkit with the actions from 
@code{gnome-settings-daemon}.
 
 @deftp {Data Type} gnome-desktop-configuration
 Configuration record for the GNOME desktop environment.
+Available @code{gnome-desktop-configuration} fields are:
 
 @table @asis
-@item @code{gnome} (default: @code{gnome})
-The GNOME package to use.
+@item @code{core-services} (type: list-of-packages)
+A list of packages that the GNOME Shell and applications may rely on.
+
+@item @code{shell} (type: list-of-packages)
+A list of packages that constitute the GNOME Shell, without
+applications.
+
+@item @code{utilities} (type: list-of-packages)
+A list of packages that serve as applications to use on top of the GNOME Shell.
+
+@item @code{gnome} (type: maybe-package)
+This field used to be the only configuration point and specified
+a GNOME meta-package to install system-wide.  Since the meta-package
+itself provides neither sources nor the actual packages and is only
+used to propagate them, this field is deprecated.
+
+@item @code{extra-packages} (type: list-of-packages)
+A list of GNOME-adjacent packages to also include.  This field is
+intended for users to add their own packages to their GNOME experience.
+Note, that it already includes some packages that are considered
+essential by some (most?) GNOME users.
+
+@item @code{udev-ignorelist} (default: @code{()}) (type: list-of-strings)
+A list of regular expressions denoting udev rules or hardware file names
+provided by any package that should not be installed.  By default, every
+udev rule and hardware file specified by any package referenced in the
+other fields are installed.
+
+@item @code{polkit-ignorelist} (default: @code{()}) (type: list-of-strings)
+A list of regular expressions denoting polkit rules provided by any
+package that should not be installed.  By default, every polkit rule
+added by any package referenced in the other fields are installed.
+
 @end table
 @end deftp

branch master updated (43a4215cad -> 38b88d710e)

2024-04-20 Thread guix-commits 
iyzsong pushed a change to branch master
in repository guix.

from 43a4215cad Authorize the PGP key of Zheng Junjie (z572).
 new 9ddbfb27cf gnu: font-spleen: Update to 2.1.0.
 new 12474d20d2 gnu: font-mononoki: Update to 1.6.
 new 38b88d710e gnu: font-public-sans: Update to 2.001.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/fonts.scm | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

02/03: gnu: font-mononoki: Update to 1.6.

2024-04-20 Thread guix-commits 
iyzsong pushed a commit to branch master
in repository guix.

commit 12474d20d24ce2c4a8c220c3e970c24a97a3c9dc
Author: 宋文武 
AuthorDate: Sun Apr 21 10:46:57 2024 +0800

gnu: font-mononoki: Update to 1.6.

* gnu/packages/fonts.scm (font-mononoki): Update to 1.6.

Change-Id: I39d2690481197afa86ebdf959fd5f904d0b3104f
---
 gnu/packages/fonts.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index c0d770ac78..de3db33f20 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2473,7 +2473,7 @@ files (TTF).")
 (define-public font-mononoki
   (package
 (name "font-mononoki")
-(version "1.3")
+(version "1.6")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -2481,7 +2481,7 @@ files (TTF).")
 (commit version)))
   (sha256
(base32
-"07gh84iw84g8fha3gx4yjyl1rsksqhy2kk38f01m048sgjp6ww5j"))
+"1mqinvb3hyimga8qjgpwgfv30yddzyicd79shhjbsns91v5z4x33"))
   (file-name (git-file-name name version
 (build-system font-build-system)
 (arguments

03/03: gnu: font-public-sans: Update to 2.001.

2024-04-20 Thread guix-commits 
iyzsong pushed a commit to branch master
in repository guix.

commit 38b88d710ea13ba024aed0543bc2862772cdb645
Author: 宋文武 
AuthorDate: Sun Apr 21 10:46:58 2024 +0800

gnu: font-public-sans: Update to 2.001.

* gnu/packages/fonts.scm (font-public-sans): Update to 2.001.

Change-Id: I404ec907827b4ce5b08f5021ef22dc0e8bb55e7a
---
 gnu/packages/fonts.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index de3db33f20..a5c8cfadce 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2519,7 +2519,7 @@ font that is a composite of IBM Plex Mono and IBM Plex 
Sans JP.")
 (define-public font-public-sans
   (package
 (name "font-public-sans")
-(version "1.008")
+(version "2.001")
 (source
  (origin
(method git-fetch)
@@ -2528,7 +2528,7 @@ font that is a composite of IBM Plex Mono and IBM Plex 
Sans JP.")
  (commit (string-append "v" version
(file-name (git-file-name name version))
(sha256
-(base32 "1qhyxbjv1rnydfpqzd18fbiyz75p4sabphy8yj07hyq0hidp5xsf"
+(base32 "0p3rl4w8m381jxb7in6z9iwjbk1chd7s0gk6jz96c8ci1bddbxk0"
 (build-system font-build-system)
 (home-page "https://public-sans.digital.gov/;)
 (synopsis "Neutral typeface for interfaces, text, and headings")

01/03: gnu: font-spleen: Update to 2.1.0.

2024-04-20 Thread guix-commits 
iyzsong pushed a commit to branch master
in repository guix.

commit 9ddbfb27cf5b667633781da909ebe9f65498c94d
Author: 宋文武 
AuthorDate: Sun Apr 21 10:25:02 2024 +0800

gnu: font-spleen: Update to 2.1.0.

* gnu/packages/fonts.scm (font-spleen): Update to 2.1.0.

Change-Id: Icd27bdfa3d30dee6bc182bb21780e55f58185e7a
---
 gnu/packages/fonts.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 26697a4e40..c0d770ac78 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -3558,7 +3558,7 @@ prevalent typefaces in Traditional Chinese regions.")))
 (define-public font-spleen
   (package
 (name "font-spleen")
-(version "1.9.3")
+(version "2.1.0")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -3566,7 +3566,7 @@ prevalent typefaces in Traditional Chinese regions.")))
 version "/spleen-" version ".tar.gz"))
   (sha256
(base32
-"09bbwza14pl70cxbr09f9m8522s5p1p04kx9gh8svpd50bdixbdp"
+"0brp1kyp6i5q9zk3hpj5ngxh4js0aw2m6d4yrzxmif3f39pwaiwb"
 (build-system font-build-system)
 (outputs '("out" ;OTB
"bdf" "otf" "pcf" "psf"))

18/18: gnu: java-powermock-reflect: Update to 2.0.9.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 92af4ea17f70207fbbf2513f677f3171d4eafd41
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:42 2023 +0100

gnu: java-powermock-reflect: Update to 2.0.9.

* gnu/packages/java.scm (java-powermock-reflect): Update to 2.0.9.
[source]: Use git source.
(java-powermock-reflect, java-powermock-core, java-powermock-api-support)
(java-powermock-junit4-common, java-powermock-junit4)
(java-powermock-api-easymock): Update inputs and use new style.
* gnu/packages/patches/java-powermock-fix-java-files.patch: Update
  patch.

Change-Id: I856e5f923b094b9fcfa78f5f1d6ca2e4c2af41a7
---
 gnu/packages/java.scm  |  72 
 .../patches/java-powermock-fix-java-files.patch| 192 +
 2 files changed, 190 insertions(+), 74 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index f4669f8d6d..4c759889e5 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -11440,30 +11440,27 @@ and without the help of a compiler.")
 (define-public java-powermock-reflect
   (package
 (name "java-powermock-reflect")
-(version "1.7.3")
+(version "2.0.9")
 (source (origin
-  (method url-fetch)
-  (uri (string-append "https://github.com/powermock/powermock/;
-  "archive/powermock-" version ".tar.gz"))
-  (file-name (string-append name "-" version ".tar.gz"))
+  (method git-fetch)
+  (uri (git-reference
+ (url "https://github.com/powermock/powermock;)
+ (commit (string-append "powermock-" version
+  (file-name (git-file-name name version))
   (sha256
(base32
-"0sbgi5vqq7k72wzcdjb20s370vyd4hsbnx71pzb8ishml3gy7fwy"))
+"03y8szi9iwxnv431z2mn2ivc1ak30vcvfvkyrwmfq7wq93bj2c5v"))
   (patches
 (search-patches "java-powermock-fix-java-files.patch"
 (build-system ant-build-system)
 (arguments
  `(#:jar-name "java-powermock-reflect.jar"
-   #:jdk ,icedtea-8
#:source-dir "powermock-reflect/src/main/java"
#:test-dir "powermock-reflect/src/test"))
 (inputs
- (list java-objenesis))
+ (list java-asm-9 java-objenesis))
 (native-inputs
- `(("junit" ,java-junit)
-   ("cglib" ,java-cglib)
-   ("hamcrest" ,java-hamcrest-core)
-   ("assertj" ,java-assertj)))
+ (list java-assertj java-cglib java-hamcrest-core java-junit))
 (home-page "https://github.com/powermock/powermock;)
 (synopsis "Mock library extension framework")
 (description "PowerMock is a framework that extends other mock libraries
@@ -11492,12 +11489,12 @@ done to the IDE or continuous integration servers 
which simplifies adoption.")
"build/classes")
  #t)
 (inputs
- `(("reflect" ,java-powermock-reflect)
-   ("javassist" ,java-jboss-javassist)))
+ (list java-asm-9
+   java-byte-buddy-dep
+   java-jboss-javassist
+   java-powermock-reflect))
 (native-inputs
- `(("junit" ,java-junit)
-   ("assertj" ,java-assertj)
-   ("mockito" ,java-mockito-1)
+ (list java-assertj java-mockito-1 java-junit
 
 (define-public java-powermock-api-support
   (package
@@ -11510,8 +11507,7 @@ done to the IDE or continuous integration servers which 
simplifies adoption.")
#:source-dir "powermock-api/powermock-api-support/src/main/java"
#:tests? #f)); no tests
 (inputs
- `(("core" ,java-powermock-core)
-   ("reflect" ,java-powermock-reflect)
+ (list java-powermock-core java-powermock-reflect
 
 (define-public java-powermock-modules-junit4-common
   (package
@@ -11524,11 +11520,11 @@ done to the IDE or continuous integration servers 
which simplifies adoption.")
#:source-dir 
"powermock-modules/powermock-module-junit4-common/src/main/java"
#:test-dir "powermock-modules/powermock-module-junit4-common/src/test"))
 (inputs
- `(("core" ,java-powermock-core)
-   ("easymock" ,java-easymock)
-   ("reflect" ,java-powermock-reflect)
-   ("hamcrest" ,java-hamcrest-core)
-   ("cglib" ,java-cglib)
+ (list java-cglib
+   java-easymock
+   java-hamcrest-core
+   java-powermock-core
+   java-powermock-reflect
 
 (define-public java-powermock-modules-junit4
   (package
@@ -11537,7 +11533,7 @@ done to the IDE or continuous integration servers which 
simplifies adoption.")
 (build-system ant-build-system)
 (arguments
  `(#:jar-name "java-powermock-modules-junit4.jar"
-   #:jdk ,icedtea-8
+   #:tests? #f; require easymock 4, which introduces a loop with testng
#:source-dir "powermock-modules/powermock-module-junit4/src/main/java"
#:test-dir

03/18: gnu: Add java-error-prone-annotations.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 415a4d011546ed9d1d514426e44a698b2b7d7e57
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:28 2023 +0100

gnu: Add java-error-prone-annotations.

* gnu/packages/java.scm (java-error-prone-annotations): New variable.

Change-Id: I42b79a7c338f8866617b474cb39bc2ea75160d4a
---
 gnu/packages/java.scm | 44 
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index da0259fcf6..95b2f223ae 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6204,6 +6204,50 @@ namespaces.")
 It provides packages in the @code{javax.annotations} namespace.")
 (license license:asl2.0)))
 
+(define-public java-error-prone-annotations
+  (package
+(name "java-error-prone-annotations")
+(version "2.18.0")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+ (url "https://github.com/google/error-prone;)
+ (commit (string-append "v" version
+  (file-name (git-file-name "java-error-prone" version))
+  (sha256
+   (base32
+"19sqsz0b308rhadr3ff10azdbqjq37nvrn9c06224dwpxap0931f"
+(build-system ant-build-system)
+(arguments
+ `(#:tests? #f; no tests
+   #:jar-name (string-append ,name "-" ,version ".jar")
+   #:source-dir "annotations/src/main/java"
+   #:test-dir "annotations/src/altest"
+   #:phases
+   (modify-phases %standard-phases
+ (replace 'install (install-from-pom "annotations/pom.xml")
+(propagated-inputs (list java-error-prone-parent-pom java-jsr305))
+(home-page "https://errorprone.info;)
+(synopsis "Java static analyzer at compile-time")
+(description "Error Prone is a static analysis tool for Java that catches
+common programming mistakes at compile-time.  This package contains annotations
+used by programmers to guide the static analysis.")
+(license license:asl2.0)))
+
+(define java-error-prone-parent-pom
+  (package
+(inherit java-error-prone-annotations)
+(name "java-error-prone-parent-pom")
+(arguments
+ `(#:tests? #f
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (replace 'install
+   (install-pom-file "pom.xml")
+(propagated-inputs '(
+
 (define-public java-guava
   (package
 (name "java-guava")

02/18: gnu: java-bsh: Update to 2.1.1.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit def5129341023dc7f138f556aa4bfcbed2e8d173
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:26 2023 +0100

gnu: java-bsh: Update to 2.1.1.

* gnu/packages/java.scm (java-bsh): Update to 2.1.1.

Change-Id: I70fd1e5ed63195cb8feb9fe14bd7331d34d6da4f
---
 gnu/packages/java.scm | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 18e29592d8..da0259fcf6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10645,7 +10645,7 @@ annotations.")
 (define-public java-bsh
   (package
 (name "java-bsh")
-(version "2.0b6")
+(version "2.1.1")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -10654,7 +10654,7 @@ annotations.")
   (file-name (git-file-name name version))
   (sha256
(base32
-"0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw"))
+"1a6y46yz2ba4mnlfv4bpd5pmzhgxrzk3s10xp05jz377nbp2izwg"))
   (modules '((guix build utils)))
   (snippet
'(begin
@@ -10670,6 +10670,10 @@ annotations.")
#:make-flags (list "-DDATE" "(no date for reproducibility)")
#:phases
(modify-phases %standard-phases
+ (add-before 'check 'fix-test
+   (lambda _
+ (substitute* "tests/junitTests/src/bsh/Issue_55_Test.java"
+   ((" BshScriptEngineFactory") " 
bsh.engine.BshScriptEngineFactory"
  (replace 'install
(install-from-pom "pom.xml")
 (inputs

15/18: gnu: Add java-asm-util-9.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 0336ffb49ad80e5f1487b056ae2cb84855a12e1a
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:39 2023 +0100

gnu: Add java-asm-util-9.

* gnu/packages/java.scm (java-asm-util-9): New variable.

Change-Id: I41eaa0c7d74d0aee569e8b6b80ec9fee876a1af1
---
 gnu/packages/java.scm | 13 +
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8abf241ee5..357b0c3593 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5156,6 +5156,19 @@ including java-asm.")
 (inputs
  (list java-asm-9 java-asm-tree-9
 
+(define-public java-asm-util-9
+  (package
+(inherit java-asm-9)
+(name "java-asm-util")
+(arguments
+ `(#:jar-name "asm-util8.jar"
+   #:source-dir "asm-util/src/main/java"
+   #:test-dir "asm-util/src/test"
+   ;; tests depend on junit5
+   #:tests? #f))
+(inputs
+ (list java-asm-9 java-asm-analysis-9 java-asm-tree-9
+
 (define-public java-cglib
   (package
 (name "java-cglib")

branch master updated (0f68306268 -> 92af4ea17f)

2024-04-20 Thread guix-commits 
roptat pushed a change to branch master
in repository guix.

from 0f68306268 doc: Correct the "guix shell --container" example.
 new c5fd96a0cd gnu: java-objenesis: Update to 3.3.
 new def5129341 gnu: java-bsh: Update to 2.1.1.
 new 415a4d0115 gnu: Add java-error-prone-annotations.
 new f1ed3d4699 gnu: java-cglib: Update to 3.3.0.
 new 7ce7464934 gnu: java-guava: Update to 31.1.
 new 05b2cfdc62 gnu: Add apache-parent-pom-29.
 new eec5c0d524 gnu: Add maven-parent-pom-39.
 new 5438e1a86a gnu: Add apache-parent-pom-27.
 new 597f7db28a gnu: Add maven-parent-pom-37.
 new 65e18f3f44 gnu: maven-resolver-api: Update to 1.9.4.
 new 4ba0614677 gnu: Add java-asm-9.
 new 7634bfca4a gnu: Add java-asm-tree-9.
 new 6a763d916e gnu: maven: Update to 3.9.0.
 new 8318deb555 gnu: Add java-asm-analysis-9.
 new 0336ffb49a gnu: Add java-asm-util-9.
 new 12c7f5299b gnu: Add java-asm-commons-9.
 new bb3a631f24 gnu: Add java-byte-buddy-dep.
 new 92af4ea17f gnu: java-powermock-reflect: Update to 2.0.9.

The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk   |   1 +
 gnu/packages/batik.scm |   1 -
 gnu/packages/bioinformatics.scm|   8 +
 gnu/packages/java.scm  | 332 +++--
 gnu/packages/maven-parent-pom.scm  |  28 ++
 gnu/packages/maven.scm | 197 ++--
 .../java-guava-remove-annotation-deps.patch|  37 +++
 .../patches/java-powermock-fix-java-files.patch| 192 +---
 8 files changed, 585 insertions(+), 211 deletions(-)
 create mode 100644 gnu/packages/patches/java-guava-remove-annotation-deps.patch

01/18: gnu: java-objenesis: Update to 3.3.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit c5fd96a0cd95616e7728ca68f4ee16bba824c7f9
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:25 2023 +0100

gnu: java-objenesis: Update to 3.3.

* gnu/packages/java.scm (java-objenesis): Update to 3.3.

Change-Id: I2739d203cace8e7a14396c7a78531b1eb251
---
 gnu/packages/java.scm | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 613742007a..18e29592d8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5144,7 +5144,7 @@ to generate and transform Java byte code.")
 (define-public java-objenesis
   (package
 (name "java-objenesis")
-(version "2.5.1")
+(version "3.3")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -5153,11 +5153,12 @@ to generate and transform Java byte code.")
   (file-name (git-file-name name version))
   (sha256
(base32
-"054yi200wj00x6dp1sxfrwgndwywadsbn8d8ij1j0v45j9g2vdya"
+"1brlcn536p4s1v1f3vzxhr38lvyhc33wjrbj2x06kdrd8agy90cr"
 (build-system ant-build-system)
 (arguments
- `(#:jar-name "objenesis.jar"
-   #:source-dir "main/src/"
+ `(#:tests? #f; require junit-5
+   #:jar-name "objenesis.jar"
+   #:source-dir "main/src/main/java"
#:test-dir "main/src/test/"))
 (native-inputs
  (list java-junit java-hamcrest-core))

10/18: gnu: maven-resolver-api: Update to 1.9.4.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 65e18f3f44607af8f74159b0726444ac72c4c3ae
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:34 2023 +0100

gnu: maven-resolver-api: Update to 1.9.4.

* gnu/packages/maven.scm (maven-resolver-api): Update to 1.9.4.
(maven-resolver-util)[native-inputs]: Update test dependencies.
(maven-resolver-named-lock): New variable.
(maven-resolver-impl, maven-resolver-transport-wagon)
(maven-resolver-transport-http): Update sisu.

Change-Id: I080136e77454ee256a74fff263301e250a2918cb
---
 gnu/packages/maven.scm | 167 +++--
 1 file changed, 91 insertions(+), 76 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 3ab8b6dffc..f96337a17d 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -40,7 +40,7 @@
 (define-public maven-resolver-api
   (package
 (name "maven-resolver-api")
-(version "1.6.3")
+(version "1.9.4")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -49,7 +49,7 @@
   (file-name (git-file-name name version))
   (sha256
(base32
-"0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37"
+"0s18vivvapmrk407syrc8ib2qpmp01i3k46h6gqp7961n1p9wzlq"
 (build-system ant-build-system)
 (arguments
  `(#:jar-name "maven-resolver-api.jar"
@@ -90,7 +90,7 @@
  #t))
  (replace 'install
(install-pom-file "pom.xml")
-(propagated-inputs '(
+(propagated-inputs (list maven-parent-pom-37
 
 (define-public maven-resolver-spi
   (package
@@ -140,7 +140,7 @@ ease testing of the repository system.")))
 (propagated-inputs
  (list maven-resolver-api))
 (native-inputs
- (list java-junit java-hamcrest-core maven-resolver-test-util))
+ (list java-junit java-hamcrest-all maven-resolver-test-util))
 (synopsis "Utility classes for the maven repository system")
 (description "This package contains a collection of utility classes to
 ease usage of the repository system.")))
@@ -174,6 +174,35 @@ ease usage of the repository system.")))
 (description "This package contains a repository connector implementation
 for repositories using URI-based layouts.")))
 
+(define-public maven-resolver-named-locks
+  (package
+(inherit maven-resolver-api)
+(name "maven-resolver-named-locks")
+(arguments
+ `(#:jar-name "maven-resolver-named-locks.jar"
+   #:source-dir "maven-resolver-named-locks/src/main/java"
+   #:test-dir "maven-resolver-named-locks/src/test"
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'build 'generate-sisu
+   (lambda _
+ (mkdir-p "build/classes/META-INF/sisu")
+ (with-output-to-file 
"build/classes/META-INF/sisu/javax.inject.Named"
+   (lambda _
+ (display 
"org.eclipse.aether.named.providers.FileLockNamedLockFactory
+org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory
+org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory
+org.eclipse.aether.named.providers.NoopNamedLockFactory\n")
+ (replace 'install
+   (install-from-pom "maven-resolver-named-locks/pom.xml")
+(propagated-inputs
+  (list java-slf4j-api))
+(native-inputs
+  (list java-javax-inject java-junit java-hamcrest-all))
+(synopsis "Maven artifact resolver named locks")
+(description "This package contains a synchronization utility 
implementation
+using named locks.")))
+
 (define-public maven-resolver-impl
   (package
 (inherit maven-resolver-api)
@@ -182,6 +211,7 @@ for repositories using URI-based layouts.")))
  `(#:jar-name "maven-resolver-impl.jar"
#:source-dir "maven-resolver-impl/src/main/java"
#:test-dir "maven-resolver-impl/src/test"
+   #:tests? #f; require more recent hamcrest
#:phases
(modify-phases %standard-phases
  (add-before 'build 'generate-sisu
@@ -189,37 +219,60 @@ for repositories using URI-based layouts.")))
  (mkdir-p "build/classes/META-INF/sisu")
  (with-output-to-file 
"build/classes/META-INF/sisu/javax.inject.Named"
(lambda _
- (display
-   (string-append
- ;; Build this list by looking for files containing 
"@Named"
- 
"org.eclipse.aether.internal.impl.DefaultArtifactResolver\n"
- 
"org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector\n"
- 
"org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider\n"
- "org.eclipse.aether.internal.impl.DefaultDeployer\n"
- "org.eclipse.aether.internal.impl.DefaultFileProcessor\n"
- "org.eclipse.aether.internal.impl.DefaultInstaller\n"

04/18: gnu: java-cglib: Update to 3.3.0.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit f1ed3d4699a726cd13985afa32b9c97e72505970
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:27 2023 +0100

gnu: java-cglib: Update to 3.3.0.

cglib now requires asm-8 at runtime, so propagate it and do not use
asm-6 in dependents.

* gnu/packages/java.scm (java-cglib): Update to 3.3.0.
(java-plexus-component-metadata-1.7, java-easymock, java-jmock)
(java-jmock-legacy, java-jmock-junit4, java-ops4j-pax-exam-core-spi)
(java-guice, java-fest-assert, java-testng, java-lmax-disruptor)
(java-powermock-reflect, java-powermock-modules-junit4)
(java-kafka-clients, java-jline-2, java-xmlunit, java-eclipse-sisu-plexus)
(java-logback-core): Remove `java-asm` from inputs or native-inputs.
(java-httpcomponents-httpclient-cache)
(java-httpcomponents-httpclient-osgi): Disable tests.
* gnu/packages/batik.scm (java-xmlgraphics-commons): Remove `java-asm`
  from inputs or native inputs.
* gnu/packages/maven.scm (maven-resolver-transport-file)
(maven-resolver-transport-http, maven-model, maven-repository-metadata)
(maven-compat): Remove `java-asm` from inputs or native-inputs.

Change-Id: I92a939e7522d92b185715d7935aabed5ddb77451
---
 gnu/packages/batik.scm |  1 -
 gnu/packages/java.scm  | 39 +--
 gnu/packages/maven.scm |  7 +--
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm
index 58f829dbd5..d435cc0f1a 100644
--- a/gnu/packages/batik.scm
+++ b/gnu/packages/batik.scm
@@ -338,7 +338,6 @@ SAC is an interface for CSS parsers.")
#t))
 (native-inputs
  `(("java-apache-xml-commons-resolver" ,java-apache-xml-commons-resolver)
-   ("java-asm" ,java-asm)
("java-cglib" ,java-cglib)
("java-hamcrest" ,java-hamcrest-core)
("java-junit" ,java-junit)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 95b2f223ae..1d2dfb4d8d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4135,7 +4135,7 @@ from source tags and class annotations.")))
java-commons-cli
java-qdox
java-jdom2
-   java-asm))
+   java-asm-8))
 (native-inputs
  (list java-junit java-guava java-geronimo-xbean-reflect))
 (synopsis "Inversion-of-control container for Maven")
@@ -5109,7 +5109,7 @@ including java-asm.")
 (define-public java-cglib
   (package
 (name "java-cglib")
-(version "3.2.4")
+(version "3.3.0")
 (source
  (origin
(method git-fetch)
@@ -5121,7 +5121,7 @@ including java-asm.")
   version)
(file-name (git-file-name name version))
(sha256
-(base32 "186451jms2zfp47yd8kxd77az2cqal1my2br7klgyp8fpl4qfg8v"
+(base32 "1lnscamc6bnhh7jgij5garxagp3zn2jp4cbq0rsn4xr3l0cnd014"
 (build-system ant-build-system)
 (arguments
  `(;; FIXME: tests fail because junit runs
@@ -5133,8 +5133,8 @@ including java-asm.")
(modify-phases %standard-phases
  (add-after 'unpack 'chdir
(lambda _ (chdir "cglib") #t)
-(inputs
- (list java-asm java-junit))
+(native-inputs (list java-junit))
+(propagated-inputs (list java-asm-8))
 (home-page "https://github.com/cglib/cglib/;)
 (synopsis "Java byte code generation library")
 (description "The byte code generation library CGLIB is a high level API
@@ -5222,7 +5222,7 @@ constructor on object instantiation.")
(delete-file "tests2/EasyMockPropertiesTest.java"))
  #t)
 (inputs
- (list java-asm java-cglib java-objenesis))
+ (list java-cglib java-objenesis))
 (native-inputs
  (list java-junit java-hamcrest-core))
 (home-page "https://easymock.org/;)
@@ -5345,7 +5345,7 @@ The jMock library
(base32
 "12b7l22g3nrjvf2dzcw3z03fpd2chrgp0d8xkvn8w55rwb57pax6"
 (inputs
- (list java-hamcrest-all java-asm java-bsh java-junit))
+ (list java-hamcrest-all java-bsh java-junit))
 (native-inputs
  `(("cglib" ,java-cglib)))
 (arguments
@@ -5363,7 +5363,6 @@ The jMock library
#:test-dir "jmock-junit4/src/test"))
 (inputs
  `(("java-hamcrest-all" ,java-hamcrest-all)
-   ("java-asm" ,java-asm)
("java-bsh" ,java-bsh)
("java-jmock" ,java-jmock)
("java-jumit" ,java-junit)
@@ -5390,7 +5389,6 @@ The jMock library
java-objenesis
java-cglib
java-jmock
-   java-asm
java-bsh
java-junit))
 (native-inputs
@@ -6567,6 +6565,7 @@ standards and recommendations.")
  `(#:jar-name "httpcomponents-httpclient-cache.jar"
#:source-dir "src/main/java"
#:test-dir "src/test"
+   #:tests? #f; tests are broken with current cglib.
#:phases
(modify-phases

05/18: gnu: java-guava: Update to 31.1.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 7ce7464934aa9ba26b4ec2708c964af7b1d0deb2
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:29 2023 +0100

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
---
 gnu/local.mk   |  1 +
 gnu/packages/bioinformatics.scm|  8 
 gnu/packages/java.scm  | 43 +++---
 gnu/packages/maven.scm |  4 +-
 .../java-guava-remove-annotation-deps.patch| 37 +++
 5 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 2e0c6a5d3c..a153b3e247 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1511,6 +1511,7 @@ dist_patch_DATA = 
\
   %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 \
   %D%/packages/patches/java-powermock-fix-java-files.patch \
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 448ea5d6de..c2e9f209bc 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7303,6 +7303,10 @@ geographic distributions.")
(modify-phases %standard-phases
  ;; FIXME: this phase fails with "duplicate entry: 
htsjdk/samtools/AbstractBAMFileIndex$1.class"
  (delete 'generate-jar-indices)
+ (add-after 'unpack 'fix-guava
+   (lambda _
+ (substitute* "src/java/picard/cmdline/CommandLineParser.java"
+   (("CharMatcher.ASCII") "CharMatcher.ascii()"
  (add-after 'unpack 'use-our-htsjdk
(lambda* (#:key inputs #:allow-other-keys)
  (substitute* "build.xml"
@@ -7362,6 +7366,10 @@ VCF.")
  (delete 'generate-jar-indices)
  (add-after 'unpack 'remove-useless-build.xml
(lambda _ (delete-file "build.xml") #t))
+ (add-after 'unpack 'fix-guava
+   (lambda _
+ (substitute* "src/main/java/picard/cmdline/CommandLineParser.java"
+   (("CharMatcher.ASCII") "CharMatcher.ascii()"
  ;; This is necessary to ensure that htsjdk is found when using
  ;; picard.jar as an executable.
  (add-before 'build 'edit-classpath-in-manifest
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 1d2dfb4d8d..eb7fff47df 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6249,8 +6249,7 @@ used by programmers to guide the static analysis.")
 (define-public java-guava
   (package
 (name "java-guava")
-;; This is the last release of Guava that can be built with Java 7.
-(version "20.0")
+(version "31.1")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -6259,7 +6258,9 @@ used by programmers to guide the static analysis.")
   (file-name (git-file-name name version))
   (sha256
(base32
-"00h5cawdjic1vind3yivzh1f58flvm1yfmhsyqwyvmbvj1vakysp"
+"0sv1w5cnids9ad3l7qhrh3dh1wdqwc946iinsxryafr25wg5z1lp"))
+  (patches
+   (search-patches "java-guava-remove-annotation-deps.patch"
 (build-system ant-build-system)
 (arguments
  `(#:tests? #f  ; no tests included
@@ -6273,27 +6274,26 @@ used by programmers to guide the static analysis.")
;; Remove annotations to avoid extra dependencies:
;; * "j2objc" annotations are used when converting Java to
;;   Objective C;
-   ;; * "errorprone" annotations catch common Java mistakes at
-   ;;   compile time;
;; * "IgnoreJRERequirement" is used for Android.
+   ;; * "Nullable" is used to catch NPE at build time.
(substitute* (find-files "." "\\.java$")
  (("import com.google.j2objc.*") "")
- (("import com.google.errorprone.annotation.*") "")
- (("import org.codehaus.mojo.animal_sniffer.*") "")
- (("@CanIgnoreReturnValue") "")
-

11/18: gnu: Add java-asm-9.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 4ba06146772c0bb68c79c5b176045262ad5aace8
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:36 2023 +0100

gnu: Add java-asm-9.

* gnu/packages/java.scm (java-asm-9): New variable.

Change-Id: Ib54e81dc4d55909541851abca34fabde631c8c55
---
 gnu/packages/java.scm | 24 
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index eb7fff47df..895fab98e8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5106,6 +5106,30 @@ including java-asm.")
#:tests? #f))
 (inputs (list java-asm-8 java-asm-analysis-8 java-asm-tree-8
 
+(define-public java-asm-9
+  (package
+(inherit java-asm)
+(version "9.4")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+ (url "https://gitlab.ow2.org/asm/asm;)
+ (commit (string-append
+   "ASM_" (string-join (string-split version #\.)
+   "_")
+  (file-name (git-file-name "java-asm" version))
+  (sha256
+   (base32
+"0c00m638skr5md1p6y1c2xn11kj5w6sjapyvwp9mh70rw095bwzk"
+(arguments
+ `(#:jar-name "asm9.jar"
+   #:source-dir "asm/src/main/java"
+   #:test-dir "asm/src/test"
+   ;; tests depend on junit5
+   #:tests? #f))
+(propagated-inputs '())
+(native-inputs '(
+
 (define-public java-cglib
   (package
 (name "java-cglib")

14/18: gnu: Add java-asm-analysis-9.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 8318deb5559631b8771bd1799a700906d762386b
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:38 2023 +0100

gnu: Add java-asm-analysis-9.

* gnu/packages/java.scm (java-asm-analysis-9): New variable.

Change-Id: I11d959b9cf3116a0614689ba24dbfd1b746a3b6f
---
 gnu/packages/java.scm | 13 +
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b2e672a8b0..8abf241ee5 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5143,6 +5143,19 @@ including java-asm.")
 (inputs
  (list java-asm-9
 
+(define-public java-asm-analysis-9
+  (package
+(inherit java-asm-9)
+(name "java-asm-analysis")
+(arguments
+ `(#:jar-name "asm-analysis.jar"
+   #:source-dir "asm-analysis/src/main/java"
+   #:test-dir "asm-analysis/src/test"
+   ;; tests depend on junit5
+   #:tests? #f))
+(inputs
+ (list java-asm-9 java-asm-tree-9
+
 (define-public java-cglib
   (package
 (name "java-cglib")

16/18: gnu: Add java-asm-commons-9.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 12c7f5299b4ac61571773e7d2f73b44b7bf114ce
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:40 2023 +0100

gnu: Add java-asm-commons-9.

* gnu/packages/java.scm (java-asm-commons-9): New variable.

Change-Id: Ie289193efd14957d3cbba437cc1a129665c59bfa
---
 gnu/packages/java.scm | 12 
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 357b0c3593..53451e5ed6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5169,6 +5169,18 @@ including java-asm.")
 (inputs
  (list java-asm-9 java-asm-analysis-9 java-asm-tree-9
 
+(define-public java-asm-commons-9
+  (package
+(inherit java-asm-9)
+(name "java-asm-commons")
+(arguments
+ (list #:jar-name "asm-commons8.jar"
+   #:source-dir "asm-commons/src/main/java"
+   #:test-dir "asm-commons/src/test"
+   ;; tests depend on junit5
+   #:tests? #f))
+(inputs (list java-asm-9 java-asm-analysis-9 java-asm-tree-9
+
 (define-public java-cglib
   (package
 (name "java-cglib")

08/18: gnu: Add apache-parent-pom-27.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 5438e1a86a7e88ba2d014a48f37b4d8e6e355ca7
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:32 2023 +0100

gnu: Add apache-parent-pom-27.

* gnu/packages/maven-parent-pom.scm (apache-parent-pom-27): New
  variable.

Change-Id: Ic8ad7747dfa32621532fd7449735bdcd6adefc1e
---
 gnu/packages/maven-parent-pom.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/maven-parent-pom.scm 
b/gnu/packages/maven-parent-pom.scm
index 33d3e73ff6..7fd8f27881 100644
--- a/gnu/packages/maven-parent-pom.scm
+++ b/gnu/packages/maven-parent-pom.scm
@@ -92,6 +92,10 @@
   (make-apache-parent-pom
 "25" "1vwx2fpgk7cn2pnlnx26df26vndiwwn5l7ngakj0vwal5pmp6115"))
 
+(define-public apache-parent-pom-27
+  (make-apache-parent-pom
+"27" "07087qdcwadsg3va5rc9xb7k89im3fm2g297lpmfh1aggn7cpc00"))
+
 (define-public apache-parent-pom-29
   (make-apache-parent-pom
 "29" "0fj078bgzs0r24x66ph5bbwkkc5s9d1qh57hmlpisg4mdi0l48s9"))

13/18: gnu: maven: Update to 3.9.0.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 6a763d916e9d8701152f54447b543dae0a38c86f
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:35 2023 +0100

gnu: maven: Update to 3.9.0.

* gnu/packages/maven.scm (maven-pom): Update to 3.9.0.

Change-Id: If6f9f0adf3065b450d373e0fcc619b79e4a529dc
---
 gnu/packages/maven.scm | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index f96337a17d..67b95a5f7b 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1132,13 +1132,13 @@ gets and puts artifacts through HTTP(S) using Apache 
HttpClient-4.x.")))
 (define maven-pom
   (package
 (name "maven-pom")
-(version "3.8.6")
+(version "3.9.0")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://apache/maven/"
   "maven-3/" version "/source/"
   "apache-maven-" version "-src.tar.gz"))
-  (sha256 (base32 
"0jszmcaxp597a62ajrc478jxix1qmw4pknhiygsbjdy3kccc7gvj"))
+  (sha256 (base32 
"0s8ds2bqkdi2yrcwbd3mkszh6l4hf56j9jz47hkpd7i3zh1hmr4n"))
   (modules '((guix build utils)))
   (snippet
'(begin
@@ -1212,7 +1212,7 @@ gets and puts artifacts through HTTP(S) using Apache 
HttpClient-4.x.")))
  (replace 'install
(install-pom-file "pom.xml")
 (propagated-inputs
- (list maven-parent-pom-35))
+ (list maven-parent-pom-39))
 (home-page "https://maven.apache.org/;)
 (synopsis "Build system")
 (description "Apache Maven is a software project management and 
comprehension
@@ -1830,6 +1830,7 @@ artifactId=maven-core" ,(package-version 
maven-core-bootstrap
#:source-dir "maven-embedder/src/main/java"
#:test-dir "maven-embedder/src/test"
#:test-exclude (list "**/MavenCliTest.java")
+   #:tests? #f; require junit 4.13
#:jdk ,icedtea-8
#:phases
(modify-phases %standard-phases
@@ -1851,9 +1852,9 @@ artifactId=maven-core" ,(package-version 
maven-core-bootstrap
file mode "maven-embedder/src/main/java" version
"false" "true"))
  (let ((file "maven-embedder/src/main/mdo/core-extensions.mdo"))
-   (modello-single-mode file "1.0.0" "java")
-   (modello-single-mode file "1.0.0" "xpp3-reader")
-   (modello-single-mode file "1.0.0" "xpp3-writer"))
+   (modello-single-mode file "1.1.0" "java")
+   (modello-single-mode file "1.1.0" "xpp3-reader")
+   (modello-single-mode file "1.1.0" "xpp3-writer"))
  #t))
  (add-before 'check 'fix-test-paths
(lambda _
@@ -2130,6 +2131,8 @@ logging support.")))
("java-jsr250" ,java-jsr250)
("java-cdi-api" ,java-cdi-api)
("java-junit" ,java-junit)
+   ("java-mockito-1" ,java-mockito-1)
+   ("java-objenesis" ,java-objenesis)
("maven-resolver-impl" ,maven-resolver-impl)
("maven-resolver-connector-basic" ,maven-resolver-connector-basic)
("maven-resolver-transport-wagon" ,maven-resolver-transport-wagon)
@@ -2174,7 +2177,8 @@ layer for plugins that need to keep Maven2 
compatibility.")))
  "maven-settings" "maven-settings-builder" 
"maven-plugin-api"
  "maven-repository-metadata" "maven-shared-utils" 
"maven-resolver-api"
  "maven-resolver-spi" "maven-resolver-util" 
"maven-resolver-impl"
- "maven-resolver-connector-basic" "maven-resolver-provider"
+ "maven-resolver-connector-basic" 
"maven-resolver-named-locks"
+ "maven-resolver-provider"
  "maven-resolver-transport-wagon" "maven-slf4j-provider"
  "maven-wagon-provider-api"
  "maven-wagon-file" "maven-wagon-http" 
"java-commons-logging-minimal"
@@ -2229,6 +2233,7 @@ layer for plugins that need to keep Maven2 
compatibility.")))
maven-resolver-api
maven-resolver-spi
maven-resolver-util
+   maven-resolver-named-locks
maven-resolver-impl
maven-resolver-connector-basic
maven-resolver-provider

07/18: gnu: Add maven-parent-pom-39.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit eec5c0d524fe9ff62e6b42350677f2ddc9b1b151
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:31 2023 +0100

gnu: Add maven-parent-pom-39.

* gnu/packages/maven-parent-pom.scm (maven-parent-pom-39): New variable.

Change-Id: I9a2b203a0d0b4d2fb59d02077df2d607f59d953f
---
 gnu/packages/maven-parent-pom.scm | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/maven-parent-pom.scm 
b/gnu/packages/maven-parent-pom.scm
index 2e3ed22835..33d3e73ff6 100644
--- a/gnu/packages/maven-parent-pom.scm
+++ b/gnu/packages/maven-parent-pom.scm
@@ -447,6 +447,16 @@ other projects as their parent pom.")
 tool.  This package contains the Maven parent POM.")
   (license license:asl2.0
 
+(define-public maven-parent-pom-39
+  (make-maven-parent-pom
+"39" "1123nmm63nrsfy9i35zn12glswc2sy9bsj4fir2z9yh93kraky1y"
+apache-parent-pom-29
+#:replacements
+(delay
+  `(("org.codehaus.plexus"
+ ("plexus-component-annotations" .
+  ,(package-version java-plexus-component-annotations)))
+
 (define-public maven-parent-pom-35
   (make-maven-parent-pom
 "35" "0pg9k7l5pcbghmc89i11g900pbzznvf5sfdfzlqfwpihqb2g8iab"

17/18: gnu: Add java-byte-buddy-dep.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit bb3a631f247ec56bbba6474b0280c16f8a3a9907
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:41 2023 +0100

gnu: Add java-byte-buddy-dep.

* gnu/packages/java.scm (java-byte-buddy-dep): New variable.

Change-Id: I7907fffe783d6edec65d8b0c496b6e16db53c24d
---
 gnu/packages/java.scm | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 53451e5ed6..f4669f8d6d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -11395,6 +11395,48 @@ everything as database, including class objects, text 
format data, data
 streams, etc.")
 (license license:asl2.0)))
 
+(define-public java-byte-buddy-dep
+  (package
+(name "java-byte-buddy-dep")
+(version "1.14.0")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+ (url "https://github.com/raphw/byte-buddy;)
+ (commit (string-append "byte-buddy-" version
+  (file-name (git-file-name name version))
+  (sha256
+   (base32
+"03jmsnkjb9d3z9brqs8fc512hhs5b5iab3a5wbax9zi03dskgvh2"
+(build-system ant-build-system)
+(arguments
+ `(#:jar-name "byte-buddy-dep.jar"
+   #:source-dir "byte-buddy-dep/src/main/java"
+   #:test-dir "byte-buddy-dep/src/test"
+   #:tests? #f; would build java files that are incompatible with current 
jdk
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'build 'remove-annotations
+   (lambda _
+ (with-directory-excursion 
"byte-buddy-dep/src/main/java/net/bytebuddy"
+   (substitute* (find-files "." ".*.java")
+ (("@EqualsAndHashCode.*") "")
+ (("import lombok.EqualsAndHashCode;") "")
+ (("@SuppressFBWarnings.*") "")
+ (("import 
edu.umd.cs.findbugs.annotations.SuppressFBWarnings;") ""))
+   (substitute* '("description/type/TypeDescription.java"
+  "dynamic/loading/ClassInjector.java")
+ (("^  *value = .*") "")
+ (("^  *justification = .*") ""
+(inputs
+  (list java-asm-9 java-asm-commons-9 java-jsr305 java-native-access))
+(home-page "http://bytebuddy.net/;)
+(synopsis "Runtime code generation for the Java virtual machine")
+(description "Byte Buddy is a code generation and manipulation library for
+creating and modifying Java classes during the runtime of a Java application
+and without the help of a compiler.")
+(license license:asl2.0)))
+
 (define-public java-powermock-reflect
   (package
 (name "java-powermock-reflect")

12/18: gnu: Add java-asm-tree-9.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 7634bfca4ad80ecd7944feeb718f6abde3813e15
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:37 2023 +0100

gnu: Add java-asm-tree-9.

* gnu/packages/java.scm (java-asm-tree-9): New variable.

Change-Id: I6fd32ee00de8488ff980bccd079636abe09ea773
---
 gnu/packages/java.scm | 13 +
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 895fab98e8..b2e672a8b0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5130,6 +5130,19 @@ including java-asm.")
 (propagated-inputs '())
 (native-inputs '(
 
+(define-public java-asm-tree-9
+  (package
+(inherit java-asm-9)
+(name "java-asm-tree")
+(arguments
+ `(#:jar-name "asm-tree.jar"
+   #:source-dir "asm-tree/src/main/java"
+   #:test-dir "asm-tree/src/test"
+   ;; tests depend on junit5
+   #:tests? #f))
+(inputs
+ (list java-asm-9
+
 (define-public java-cglib
   (package
 (name "java-cglib")

09/18: gnu: Add maven-parent-pom-37.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 597f7db28a0ef9eb21acf8340820237a368a6b15
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:33 2023 +0100

gnu: Add maven-parent-pom-37.

* gnu/packages/maven-parent-pom.scm (maven-parent-pom-37): New variable.

Change-Id: I572eea2548006929577ba72dfe022ddb22373099
---
 gnu/packages/maven-parent-pom.scm | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/maven-parent-pom.scm 
b/gnu/packages/maven-parent-pom.scm
index 7fd8f27881..60581f520b 100644
--- a/gnu/packages/maven-parent-pom.scm
+++ b/gnu/packages/maven-parent-pom.scm
@@ -461,6 +461,16 @@ tool.  This package contains the Maven parent POM.")
  ("plexus-component-annotations" .
   ,(package-version java-plexus-component-annotations)))
 
+(define-public maven-parent-pom-37
+  (make-maven-parent-pom
+"37" "0c8yham28si4zadpv9v2i61gl3in518jls4nsawfhx42b6x3371j"
+apache-parent-pom-27
+#:replacements
+(delay
+  `(("org.codehaus.plexus"
+ ("plexus-component-annotations" .
+  ,(package-version java-plexus-component-annotations)))
+
 (define-public maven-parent-pom-35
   (make-maven-parent-pom
 "35" "0pg9k7l5pcbghmc89i11g900pbzznvf5sfdfzlqfwpihqb2g8iab"

06/18: gnu: Add apache-parent-pom-29.

2024-04-20 Thread guix-commits 
roptat pushed a commit to branch master
in repository guix.

commit 05b2cfdc621541b64a142edf403b2b6097af8807
Author: Julien Lepiller 
AuthorDate: Sat Feb 25 21:30:30 2023 +0100

gnu: Add apache-parent-pom-29.

* gnu/packages/maven-parent-pom.scm (apache-parent-pom-29): New
  variable.

Change-Id: Ia369e90b4e0c861729dabe8c331baab2b1efe7ce
---
 gnu/packages/maven-parent-pom.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/maven-parent-pom.scm 
b/gnu/packages/maven-parent-pom.scm
index 660790b019..2e3ed22835 100644
--- a/gnu/packages/maven-parent-pom.scm
+++ b/gnu/packages/maven-parent-pom.scm
@@ -92,6 +92,10 @@
   (make-apache-parent-pom
 "25" "1vwx2fpgk7cn2pnlnx26df26vndiwwn5l7ngakj0vwal5pmp6115"))
 
+(define-public apache-parent-pom-29
+  (make-apache-parent-pom
+"29" "0fj078bgzs0r24x66ph5bbwkkc5s9d1qh57hmlpisg4mdi0l48s9"))
+
 (define* (make-apache-commons-parent-pom version hash parent
  #:key (tag-prefix "commons-parent-"))
   (hidden-package

branch master updated: Authorize the PGP key of Zheng Junjie (z572).

2024-04-20 Thread guix-commits 
This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 43a4215cad Authorize the PGP key of Zheng Junjie (z572).
43a4215cad is described below

commit 43a4215cad8c6da357f895569c0cedf5e854cee0
Author: Maxim Cournoyer 
AuthorDate: Sat Apr 20 13:02:37 2024 -0400

Authorize the PGP key of Zheng Junjie (z572).

Welcome aboard!

Voucher: Ludovic Courtès 
Voucher: Christopher Baines 
Voucher: 宋文武 
Change-Id: Id24cca4940f31468fda7c5d33cc3bef6854a66cd
---
 .guix-authorizations | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.guix-authorizations b/.guix-authorizations
index 0622098bff..8430a2b792 100644
--- a/.guix-authorizations
+++ b/.guix-authorizations
@@ -105,5 +105,7 @@
   (;; primary: "C955 CC5D C048 7FB1 7966  40A9 199A F6A3 67E9 4ABB"
"7238 7123 8EAC EB63 4548  5857 167F 8EA5 001A FA9C"
(name "wigust"))
+  ("7EBE A494 60CE 5E2C 0875  7FDB 3B5A A993 E1A2 DFF0"
+   (name "z572"))
   ("705A 29B7 01EE 410E B6F9  236E 92F1 D22C 608E E7E5"
(name "zimoun"

branch keyring updated: Add the key of Zheng Junjie (z572).

2024-04-20 Thread guix-commits 
This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch keyring
in repository guix.

The following commit(s) were added to refs/heads/keyring by this push:
 new fbccd14b5b Add the key of Zheng Junjie (z572).
fbccd14b5b is described below

commit fbccd14b5b4c51a95b99bc623bbcfc822d9c016b
Author: Maxim Cournoyer 
AuthorDate: Sat Apr 20 12:58:08 2024 -0400

Add the key of Zheng Junjie (z572).

Change-Id: If25b3c572fefd93fb9020fc587683cc0a62fd585
---
 z572-7EBEA494.key | 64 +++
 1 file changed, 64 insertions(+)

diff --git a/z572-7EBEA494.key b/z572-7EBEA494.key
new file mode 100644
index 00..784c42f3ac
--- /dev/null
+++ b/z572-7EBEA494.key
@@ -0,0 +1,64 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+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
+yhZIsifB12dtWFIcPTEynfb7XLq7nVr6Ni4FUA==
+=zD7D
+-END PGP PUBLIC KEY BLOCK-