[bug#64466] [PATCH 0/7] Fix maven package breakage.

[bug#64466] [PATCH 0/7] Fix maven package breakage.

[Bruno Victal]

This patch-series fixes some maven build failures (in particular
maven-settings-builder@3.0).

Since sisu.sh and component.sh files are created by guix, the
substitute approaches in #63094 and #64026 are unnecessary and have
been reverted. Regarding #63145, it partially obsoletes some of the
patches and will require a rebase.

[1]: <https://issues.guix.gnu.org/63094>
[2]: <https://issues.guix.gnu.org/63145>
[3]: <https://issues.guix.gnu.org/64026>

Bruno Victal (7):
  gnu: maven-pom: Add missing shebangs.
  Revert "gnu: maven-embedder: Fix build."
  Revert "gnu: maven-core-bootstrap: Fix build."
  Revert "gnu: maven-resolver-provider: Fix build."
  Revert "gnu: maven-model-builder: Fix build."
  Revert "gnu: maven-settings-builder: Fix build."
  Revert "gnu: maven-model-builder@3.0: Fix build."

 gnu/packages/maven.scm                        | 25 -------------------
 .../maven-generate-component-xml.patch        |  3 ++-
 .../maven-generate-javax-inject-named.patch   |  3 ++-
 3 files changed, 4 insertions(+), 27 deletions(-)


base-commit: 3b630604d1f6325444509b5badd6cee15b3ce1b4
-- 
2.40.1

[bug#64466] [PATCH 1/7] gnu: maven-pom: Add missing shebangs.

[Bruno Victal]

* gnu/packages/patches/maven-generate-component-xml.patch: Add missing shebang.
* gnu/packages/patches/maven-generate-javax-inject-named.patch: Likewise.
---
 gnu/packages/patches/maven-generate-component-xml.patch      | 3 ++-
 gnu/packages/patches/maven-generate-javax-inject-named.patch | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/patches/maven-generate-component-xml.patch b/gnu/packages/patches/maven-generate-component-xml.patch
index 6cb23c7858..289556fbef 100644
--- a/gnu/packages/patches/maven-generate-component-xml.patch
+++ b/gnu/packages/patches/maven-generate-component-xml.patch
@@ -17,7 +17,8 @@ new file mode 100755
 index 0000000..c6748bd
 --- /dev/null
 +++ b/components.sh
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,149 @@
++#!/bin/sh
 +## This script generates a rough plexus/components.xml file. It is meant to
 +## replace plexus-component-metadata as it eventually has a recursive dependency
 +## on itself.
diff --git a/gnu/packages/patches/maven-generate-javax-inject-named.patch b/gnu/packages/patches/maven-generate-javax-inject-named.patch
index b8eba5ab90..38c4565e81 100644
--- a/gnu/packages/patches/maven-generate-javax-inject-named.patch
+++ b/gnu/packages/patches/maven-generate-javax-inject-named.patch
@@ -13,7 +13,8 @@ new file mode 100755
 index 0000000..979f373
 --- /dev/null
 +++ b/sisu.sh
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,13 @@
++#!/bin/sh
 +## This script generates a rough javax.inject.Named file. It is meant to
 +## replace sisu-maven-plugin as it eventually has a recursive dependency
 +## on maven.

base-commit: 3b630604d1f6325444509b5badd6cee15b3ce1b4
-- 
2.40.1

[bug#64466] [PATCH 2/7] Revert "gnu: maven-embedder: Fix build."

[Bruno Victal]

This reverts commit 87ba11eff1b7a1784c94c897d468ba28822b0609.
---
 gnu/packages/maven.scm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index dc25f7640e..c8767d423e 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -4,7 +4,6 @@
 ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
-;;; Copyright © 2023 Aleksandr Vityazev <avityazew@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1839,10 +1838,6 @@ (define-public maven-embedder
        #:jdk ,icedtea-8
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'add-sisu-shebang
-           (lambda _
-             (substitute* "sisu.sh"
-               (("^## T") "#!/bin/sh\n## T"))))
          (add-before 'build 'generate-sisu-named
            (lambda _
              (mkdir-p "build/classes/META-INF/sisu")
-- 
2.40.1

[bug#64466] [PATCH 3/7] Revert "gnu: maven-core-bootstrap: Fix build."

[Bruno Victal]

This reverts commit 1a93ff9a8b0c64ccb0e365f4e5c199e0ac8b9de6.
---
 gnu/packages/maven.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index c8767d423e..053884d901 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1603,10 +1603,6 @@ (define-public maven-core-bootstrap
          #:tests? #f
          #:phases
          (modify-phases %standard-phases
-           (add-after 'unpack 'add-sisu-shebang
-             (lambda _
-               (substitute* "sisu.sh"
-                 (("^## T") "#!/bin/sh\n## T"))))
            (add-before 'configure 'chdir
              (lambda _
                ;; Required for generating components.xml in maven-core
-- 
2.40.1

[bug#64466] [PATCH 4/7] Revert "gnu: maven-resolver-provider: Fix build."

[Bruno Victal]

This reverts commit 3d2ce30f6b4b505c9680369d118c2aa9f7bacff4.
---
 gnu/packages/maven.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 053884d901..e6cb02c744 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1509,10 +1509,6 @@ (define-public maven-resolver-provider
        #:tests? #f; dependency loop on maven-core (@Component RepositorySystem)
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'add-sisu-shebang
-           (lambda _
-             (substitute* "sisu.sh"
-               (("^## T") "#!/bin/sh\n## T"))))
          (add-before 'build 'generate-sisu-named
            (lambda _
              (mkdir-p "build/classes/META-INF/sisu")
-- 
2.40.1

[bug#64466] [PATCH 5/7] Revert "gnu: maven-model-builder: Fix build."

[Bruno Victal]

This reverts commit 04f9ac0cfaf86f9e590e0fdc62855d9c87245104.
---
 gnu/packages/maven.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index e6cb02c744..5bbf37377f 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1410,10 +1410,6 @@ (define-public maven-model-builder
              (copy-recursively "src/main/resources"
                                "build/classes")
              #t))
-         (add-after 'unpack 'add-sisu-shebang
-           (lambda _
-             (substitute* "sisu.sh"
-               (("^## T") "#!/bin/sh\n## T"))))
          (add-before 'build 'generate-sisu-named
            (lambda _
              (mkdir-p "build/classes/META-INF/sisu")
-- 
2.40.1

[bug#64466] [PATCH 6/7] Revert "gnu: maven-settings-builder: Fix build."

[Bruno Victal]

This reverts commit c0a0cec87ff01ba3ee6f9baaafdb92b7ecc94489.
---
 gnu/packages/maven.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 5bbf37377f..1a5962df36 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1365,10 +1365,6 @@ (define-public maven-settings-builder
        #:test-dir "maven-settings-builder/src/test"
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'add-sisu-shebang
-           (lambda _
-             (substitute* "sisu.sh"
-               (("^## T") "#!/bin/sh\n## T"))))
          (add-before 'build 'generate-sisu-named
            (lambda _
              (mkdir-p "build/classes/META-INF/sisu")
-- 
2.40.1

[bug#64466] [PATCH 7/7] Revert "gnu: maven-model-builder@3.0: Fix build."

[Bruno Victal]

This reverts commit d54faf155aeeeb2aceb5cc19f141c2b8d0e0720a.
---
 gnu/packages/maven.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 1a5962df36..fc3a63c263 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -2403,10 +2403,6 @@ (define-public maven-3.0-model-builder
       (substitute-keyword-arguments (package-arguments maven-model-builder)
         ((#:phases phases)
          `(modify-phases ,phases
-            (add-after 'unpack 'add-components-shebang
-              (lambda _
-                (substitute* "components.sh"
-                  (("^## T") "#!/bin/sh\n## T"))))
             (add-before 'build 'generate-components.xml
               (lambda _
                 (mkdir-p "build/classes/META-INF/plexus")
-- 
2.40.1

bug#64466: [PATCH 0/7] Fix maven package breakage.

[Liliana Marie Prikler]

Am Dienstag, dem 04.07.2023 um 20:57 +0100 schrieb Bruno Victal:
> This patch-series fixes some maven build failures (in particular
> maven-settings-builder@3.0).
> 
> Since sisu.sh and component.sh files are created by guix, the
> substitute approaches in #63094 and #64026 are unnecessary and have
> been reverted. Regarding #63145, it partially obsoletes some of the
> patches and will require a rebase.
> 
> [1]: <https://issues.guix.gnu.org/63094>
> [2]: <https://issues.guix.gnu.org/63145>
> [3]: <https://issues.guix.gnu.org/64026>
> 
> Bruno Victal (7):
>   gnu: maven-pom: Add missing shebangs.
>   Revert "gnu: maven-embedder: Fix build."
>   Revert "gnu: maven-core-bootstrap: Fix build."
>   Revert "gnu: maven-resolver-provider: Fix build."
>   Revert "gnu: maven-model-builder: Fix build."
>   Revert "gnu: maven-settings-builder: Fix build."
>   Revert "gnu: maven-model-builder@3.0: Fix build."
Pushed, as it seems to unbreak packages on CI, at least on x86-64.  For
other arches, I'm not sure what is going on, but since the change is
"Unknown", I guess it's some timeout elsewhere.

Cheers