From 7504f3c3d3a2fbd0f901757a9bd3175e424c11ca Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sat, 23 Jun 2018 11:48:18 +0200
Subject: gnu: maven: Propagate mvn script requirements.

* gnu/packages/maven.scm (maven)[propagated-inputs]: Add coreutils and
which.
---
 gnu/packages/maven.scm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gnu/packages/maven.scm')

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 0feb01f040..3b24fd7e80 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -23,6 +23,7 @@ (define-module (gnu packages maven)
   #:use-module (guix utils)
   #:use-module (guix build-system ant)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages java)
   #:use-module (gnu packages web)
@@ -1502,6 +1503,9 @@ (define-public maven
        ("java-slf4j-api" ,java-slf4j-api)
        ;; TODO: replace with maven-slf4j-provider
        ("java-slf4j-simple" ,java-slf4j-simple)))
+    (propagated-inputs
+     `(("coreutils" ,coreutils)
+       ("which" ,which)))
     (description "Apache Maven is a software project management and comprehension
 tool.  Based on the concept of a project object model: builds, dependency
 management, documentation creation, site publication, and distribution
-- 
cgit v1.2.3


From e27c43d94e23daf6b114b03688a51c924890a286 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sat, 23 Jun 2018 12:16:55 +0200
Subject: gnu: maven-core: Fill properties.

* gnu/packages/maven.scm (maven-core-bootstrap)[arguments]: Add a
fill-properties phase.
---
 gnu/packages/maven.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'gnu/packages/maven.scm')

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 3b24fd7e80..f63fcee6b2 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1080,6 +1080,18 @@ (define maven-core-bootstrap
              (mkdir-p "build/classes/")
              (copy-recursively "src/main/resources" "build/classes")
              #t))
+         (add-after 'copy-resources 'fill-properties
+           (lambda _
+             ;; This file controls the output of some mvn subcommands, such as
+             ;; mvn -version.
+             (substitute* "build/classes/org/apache/maven/messages/build.properties"
+               (("\\$\\{buildNumber\\}") "guix_build")
+               (("\\$\\{timestamp\\}") "0")
+               (("\\$\\{project.version\\}") ,(package-version maven-artifact))
+               (("\\$\\{distributionId\\}") "apache-maven")
+               (("\\$\\{distributionShortName\\}") "Maven")
+               (("\\$\\{distributionName\\}") "Apache Maven"))
+             #t))
          (add-before 'build 'generate-sisu-named
            (lambda _
              (mkdir-p "build/classes/META-INF/sisu")
-- 
cgit v1.2.3