[bug#30606] maven resolver packages

[bug#30606] maven resolver packages

[Julien Lepiller]

Hi,

here are the first few packages needed by maven. I created a new
maven.scm file for them.

[bug#30606] [PATCH 1/5] gnu: Add maven-resolver-api.

[Julien Lepiller]

* gnu/packages/maven.scm: New file.
(maven-resolver-api): New variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk           |  1 +
 gnu/packages/maven.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 gnu/packages/maven.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 2f8f7b7e3..978947843 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -279,6 +279,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/marst.scm			\
   %D%/packages/mate.scm             \
   %D%/packages/maths.scm			\
+  %D%/packages/maven.scm			\
   %D%/packages/mc.scm				\
   %D%/packages/mcrypt.scm			\
   %D%/packages/medical.scm			\
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
new file mode 100644
index 000000000..7fcc7b453
--- /dev/null
+++ b/gnu/packages/maven.scm
@@ -0,0 +1,50 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages maven)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system ant)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages java))
+
+(define-public maven-resolver-api
+  (package
+    (name "maven-resolver-api")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/apache/maven-resolver/"
+                                  "archive/maven-resolver-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rpvdg3qr1j88gw0ankf0wnwfyq6238mdlm7s39vf5jrcvhdgwcl"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "maven-resolver-api.jar"
+       #:source-dir "maven-resolver-api/src/main/java"
+       #:test-dir "maven-resolver-api/src/test"))
+    (native-inputs
+     `(("java-junit" ,java-junit)
+       ("java-hamcrest-core" ,java-hamcrest-core)))
+    (home-page "https://github.com/apache/maven-resolver")
+    (synopsis "Maven repository system API")
+    (description "This package contains the API for the maven repository system.")
+    (license license:asl2.0)))
-- 
2.16.2

[bug#30606] [PATCH 2/5] gnu: Add maven-resolver-spi.

[Julien Lepiller]

* gnu/packages/maven.scm (maven-resolver-spi): New variable.
---
 gnu/packages/maven.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 7fcc7b453..8fa7ecc5b 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -48,3 +48,18 @@
     (synopsis "Maven repository system API")
     (description "This package contains the API for the maven repository system.")
     (license license:asl2.0)))
+
+(define-public maven-resolver-spi
+  (package
+    (inherit maven-resolver-api)
+    (name "maven-resolver-spi")
+    (arguments
+     `(#:jar-name "maven-resolver-spi.jar"
+       #:source-dir "maven-resolver-spi/src/main/java"
+       #:test-dir "maven-resolver-spi/src/test"
+       #:jdk ,icedtea-8))
+    (inputs
+     `(("maven-resolver-api" ,maven-resolver-api)))
+    (synopsis "Maven repository system SPI")
+    (description "This package contains the service provider interface (SPI)
+for repository system implementations and repository connectors.")))
-- 
2.16.2

[bug#30606] [PATCH 3/5] gnu: Add maven-resolver-test-util.

[Julien Lepiller]

* gnu/packages/maven.scm (maven-resolver-test-util): New variable.
---
 gnu/packages/maven.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 8fa7ecc5b..8cc493806 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -63,3 +63,19 @@
     (synopsis "Maven repository system SPI")
     (description "This package contains the service provider interface (SPI)
 for repository system implementations and repository connectors.")))
+
+(define-public maven-resolver-test-util
+  (package
+    (inherit maven-resolver-api)
+    (name "maven-resolver-test-util")
+    (arguments
+     `(#:jar-name "maven-resolver-test-util.jar"
+       #:source-dir "maven-resolver-test-util/src/main/java"
+       #:test-dir "maven-resolver-test-util/src/test"
+       #:jdk ,icedtea-8))
+    (inputs
+     `(("maven-resolver-api" ,maven-resolver-api)
+       ("maven-resolver-spi" ,maven-resolver-spi)))
+    (synopsis "Utility classes for testing the maven repository system")
+    (description "This package contains a collection of utility classes to
+ease testing of the repository system.")))
-- 
2.16.2

[bug#30606] [PATCH 4/5] gnu: Add maven-resolver-util.

[Julien Lepiller]

gnu/packages/maven.scm (maven-resolver-util): New variable.
---
 gnu/packages/maven.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 8cc493806..6c8f4b931 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -79,3 +79,22 @@ for repository system implementations and repository connectors.")))
     (synopsis "Utility classes for testing the maven repository system")
     (description "This package contains a collection of utility classes to
 ease testing of the repository system.")))
+
+(define-public maven-resolver-util
+  (package
+    (inherit maven-resolver-api)
+    (name "maven-resolver-util")
+    (arguments
+     `(#:jar-name "maven-resolver-util.jar"
+       #:source-dir "maven-resolver-util/src/main/java"
+       #:test-dir "maven-resolver-util/src/test"
+       #:jdk ,icedtea-8))
+    (inputs
+     `(("maven-resolver-api" ,maven-resolver-api)))
+    (native-inputs
+     `(("java-junit" ,java-junit)
+       ("java-hamcrest-core" ,java-hamcrest-core)
+       ("maven-resolver-test-util" ,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.")))
-- 
2.16.2

[bug#30606] [PATCH 5/5] gnu: Add maven-resolver-connector-basic.

[Julien Lepiller]

* gnu/packages/maven.scm (maven-resolver-connector-basic): New variable.
---
 gnu/packages/maven.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 6c8f4b931..81021f646 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -98,3 +98,33 @@ ease testing of the repository system.")))
     (synopsis "Utility classes for the maven repository system")
     (description "This package contains a collection of utility classes to
 ease usage of the repository system.")))
+
+(define-public maven-resolver-connector-basic
+  (package
+    (inherit maven-resolver-api)
+    (name "maven-resolver-connector-basic")
+    (arguments
+     `(#:jar-name "maven-resolver-connector-basic.jar"
+       #:source-dir "maven-resolver-connector-basic/src/main/java"
+       #:test-dir "maven-resolver-connector-basic/src/test"
+       #:jdk ,icedtea-8
+       #: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.connector.basic.BasicRepositoryConnectorFactory\n"))))))))
+    (inputs
+     `(("maven-resolver-api" ,maven-resolver-api)
+       ("maven-resolver-spi" ,maven-resolver-spi)
+       ("maven-resolver-util" ,maven-resolver-util)
+       ("java-javax-inject" ,java-javax-inject)))
+    (native-inputs
+     `(("java-junit" ,java-junit)
+       ("java-hamcrest-core" ,java-hamcrest-core)
+       ("maven-resolver-test-util" ,maven-resolver-test-util)))
+    (synopsis "Maven repository connector implementation")
+    (description "This package contains a repository connector implementation
+for repositories using URI-based layouts.")))
-- 
2.16.2

[bug#30606] maven resolver packages

[Björn Höfling]

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

Hi Julien,

sorry I was slower reviewing than you commiting this one.

On Sun, 25 Feb 2018 16:48:22 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> Hi,
> 
> here are the first few packages needed by maven. I created a new
> maven.scm file for them.


All 5 look good, besides maybe this remark:

These packages are used to bootstrap Maven. Once we have Maven and a
maven-build-system, we eventually want to rebuild them with Maven and
have them in some (to be defined) Guix-Maven-Layout, for example with
pom.xml included and in the usual .m2/repository directory-structure.

Should we thus rename them to maven-*-bootstrap and just (define them
instead of (define-public?

Björn


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[bug#30606] maven resolver packages

[julien lepiller]

Le 2018-03-14 07:36, Björn Höfling a écrit :
> Hi Julien,
> 
> sorry I was slower reviewing than you commiting this one.
> 
> On Sun, 25 Feb 2018 16:48:22 +0100
> Julien Lepiller <julien@lepiller.eu> wrote:
> 
>> Hi,
>> 
>> here are the first few packages needed by maven. I created a new
>> maven.scm file for them.
> 
> 
> All 5 look good, besides maybe this remark:
> 
> These packages are used to bootstrap Maven. Once we have Maven and a
> maven-build-system, we eventually want to rebuild them with Maven and
> have them in some (to be defined) Guix-Maven-Layout, for example with
> pom.xml included and in the usual .m2/repository directory-structure.
> 
> Should we thus rename them to maven-*-bootstrap and just (define them
> instead of (define-public?
> 
> Björn

Hi Björn,

I think it's OK to leave them as is for now but I don't really have any
objection to your suggestion, so I'll add it to my TODO list and push a
patch before the next series. I'm trying to improve the rest of my
packages so it may take some time.

Thank you!

bug#30606: maven resolver packages

[Björn Höfling]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

On Wed, 14 Mar 2018 14:15:16 +0100
julien lepiller <julien@lepiller.eu> wrote:

> Hi Björn,
> 
> I think it's OK to leave them as is for now but I don't really have
> any objection to your suggestion, so I'll add it to my TODO list and
> push a patch before the next series. I'm trying to improve the rest
> of my packages so it may take some time.
> 
> Thank you!

OK, fine. I'm closing this patch-set, as it is already pushed.

BTW, I liked the size of the patch-set, it was small enough to not get
confused.

If I can help you out with anything, just tell me.

Björn


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]