[bug#67995] [PATCH] gnu: josm: Update to 18907.

[bug#67995] [PATCH] gnu: josm: Update to 18907.

[Julien Lepiller]

Hi, this short series updates josm to its latest version, adding a new
dependency.

[bug#67995] [PATCH 1/2] gnu: Add java-jakarta-annotations-api.

[Julien Lepiller]

* gnu/packages/java.scm (java-jakarta-annotations-api): New variable.

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

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d73550c042..e2c2a041a9 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -13719,6 +13719,34 @@ (define-public java-parsson
     ;; with classpath exception
     (license license:epl2.0)))
 
+(define-public java-jakarta-annotations-api
+  (package
+    (name "java-jakarta-annotations-api")
+    (version "2.1.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/jakartaee/common-annotations-api")
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0xq2n2pijal5p75vl9dz10i6hhdmaxw5q8j3aza717xkpxxby9p6"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "jakarta-annotations-api.jar"
+       #:source-dir "api/src/main/java"
+       #:tests? #f; no tests
+       #:jdk ,openjdk11))
+    (home-page "https://github.com/jakartaee/common-annotations-api")
+    (synopsis "Collection of Java annotations")
+    (description "Jakarta Annotations defines a collection of annotations
+representing common semantic concepts that enable a declarative style of
+programming that applies across a variety of Java technologies.")
+    ;; with classpath exception
+    (license (list license:epl2.0
+                   license:gpl2))))
+
 (define-public java-xmp
   (package
     (name "java-xmp")

base-commit: d5298c5e334e56a9aabddcb62d312e63135864f6
-- 
2.41.0

[bug#67995] [PATCH 2/2] gnu. josm. Update to 18907.

[Julien Lepiller]

* gnu/packages/geo.scm (josm): Update to 18907.

Change-Id: Ica61eabb49489bc5716b2b0bd029bbffcb7f84d3
---
 gnu/packages/geo.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 746b22a082..2e61a169ed 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 "18822")
+    (version "18907")
     (source (origin
               (method svn-fetch)
               (uri (svn-reference
@@ -1949,7 +1949,7 @@ (define-public josm
                      (recursive? #f)))
               (sha256
                (base32
-                "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b"))
+                "0vkczijw537f4y1b7hfxa45k3ww6nf2cf485b19dnbgh9ab6mnjl"))
               (file-name (string-append name "-" version "-checkout"))
               (modules '((guix build utils)))
             (snippet
@@ -1963,6 +1963,7 @@ (define-public josm
      (list java-commons-jcs
            java-commons-compress
            java-jmapviewer
+           java-jakarta-annotations-api
            java-jakarta-json
            java-jsr305
            java-metadata-extractor
-- 
2.41.0

bug#67995: [PATCH 2/2] gnu. josm. Update to 18907.

[Julien Lepiller]

Pusehd to master as 8ba7a4a042cf04923ca1c686980efc170e9db086 and
9bfb7db8f66a62005bb76bef27273fc7101f9b52, thanks!