* [bug#58553] [PATCH] gnu: josm: Update to 18570. @ 2022-10-15 21:36 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller 0 siblings, 2 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:36 UTC (permalink / raw) To: 58553 Hi Guix! This small series updates a few dependencies of JOSM and updates it to the latest version. ^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 1/7] gnu: Add java-brotli. 2022-10-15 21:36 [bug#58553] [PATCH] gnu: josm: Update to 18570 Julien Lepiller @ 2022-10-15 21:39 ` Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 2/7] gnu: Add java-zstd Julien Lepiller ` (5 more replies) 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller 1 sibling, 6 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:39 UTC (permalink / raw) To: 58553 * gnu/packages/compression.scm (java-brotli): New variable. --- gnu/packages/compression.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 684979018c..8d47913713 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -58,6 +58,7 @@ (define-module (gnu packages compression) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system ant) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -81,6 +82,7 @@ (define-module (gnu packages compression) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages java) #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -2239,6 +2241,19 @@ (define-public python-brotli (define-public python-google-brotli (deprecated-package "python-google-brotli" python-brotli)) +(define-public java-brotli + (package + (inherit brotli) + (name "java-brotli") + (build-system ant-build-system) + (arguments + `(#:jar-name "java-brotli.jar" + #:source-dir "java" + ;; Tests are mixed in with java sources, the ant build system + ;; doesn't allow that + #:tests? #f)) + (native-inputs (list java-junit)))) + (define-public ucl (package (name "ucl") -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 2/7] gnu: Add java-zstd. 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller @ 2022-10-15 21:39 ` Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 3/7] gnu: Add java-asm-3 Julien Lepiller ` (4 subsequent siblings) 5 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:39 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-zstd): New variable. --- gnu/packages/java-compression.scm | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 32d04a2fa6..74bf335fcc 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -322,3 +322,43 @@ (define-public java-xz (description "Tukaani-xz is an implementation of xz compression/decompression algorithms in Java.") (license license:public-domain))) + +(define-public java-zstd + (package + (name "java-zstd") + (version "1.5.2-3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/luben/zstd-jni") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z26z04sc4j6k0g4gvq4xc86mc4wiyp1j7z5hh6wpqgmy9b6h2zb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-zstd.jar" + #:source-dir "src/main/java" + #:tests? #f; Require scala + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-version + (lambda _ + (with-output-to-file "src/main/java/com/github/luben/zstd/util/ZstdVersion.java" + (lambda _ + (format #t "package com.github.luben.zstd.util; + +public class ZstdVersion { + public static final String VERSION = \"~a\"; +}" ,version)))))))) + (inputs + `(("zstd" ,zstd))) + (home-page "https://github.com/luben/zstd-jni") + (synopsis "JNI bindings for Zstd native library") + (description "Zstd, short for Zstandard, is a lossless compression +algorithm, which provides both good compression ratio and speed for standard +compression needs. This package provides JNI bindings for Zstd native +library that provides fast and high compression lossless algorithm for +Android, Java and all JVM languages.") + (license license:bsd-2))) -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 3/7] gnu: Add java-asm-3. 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 2/7] gnu: Add java-zstd Julien Lepiller @ 2022-10-15 21:39 ` Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 4/7] gnu: java-commons-compress: Update to 1.21 Julien Lepiller ` (3 subsequent siblings) 5 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:39 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-asm): New variable. --- gnu/packages/java.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3ab324cce9..a433281ce3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5296,6 +5296,29 @@ (define java-asm-bootstrap ((#:tests? _) #f))) (native-inputs `()))) +(define-public java-asm-3 + (package + (inherit java-asm) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.ow2.org/asm/asm") + (commit "ASM_3_1"))) + (file-name (git-file-name "java-asm" version)) + (sha256 + (base32 + "0xbyf2sl8j6mrvfpg2da0vjdp906rac62l66gkk82x5cn3vc30h4")))) + (arguments + `(#:build-target "jar" + #:test-target "test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-jars "output/dist")) + (delete 'generate-jar-indices)))) + (native-inputs + `(("java-junit" ,java-junit))))) + (define-public java-asm-8 (package (inherit java-asm) @@ -6778,6 +6801,7 @@ (define-public java-commons-compress (build-system ant-build-system) (arguments `(#:jar-name "commons-compress.jar" + #:source-dir "src/main/java" #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bad-tests @@ -6798,7 +6822,7 @@ (define-public java-commons-compress #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-xz apache-commons-parent-pom-41)) + (list java-asm-3 java-brotli java-xz java-zstd apache-commons-parent-pom-52)) (native-inputs (list java-junit java-mockito-1)) (home-page "https://commons.apache.org/proper/commons-compress/") -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 4/7] gnu: java-commons-compress: Update to 1.21. 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 2/7] gnu: Add java-zstd Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 3/7] gnu: Add java-asm-3 Julien Lepiller @ 2022-10-15 21:39 ` Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 5/7] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller ` (2 subsequent siblings) 5 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:39 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-commons-compress): Update to 1.21. (java-osgi-annotation, java-osgi-core): Create pom file and install from it. * gnu/packages/maven.scm (java-surefire-parent-pom): Fix pom fixing. --- gnu/packages/java.scm | 44 ++++++++++++++++++++---------------------- gnu/packages/maven.scm | 3 +-- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a433281ce3..236a910ece 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6790,41 +6790,29 @@ (define-public java-jsch (define-public java-commons-compress (package (name "java-commons-compress") - (version "1.13") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/compress/source/" "commons-compress-" version "-src.tar.gz")) (sha256 (base32 - "1vjqvavrn0babffn1kciz6v52ibwq2vwhzlb95hazis3lgllnxc8")))) + "1rkpb6xcyly1wnbx4q6iq6p5hrr0h1d0ppb5r07psc75cbmizjry")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-compress.jar" #:source-dir "src/main/java" + #:tests? #f; requires java-mockito-3 #:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-bad-tests - (lambda _ - (with-directory-excursion "src/test/java/org/apache/commons/compress/" - ;; FIXME: These tests really should not fail. Maybe they are - ;; indicative of problems with our Java packaging work. - - ;; This test fails with a null pointer exception. - (delete-file "archivers/sevenz/SevenZOutputFileTest.java") - ;; This test fails to open test resources. - (delete-file "archivers/zip/ExplodeSupportTest.java") - - ;; FIXME: This test adds a dependency on powermock, which is hard to - ;; package at this point. - ;; https://github.com/powermock/powermock - (delete-file "archivers/sevenz/SevenZNativeHeapTest.java")) - #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-asm-3 java-brotli java-xz java-zstd apache-commons-parent-pom-52)) - (native-inputs - (list java-junit java-mockito-1)) + (list java-asm-3 + java-brotli + java-osgi-core + java-xz + java-zstd + apache-commons-parent-pom-52)) (home-page "https://commons.apache.org/proper/commons-compress/") (synopsis "Java library for working with compressed files") (description "The Apache Commons Compress library defines an API for @@ -6886,7 +6874,12 @@ (define-public java-osgi-annotation (build-system ant-build-system) (arguments `(#:tests? #f ; no tests - #:jar-name "osgi-annotation.jar")) + #:jar-name "osgi-annotation.jar" + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (generate-pom.xml "pom.xml" "osgi" "osgi-annotation" ,version)) + (replace 'install (install-from-pom "pom.xml"))))) (home-page "https://www.osgi.org") (synopsis "Annotation module of OSGi framework") (description @@ -6911,7 +6904,12 @@ (define-public java-osgi-core (build-system ant-build-system) (arguments `(#:tests? #f ; no tests - #:jar-name "osgi-core.jar")) + #:jar-name "osgi-core.jar" + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (generate-pom.xml "pom.xml" "org.osgi" "org.osgi.core" ,version)) + (replace 'install (install-from-pom "pom.xml"))))) (inputs (list java-osgi-annotation)) (home-page "https://www.osgi.org") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index b7794c4e89..d3e5677669 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3462,8 +3462,7 @@ (define-public java-surefire-parent-pom (add-before 'install 'fix-pom-dependency-versions (lambda _ (substitute* "pom.xml" - (("1.11") ,(package-version java-commons-compress)) - (("1.13") ,(package-version java-commons-codec))) + (("1.11") ,(package-version java-commons-codec))) (substitute* "pom.xml" (("commonsLang3Version>.*") (string-append -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 5/7] gnu: java-opening-hours-parser: Update to 0.27.0. 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller ` (2 preceding siblings ...) 2022-10-15 21:39 ` [bug#58553] [PATCH 4/7] gnu: java-commons-compress: Update to 1.21 Julien Lepiller @ 2022-10-15 21:39 ` Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 7/7] gnu: josm: Udpate to 18570 Julien Lepiller 5 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:39 UTC (permalink / raw) To: 58553 * gnu/packages/geo.scm (java-opening-hours-parser): Update to 0.27.0. --- gnu/packages/geo.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5e484c6e1c..faec60ebcc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1664,7 +1664,7 @@ (define-public java-jmapviewer (define-public java-opening-hours-parser (package (name "java-opening-hours-parser") - (version "0.23.0") + (version "0.27.0") (source (origin (method git-fetch) (uri (git-reference @@ -1673,11 +1673,12 @@ (define-public java-opening-hours-parser (file-name (git-file-name name version)) (sha256 (base32 - "0yhbd2ix6h506aljh0jkrnp28m4xcqdcdpnqm30fn08kawdgxgsh")))) + "1sw5ccxqw4ly5hzxnnljjqx4876gyvagi10sg8r9w25n211lq0x4")))) (build-system ant-build-system) (arguments `(#:jar-name "java-opening-hours-parser.jar" #:source-dir "src/main/java" + #:test-exclude (list "**/IndividualTest.java") #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources @@ -1692,8 +1693,7 @@ (define-public java-opening-hours-parser "-DEBUG_TOKEN_MANAGER=false" "-JDK_VERSION=1.8" "-GRAMMAR_ENCODING=UTF-8" (string-append "-OUTPUT_DIRECTORY=" dir) - file)) - #t))))) + file))))))) (inputs (list java-jetbrains-annotations)) (native-inputs -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1. 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller ` (3 preceding siblings ...) 2022-10-15 21:39 ` [bug#58553] [PATCH 5/7] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller @ 2022-10-15 21:39 ` Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 7/7] gnu: josm: Udpate to 18570 Julien Lepiller 5 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:39 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-commons-jcs): Update to 3.1. (josm)[arguments]: Remove now unneeded phase. --- gnu/packages/geo.scm | 9 --------- gnu/packages/java.scm | 28 +++++++++------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index faec60ebcc..0ab711c501 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1756,15 +1756,6 @@ (define-public josm "<date>1970-01-01 00:00:00 +0000</date>" "</commit></entry></info>")))) #t)) - (add-before 'build 'fix-jcs - (lambda _ - ;; This version of JOSM uses an unreleased version of commons-jcs, - ;; which has renamed its classes to another namespace. Rename them - ;; back so they can be used with our version of jcs. - (substitute* (find-files "." ".*.java$") - (("jcs3") "jcs") - (("ICache.NAME_COMPONENT_DELIMITER") "\":\"")) - #t)) (add-before 'build 'fix-classpath (lambda* (#:key inputs #:allow-other-keys) (setenv "CLASSPATH" diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 236a910ece..96a4937be0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6331,36 +6331,26 @@ (define-public java-commons-dbcp (define-public java-commons-jcs (package (name "java-commons-jcs") - (version "2.2.1") + (version "3.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/jcs/source/" - "commons-jcs-dist-" version "-src.tar.gz")) + "commons-jcs3-dist-" version "-src.tar.gz")) (sha256 (base32 - "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q")))) + "0y1lm1xnsj99bf7y9mkvbzqfy8dr7ac8zcbkpsjgzb9vhabfsbac")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-jcs.jar" #:source-dir "commons-jcs-core/src/main/java" #:test-dir "commons-jcs-core/src/test" - #:tests? #f; requires hsqldb - #:phases - (modify-phases %standard-phases - (add-before 'build 'prepare - (lambda _ - (with-directory-excursion - "commons-jcs-core/src/main/java/org/apache/commons/jcs" - (substitute* - "auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java" - (("commons.dbcp") "commons.dbcp2") - ((".*\\.setMaxActive.*") "")) - ;;; Remove dependency on velocity-tools - (delete-file "admin/servlet/JCSAdminServlet.java")) - #t))))) + #:tests? #f)); requires hsqldb (propagated-inputs - (list java-classpathx-servletapi java-commons-logging-minimal - java-commons-httpclient java-commons-dbcp)) + (list java-classpathx-servletapi + java-commons-dbcp + java-httpcomponents-httpclient + java-httpcomponents-httpcore + java-log4j-api)) (native-inputs (list java-junit)) (home-page "https://commons.apache.org/proper/commons-jcs/") -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 7/7] gnu: josm: Udpate to 18570. 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller ` (4 preceding siblings ...) 2022-10-15 21:39 ` [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller @ 2022-10-15 21:39 ` Julien Lepiller 5 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-15 21:39 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (josm): Update to 18570. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0ab711c501..41197b0d06 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1707,7 +1707,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18360") + (version "18570") (source (origin (method svn-fetch) (uri (svn-reference @@ -1716,7 +1716,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0j7fhzh6hs2b5r1a3d1xpy6f5r6q1kh79bck28raang8ldd754c6")) + "1msymjsprjiazn7p05jp3xhkasdk4sbppixyy6g9lvj4pnb5c9h4")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 1/8] gnu: Add java-brotli. 2022-10-15 21:36 [bug#58553] [PATCH] gnu: josm: Update to 18570 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 2/8] gnu: Add java-zstd Julien Lepiller ` (6 more replies) 1 sibling, 7 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/compression.scm (java-brotli): New variable. --- gnu/packages/compression.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 684979018c..8d47913713 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -58,6 +58,7 @@ (define-module (gnu packages compression) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system ant) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -81,6 +82,7 @@ (define-module (gnu packages compression) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages java) #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -2239,6 +2241,19 @@ (define-public python-brotli (define-public python-google-brotli (deprecated-package "python-google-brotli" python-brotli)) +(define-public java-brotli + (package + (inherit brotli) + (name "java-brotli") + (build-system ant-build-system) + (arguments + `(#:jar-name "java-brotli.jar" + #:source-dir "java" + ;; Tests are mixed in with java sources, the ant build system + ;; doesn't allow that + #:tests? #f)) + (native-inputs (list java-junit)))) + (define-public ucl (package (name "ucl") -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 2/8] gnu: Add java-zstd. 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 3/8] gnu: Add java-ow-util-ant-tasks Julien Lepiller ` (5 subsequent siblings) 6 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-zstd): New variable. --- gnu/packages/java-compression.scm | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 32d04a2fa6..74bf335fcc 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -322,3 +322,43 @@ (define-public java-xz (description "Tukaani-xz is an implementation of xz compression/decompression algorithms in Java.") (license license:public-domain))) + +(define-public java-zstd + (package + (name "java-zstd") + (version "1.5.2-3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/luben/zstd-jni") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z26z04sc4j6k0g4gvq4xc86mc4wiyp1j7z5hh6wpqgmy9b6h2zb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-zstd.jar" + #:source-dir "src/main/java" + #:tests? #f; Require scala + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-version + (lambda _ + (with-output-to-file "src/main/java/com/github/luben/zstd/util/ZstdVersion.java" + (lambda _ + (format #t "package com.github.luben.zstd.util; + +public class ZstdVersion { + public static final String VERSION = \"~a\"; +}" ,version)))))))) + (inputs + `(("zstd" ,zstd))) + (home-page "https://github.com/luben/zstd-jni") + (synopsis "JNI bindings for Zstd native library") + (description "Zstd, short for Zstandard, is a lossless compression +algorithm, which provides both good compression ratio and speed for standard +compression needs. This package provides JNI bindings for Zstd native +library that provides fast and high compression lossless algorithm for +Android, Java and all JVM languages.") + (license license:bsd-2))) -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 3/8] gnu: Add java-ow-util-ant-tasks. 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 2/8] gnu: Add java-zstd Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 4/8] gnu: Add java-asm-3 Julien Lepiller ` (4 subsequent siblings) 6 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-ow-util-ant-tasks): New variable. --- gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3ab324cce9..dec80d3e51 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5197,6 +5197,42 @@ (define-public java-modello-plugins-xpp3 (description "The modello XPP3 plugin generates XML readers and writers based on the XPP3 API (XML Pull Parser)."))) +(define-public java-ow-util-ant-tasks + (package + (name "java-ow-util-ant-tasks") + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://deb.debian.org/debian/pool/main/o/ow-util-ant-tasks/" + "ow-util-ant-tasks_" version ".orig.tar.gz")) + (sha256 + (base32 + "1y5ln1g36aligwcadqksdj18i5ghqnxn523wjbzy2zyd7w58fgy5")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "ow-util-ant-tasks.jar" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-cyclic-dependency + (lambda _ + ;; This file depends on asm-3, which depends on this package + (delete-file "src/org/objectweb/util/ant/DependencyAnalyzer.java") + ;; This file depends on xalan + (delete-file "src/org/objectweb/util/ant/Xalan2Liaison.java"))) + (add-before 'build 'fix-new-ant + (lambda _ + (substitute* "src/org/objectweb/util/ant/MultipleCopy.java" + ((", destFile.getAbsolutePath\\(\\)") + ", new String[] { destFile.getAbsolutePath() }"))))))) + (home-page "https://packages.debian.org/source/stretch/ow-util-ant-tasks") + (synopsis "Replacement for base ant tasks") + (description "This library is used in the legacy build process of several +key frameworks developed by ObjectWeb, among them legacy versions of the +ObjectWeb ASM bytecode manipulation framework.") + (license license:lgpl2.0+))) + (define-public java-asm (package (name "java-asm") -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 4/8] gnu: Add java-asm-3. 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 2/8] gnu: Add java-zstd Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 3/8] gnu: Add java-ow-util-ant-tasks Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 5/8] gnu: java-commons-compress: Update to 1.21 Julien Lepiller ` (3 subsequent siblings) 6 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-asm): New variable. --- gnu/packages/java.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dec80d3e51..7bf29622e1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5332,6 +5332,31 @@ (define java-asm-bootstrap ((#:tests? _) #f))) (native-inputs `()))) +(define-public java-asm-3 + (package + (inherit java-asm) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.ow2.org/asm/asm") + (commit "ASM_3_1"))) + (file-name (git-file-name "java-asm" version)) + (sha256 + (base32 + "0xbyf2sl8j6mrvfpg2da0vjdp906rac62l66gkk82x5cn3vc30h4")) + (modules '((guix build utils))) + (snippet `(for-each delete-file (find-files "." "\\.jar$"))))) + (arguments + `(#:build-target "jar" + #:test-target "test" + #:tests? #f; require legacy test software + #:phases + (modify-phases %standard-phases + (replace 'install (install-jars "output/dist")) + (delete 'generate-jar-indices)))) + (native-inputs (list java-ow-util-ant-tasks)))) + (define-public java-asm-8 (package (inherit java-asm) -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 5/8] gnu: java-commons-compress: Update to 1.21. 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller ` (2 preceding siblings ...) 2022-10-16 8:48 ` [bug#58553] [PATCH 4/8] gnu: Add java-asm-3 Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 6/8] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller ` (2 subsequent siblings) 6 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-commons-compress): Update to 1.21. (java-osgi-annotation, java-osgi-core): Create pom file and install from it. * gnu/packages/maven.scm (java-surefire-parent-pom): Fix pom fixing. --- gnu/packages/java.scm | 45 +++++++++++++++++++++--------------------- gnu/packages/maven.scm | 3 +-- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7bf29622e1..eadb928eec 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6828,40 +6828,29 @@ (define-public java-jsch (define-public java-commons-compress (package (name "java-commons-compress") - (version "1.13") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/compress/source/" "commons-compress-" version "-src.tar.gz")) (sha256 (base32 - "1vjqvavrn0babffn1kciz6v52ibwq2vwhzlb95hazis3lgllnxc8")))) + "1rkpb6xcyly1wnbx4q6iq6p5hrr0h1d0ppb5r07psc75cbmizjry")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-compress.jar" + #:source-dir "src/main/java" + #:tests? #f; requires java-mockito-3 #:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-bad-tests - (lambda _ - (with-directory-excursion "src/test/java/org/apache/commons/compress/" - ;; FIXME: These tests really should not fail. Maybe they are - ;; indicative of problems with our Java packaging work. - - ;; This test fails with a null pointer exception. - (delete-file "archivers/sevenz/SevenZOutputFileTest.java") - ;; This test fails to open test resources. - (delete-file "archivers/zip/ExplodeSupportTest.java") - - ;; FIXME: This test adds a dependency on powermock, which is hard to - ;; package at this point. - ;; https://github.com/powermock/powermock - (delete-file "archivers/sevenz/SevenZNativeHeapTest.java")) - #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-xz apache-commons-parent-pom-41)) - (native-inputs - (list java-junit java-mockito-1)) + (list java-asm-3 + java-brotli + java-osgi-core + java-xz + java-zstd + apache-commons-parent-pom-52)) (home-page "https://commons.apache.org/proper/commons-compress/") (synopsis "Java library for working with compressed files") (description "The Apache Commons Compress library defines an API for @@ -6923,7 +6912,12 @@ (define-public java-osgi-annotation (build-system ant-build-system) (arguments `(#:tests? #f ; no tests - #:jar-name "osgi-annotation.jar")) + #:jar-name "osgi-annotation.jar" + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (generate-pom.xml "pom.xml" "osgi" "osgi-annotation" ,version)) + (replace 'install (install-from-pom "pom.xml"))))) (home-page "https://www.osgi.org") (synopsis "Annotation module of OSGi framework") (description @@ -6948,7 +6942,12 @@ (define-public java-osgi-core (build-system ant-build-system) (arguments `(#:tests? #f ; no tests - #:jar-name "osgi-core.jar")) + #:jar-name "osgi-core.jar" + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (generate-pom.xml "pom.xml" "org.osgi" "org.osgi.core" ,version)) + (replace 'install (install-from-pom "pom.xml"))))) (inputs (list java-osgi-annotation)) (home-page "https://www.osgi.org") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index b7794c4e89..d3e5677669 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3462,8 +3462,7 @@ (define-public java-surefire-parent-pom (add-before 'install 'fix-pom-dependency-versions (lambda _ (substitute* "pom.xml" - (("1.11") ,(package-version java-commons-compress)) - (("1.13") ,(package-version java-commons-codec))) + (("1.11") ,(package-version java-commons-codec))) (substitute* "pom.xml" (("commonsLang3Version>.*") (string-append -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 6/8] gnu: java-opening-hours-parser: Update to 0.27.0. 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller ` (3 preceding siblings ...) 2022-10-16 8:48 ` [bug#58553] [PATCH 5/8] gnu: java-commons-compress: Update to 1.21 Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 7/8] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 8/8] gnu: josm: Udpate to 18570 Julien Lepiller 6 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/geo.scm (java-opening-hours-parser): Update to 0.27.0. --- gnu/packages/geo.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5e484c6e1c..faec60ebcc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1664,7 +1664,7 @@ (define-public java-jmapviewer (define-public java-opening-hours-parser (package (name "java-opening-hours-parser") - (version "0.23.0") + (version "0.27.0") (source (origin (method git-fetch) (uri (git-reference @@ -1673,11 +1673,12 @@ (define-public java-opening-hours-parser (file-name (git-file-name name version)) (sha256 (base32 - "0yhbd2ix6h506aljh0jkrnp28m4xcqdcdpnqm30fn08kawdgxgsh")))) + "1sw5ccxqw4ly5hzxnnljjqx4876gyvagi10sg8r9w25n211lq0x4")))) (build-system ant-build-system) (arguments `(#:jar-name "java-opening-hours-parser.jar" #:source-dir "src/main/java" + #:test-exclude (list "**/IndividualTest.java") #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources @@ -1692,8 +1693,7 @@ (define-public java-opening-hours-parser "-DEBUG_TOKEN_MANAGER=false" "-JDK_VERSION=1.8" "-GRAMMAR_ENCODING=UTF-8" (string-append "-OUTPUT_DIRECTORY=" dir) - file)) - #t))))) + file))))))) (inputs (list java-jetbrains-annotations)) (native-inputs -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 7/8] gnu: java-commons-jcs: Update to 3.1. 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller ` (4 preceding siblings ...) 2022-10-16 8:48 ` [bug#58553] [PATCH 6/8] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 8/8] gnu: josm: Udpate to 18570 Julien Lepiller 6 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (java-commons-jcs): Update to 3.1. (josm)[arguments]: Remove now unneeded phase. --- gnu/packages/geo.scm | 9 --------- gnu/packages/java.scm | 28 +++++++++------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index faec60ebcc..0ab711c501 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1756,15 +1756,6 @@ (define-public josm "<date>1970-01-01 00:00:00 +0000</date>" "</commit></entry></info>")))) #t)) - (add-before 'build 'fix-jcs - (lambda _ - ;; This version of JOSM uses an unreleased version of commons-jcs, - ;; which has renamed its classes to another namespace. Rename them - ;; back so they can be used with our version of jcs. - (substitute* (find-files "." ".*.java$") - (("jcs3") "jcs") - (("ICache.NAME_COMPONENT_DELIMITER") "\":\"")) - #t)) (add-before 'build 'fix-classpath (lambda* (#:key inputs #:allow-other-keys) (setenv "CLASSPATH" diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index eadb928eec..5eef883495 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6369,36 +6369,26 @@ (define-public java-commons-dbcp (define-public java-commons-jcs (package (name "java-commons-jcs") - (version "2.2.1") + (version "3.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/jcs/source/" - "commons-jcs-dist-" version "-src.tar.gz")) + "commons-jcs3-dist-" version "-src.tar.gz")) (sha256 (base32 - "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q")))) + "0y1lm1xnsj99bf7y9mkvbzqfy8dr7ac8zcbkpsjgzb9vhabfsbac")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-jcs.jar" #:source-dir "commons-jcs-core/src/main/java" #:test-dir "commons-jcs-core/src/test" - #:tests? #f; requires hsqldb - #:phases - (modify-phases %standard-phases - (add-before 'build 'prepare - (lambda _ - (with-directory-excursion - "commons-jcs-core/src/main/java/org/apache/commons/jcs" - (substitute* - "auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java" - (("commons.dbcp") "commons.dbcp2") - ((".*\\.setMaxActive.*") "")) - ;;; Remove dependency on velocity-tools - (delete-file "admin/servlet/JCSAdminServlet.java")) - #t))))) + #:tests? #f)); requires hsqldb (propagated-inputs - (list java-classpathx-servletapi java-commons-logging-minimal - java-commons-httpclient java-commons-dbcp)) + (list java-classpathx-servletapi + java-commons-dbcp + java-httpcomponents-httpclient + java-httpcomponents-httpcore + java-log4j-api)) (native-inputs (list java-junit)) (home-page "https://commons.apache.org/proper/commons-jcs/") -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#58553] [PATCH 8/8] gnu: josm: Udpate to 18570. 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller ` (5 preceding siblings ...) 2022-10-16 8:48 ` [bug#58553] [PATCH 7/8] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller @ 2022-10-16 8:48 ` Julien Lepiller 2022-11-03 14:13 ` bug#58553: " Julien Lepiller 6 siblings, 1 reply; 17+ messages in thread From: Julien Lepiller @ 2022-10-16 8:48 UTC (permalink / raw) To: 58553 * gnu/packages/java.scm (josm): Update to 18570. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0ab711c501..41197b0d06 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1707,7 +1707,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18360") + (version "18570") (source (origin (method svn-fetch) (uri (svn-reference @@ -1716,7 +1716,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0j7fhzh6hs2b5r1a3d1xpy6f5r6q1kh79bck28raang8ldd754c6")) + "1msymjsprjiazn7p05jp3xhkasdk4sbppixyy6g9lvj4pnb5c9h4")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- 2.38.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* bug#58553: [PATCH 8/8] gnu: josm: Udpate to 18570. 2022-10-16 8:48 ` [bug#58553] [PATCH 8/8] gnu: josm: Udpate to 18570 Julien Lepiller @ 2022-11-03 14:13 ` Julien Lepiller 0 siblings, 0 replies; 17+ messages in thread From: Julien Lepiller @ 2022-11-03 14:13 UTC (permalink / raw) To: 58553-done Pushed to master as b347ef494d726a009fbb4e11f1663c670131db61 to 973dc4564e874107ac56d39ece2a2224cf926fe6, although this time josm is updated to 18583 that was released in the meantime and jcs3 was fixed by adding a copy-resources phase. ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2022-11-03 14:14 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-10-15 21:36 [bug#58553] [PATCH] gnu: josm: Update to 18570 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 1/7] gnu: Add java-brotli Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 2/7] gnu: Add java-zstd Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 3/7] gnu: Add java-asm-3 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 4/7] gnu: java-commons-compress: Update to 1.21 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 5/7] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller 2022-10-15 21:39 ` [bug#58553] [PATCH 7/7] gnu: josm: Udpate to 18570 Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 1/8] gnu: Add java-brotli Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 2/8] gnu: Add java-zstd Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 3/8] gnu: Add java-ow-util-ant-tasks Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 4/8] gnu: Add java-asm-3 Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 5/8] gnu: java-commons-compress: Update to 1.21 Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 6/8] gnu: java-opening-hours-parser: Update to 0.27.0 Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 7/8] gnu: java-commons-jcs: Update to 3.1 Julien Lepiller 2022-10-16 8:48 ` [bug#58553] [PATCH 8/8] gnu: josm: Udpate to 18570 Julien Lepiller 2022-11-03 14:13 ` bug#58553: " Julien Lepiller
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.