diff mbox series

[bug#66879,v2,5/5] gnu: josm: Update to 18822.

Message ID ba45d579f719950e3a5f9fb62ac9d4dd1f41e4e2.1698907813.git.julien@lepiller.eu
State New
Headers show
Series [bug#66879,v2,1/5] gnu: openjdk9: Install default certificates. | expand

Commit Message

Julien Lepiller Nov. 2, 2023, 6:50 a.m. UTC 
* gnu/packages/geo.scm (josm): Update to 18822.
[inputs]: Use new json implementation.
[arguments]: Use openjdk11 to prevent warning at startup.

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

Comments

Andreas Enge Nov. 2, 2023, 10 a.m. UTC | #1 
Am Thu, Nov 02, 2023 at 07:50:13AM +0100 schrieb Julien Lepiller:
> * gnu/packages/geo.scm (josm): Update to 18822.
> [inputs]: Use new json implementation.
> [arguments]: Use openjdk11 to prevent warning at startup.

Looks good!

Andreas
Julien Lepiller Nov. 9, 2023, 6:10 p.m. UTC | #2 
Le Thu, 2 Nov 2023 11:00:16 +0100,
Andreas Enge <andreas@enge.fr> a écrit :

> Am Thu, Nov 02, 2023 at 07:50:13AM +0100 schrieb Julien Lepiller:
> > * gnu/packages/geo.scm (josm): Update to 18822.
> > [inputs]: Use new json implementation.
> > [arguments]: Use openjdk11 to prevent warning at startup.  
> 
> Looks good!
> 
> Andreas
> 

Pushed to master as 5392d9db46d6f931233be2f25688481181622bb4 to
71d54f3ac451527d3c741bc1209f6b03329f8571.
diff mbox series

Patch

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index a33d446201..dbc8440141 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1940,7 +1940,7 @@  (define-public java-opening-hours-parser
 (define-public josm
   (package
     (name "josm")
-    (version "18646")
+    (version "18822")
     (source (origin
               (method svn-fetch)
               (uri (svn-reference
@@ -1949,7 +1949,7 @@  (define-public josm
                      (recursive? #f)))
               (sha256
                (base32
-                "0zr3p1i39wi0f29lgb3xrnv6lijrq5ia8jxn4wnq1yz0xdlbg98i"))
+                "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b"))
               (file-name (string-append name "-" version "-checkout"))
               (modules '((guix build utils)))
             (snippet
@@ -1963,17 +1963,18 @@  (define-public josm
      (list java-commons-jcs
            java-commons-compress
            java-jmapviewer
-           java-jsonp-api
-           java-jsonp-impl ; runtime dependency
+           java-jakarta-json
            java-jsr305
            java-metadata-extractor
            java-opening-hours-parser
            java-openjfx-media
+           java-parsson ; runtime dependency
            java-signpost-core
            java-svg-salamander))
     (arguments
      `(#:tests? #f
        #:jar-name "josm.jar"
+       #:jdk ,openjdk11
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'rm-build.xml