From 1f1c769c11fcbe97dbf2df3b2b726532ff0f8f4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 Jan 2023 23:35:23 +0100 Subject: gnu: java-logback-core: Drop input labels. * gnu/packages/java.scm (java-logback-core)[inputs]: Drop labels. [native-inputs]: Drop labels. --- gnu/packages/java.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a2650b1826..19bfc9b7dc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -12947,18 +12947,18 @@ (define-public java-logback-core (chdir "logback-core") #t))))) (inputs - `(("java-javax-mail" ,java-javax-mail) - ("servlet" ,java-javaee-servletapi) - ("java-commons-compiler" ,java-commons-compiler) - ("java-janino" ,java-janino))) + (list java-javax-mail + java-javaee-servletapi + java-commons-compiler + java-janino)) (native-inputs - `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core) - ("java-mockito-1" ,java-mockito-1) - ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) - ("java-objenesis" ,java-objenesis) - ("java-joda-time" ,java-joda-time))) + (list java-junit + java-hamcrest-core + java-mockito-1 + java-cglib + java-asm + java-objenesis + java-joda-time)) (home-page "https://logback.qos.ch") (synopsis "Logging for java") (description "Logback is intended as a successor to the popular log4j project. -- cgit v1.2.3 From acc5725902f7b80479a18cb2bf926ee26c33e02c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 Jan 2023 23:35:39 +0100 Subject: gnu: java-logback-core: Fetch source from git. * gnu/packages/java.scm (java-logback-core)[source]: Fetch with git instead of using generated tarball at archive URL; simplify snippet. --- gnu/packages/java.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 19bfc9b7dc..6c6a9411a6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2023 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017, 2019, 2021 Carlo Zancanaro @@ -12914,18 +12914,17 @@ (define-public java-logback-core (name "java-logback-core") (version "1.2.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/qos-ch/logback/archive/v_" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/qos-ch/logback/") + (commit (string-append "v_" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1x6ga74yfgm94cfx98gybakbrlilx8i2gn6dx13l40kasmys06mi")) + "055jbfpg3l5qw7pw2snkdag0gjkb4vcxfg9110cqqyc40k2nd17z")) (modules '((guix build utils))) (snippet - '(begin - (delete-file-recursively "logback-access/lib") - #t)))) + '(delete-file-recursively "logback-access/lib")))) (build-system ant-build-system) (arguments `(#:jar-name "logback.jar" -- cgit v1.2.3 From c94708a5b4820c9253ef5774a1022fc106e7ae9a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 Jan 2023 23:36:30 +0100 Subject: gnu: java-logback-core: Drop trailing #T. * gnu/packages/java.scm (java-logback-core)[arguments]: Drop trailing #T from 'chdir phase. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6c6a9411a6..0d0f3129bc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -12942,9 +12942,7 @@ (define-public java-logback-core #:phases (modify-phases %standard-phases (add-before 'configure 'chdir - (lambda _ - (chdir "logback-core") - #t))))) + (lambda _ (chdir "logback-core")))))) (inputs (list java-javax-mail java-javaee-servletapi -- cgit v1.2.3 From e4db832a0ec8e3d9d4f01843e4bb7d92c458199e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 12 Dec 2022 21:19:38 +0000 Subject: gnu: openjdk: Update to 19. * gnu/packages/java.scm (openjdk): Update to 19. (openjdk19): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/java.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0d0f3129bc..15a4e62de1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1493,8 +1493,25 @@ (define-public openjdk18 (make-openjdk openjdk17 "18.0.2" "1yimfdkwpinhg5cf1mcrzk9xvjwnray3cx762kypb9jcwbranjwx")) +(define-public openjdk19 + (make-openjdk openjdk18 "19.0.1" + "0kyalb391znw6idmfn3dsx6c2mal1hl63f0bwa4mlnsxfl380bi1" + (arguments + (substitute-keyword-arguments (package-arguments openjdk18) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'fix-java-shebangs + (lambda _ + ;; Update file path. + (substitute* "src/java.base/share/data/blockedcertsconverter/blocked.certs.pem" + (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))) + (add-before 'configure 'define-java-environment-variables + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix for "valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z". + (setenv "SOURCE_DATE_EPOCH" "1234567890"))))))))) + ;;; Convenience alias to point to the latest version of OpenJDK. -(define-public openjdk openjdk18) +(define-public openjdk openjdk19) (define-public ant/java8 -- cgit v1.2.3 From 0d169401cbc9e1a418290d4d6cb03dac8babcde3 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Thu, 19 Jan 2023 20:53:37 +0100 Subject: gnu: java-logback-classic: Fix build. * gnu/packages/java.scm (java-logback-classic)[arguments]: Use input name "java-javaee-servletapi" instead of "servlet". Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 15a4e62de1..e55684d2a3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13006,7 +13006,7 @@ (define-public java-logback-classic (find-files (assoc-ref inputs input) ".*.jar")) '("java-logback-core" "java-slf4j-api" - "java-commons-compiler" "servlet" + "java-commons-compiler" "java-javaee-servletapi" "groovy"))) ":")) (apply invoke "groovyc" "-d" "build/classes" "-j" -- cgit v1.2.3