From 2703d5734382e0ceac9febb1f77d654693f76417 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:02:44 +0300 Subject: gnu: java-hamcrest-core: Don't use unstable tarball. * gnu/packages/java.scm (java-hamcrest-core)[source]: Download using git-fetch. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5154dc124e..8c97f6bba0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich -;;; Copyright © 2018, 2019 Efraim Flashner +;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2019, 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. @@ -3435,12 +3435,14 @@ an Ant task that extends the built-in @code{jar} task.") (name "java-hamcrest-core") (version "1.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hamcrest/JavaHamcrest/" - "archive/hamcrest-java-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/hamcrest/JavaHamcrest/") + (commit (string-append "hamcrest-java-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "11g0s105fmwzijbv08lx8jlb521yravjmxnpgdx08fvg1kjivhva")) + "16fxxkrd31ahqvcaby30jgh3z1i0zxh51m24hxgz0z2agxj6bc63")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 42c1c59ea19ecdae04fa88858a261b4101a62709 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:05:31 +0300 Subject: gnu: java-junit: Don't use unstable tarball. * gnu/packages/java.scm (java-junit)[source]: Download using git-fetch. [home-page]: Update home-page. --- gnu/packages/java.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8c97f6bba0..db28805929 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3542,13 +3542,14 @@ testing frameworks, mocking libraries and UI validation rules.") (name "java-junit") (version "4.12") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/junit-team/junit/" - "archive/r" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/junit-team/junit/") + (commit (string-append "r" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "090dn5v1vs0b3acyaqc0gjf6p8lmd2h24wfzsbq7sly6b214anws")) + "1j8avi91px1z8rjc89cfikwrvfifdmmsarwiyrcnr59ynvpz0v8h")) (modules '((guix build utils))) (snippet '(begin @@ -3561,7 +3562,7 @@ testing frameworks, mocking libraries and UI validation rules.") #:jar-name "junit.jar")) (inputs `(("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "https://junit.org/") + (home-page "https://junit.org/junit4/") (synopsis "Test framework for Java") (description "JUnit is a simple framework to write repeatable tests for Java projects. -- cgit v1.2.3 From c53badd4520252fc19c89820af0d569a2d809af2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:12:31 +0300 Subject: gnu: java-plexus-utils: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-utils)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index db28805929..ce5aee1f20 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3575,13 +3575,14 @@ sharing common test data, and test runners for running tests.") (name "java-plexus-utils") (version "3.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/" - "plexus-utils/archive/plexus-utils-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-utils") + (commit (string-append "plexus-utils-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ihfigar20lvk4pinii7dq05i173xphhw4iyrk6gjfy04m01j2lz")))) + "1mlx7xrq7lgqjqcpg7y4hi1ghavf28vvk3har82037dqx61n0f15")))) (build-system ant-build-system) ;; FIXME: The default build.xml does not include a target to install ;; javadoc files. -- cgit v1.2.3 From c4b67ba3a804d94ea2b56a2d7c968a1e024f2ee1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:15:45 +0300 Subject: gnu: java-plexus-interpolation: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-interpolation)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ce5aee1f20..da778518fe 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3629,13 +3629,14 @@ more.") (name "java-plexus-interpolation") (version "1.23") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/" - "plexus-interpolation/archive/" - "plexus-interpolation-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-interpolation") + (commit (string-append "plexus-interpolation-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "03377yzlx5q440m6sxxgv6a5qb8fl30zzcgxgc0hxk5qgl2z1jjn")))) + "005hxxg1adv71a96lz4vp65bk3v1pi76j4c45z29xzizclib16vl")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-interpolation.jar" -- cgit v1.2.3 From 9520b2b16e242728ab9340047197389d6d2bc2fc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:18:15 +0300 Subject: gnu: java-plexus-classworlds: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-classworlds)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index da778518fe..5ee7109ab8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3660,13 +3660,14 @@ these two libraries to vary independently of one another.") (name "java-plexus-classworlds") (version "2.5.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/" - "plexus-classworlds/archive/plexus-classworlds-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-classworlds") + (commit (string-append "plexus-classworlds-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1qm4p0rl8d82lzhsiwnviw11jnq44s0gflg78zq152xyyr2xmh8g")))) + "1iv8x55fbni2hg4l7pdpbwfq75xmvq1f25g6nxma8rcdpihsh13r")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-classworlds.jar" -- cgit v1.2.3 From 3a26ea3a58b9f2cf52563f24473cfa72b924e838 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:32:23 +0300 Subject: gnu: java-plexus-container-default-bootstrap: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-container-default-bootstrap) [source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5ee7109ab8..a3ea0847cf 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3687,12 +3687,14 @@ components.") (name "java-plexus-container-default-bootstrap") (version "1.7.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-containers" - "/archive/plexus-containers-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-containers") + (commit (string-append "plexus-containers-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xw5g30qf4a83608rw9v2hv8pfsz7d69dkdhk6r0wia4q78hh1pc")))) + "1316hrp5vqfv0aw7miq2fp0wwy833h66h502h29vnh5sxj27x228")))) (build-system ant-build-system) (arguments `(#:jar-name "container-default.jar" -- cgit v1.2.3 From 48fe942c8578f52ed584691d3b581f789282a409 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:01:18 +0300 Subject: gnu: java-plexus-io: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-io)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a3ea0847cf..f04dfe0b9d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3728,12 +3728,14 @@ implementation.") (name "java-plexus-io") (version "3.0.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-io" - "/archive/plexus-io-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-io") + (commit (string-append "plexus-io-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0f2j41kihaymxkpbm55smpxjja235vad8cgz94frfy3ppcp021dw")))) + "1h4q9l2j9sfbscvxpnyy2hazi0r83h3am86y4r959wrl1b24xxwd")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-io.jar" -- cgit v1.2.3 From d0e6461370210cc35643e0a37a7cb1c6799701ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:08:28 +0300 Subject: gnu: java-plexus-cipher: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-cipher)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f04dfe0b9d..b4fb1e5a6e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3889,12 +3889,14 @@ from source tags and class annotations."))) (name "java-plexus-cipher") (version "1.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-cipher" - "/archive/plexus-cipher-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-cipher") + (commit (string-append "plexus-cipher-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1j3r8xzlxlk340snkjp6lk2ilkxlkn8qavsfiq01f43xmvv8ymk3")))) + "0m638nzlxbmnbcj5cwdpgs326ab584yv0k803zlx37r6iqwvf6b0")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-cipher.jar" -- cgit v1.2.3 From 5723137a4cdc44c75de2d0a1d207fbf394db5530 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:19:59 +0300 Subject: gnu: java-plexus-compiler-api: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-compiler-api)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b4fb1e5a6e..6a6af783c7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3927,12 +3927,14 @@ and decryption.") (name "java-plexus-compiler-api") (version "2.8.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-compiler" - "/archive/plexus-compiler-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-compiler") + (commit (string-append "plexus-compiler-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "09vmxs0807wsd26nbrwwj5l8ycmzazqycj52l7w6wjvkryywi69h")))) + "1nq1gnn3s6z1j29gmi1hqbklsmm8b1lmnafb0191914f95mn18gk")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-compiler-api.jar" -- cgit v1.2.3 From d9e356a893fd57da939a068d9ca6911c79169009 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:24:13 +0300 Subject: gnu: java-plexus-sec-dispatcher: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-sec-dispatcher)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6a6af783c7..81a17c040e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3980,13 +3980,14 @@ Compiler component."))) (source (origin ;; This project doesn't tag releases or publish tarballs, so we take ;; the "prepare release plexus-sec-dispatcher-1.4" git commit. - (method url-fetch) - (uri (string-append "https://github.com/sonatype/plexus-sec-dispatcher/" - "archive/7db8f88048.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/plexus-sec-dispatcher/") + (commit "7db8f880486e192a1c5ea9544e01e756c3d49d0f"))) (sha256 (base32 - "1smfrk4n7xbrsxpxcp2j4i0j8q86j73w0w6xg7qz83dp6dagdjgp")) - (file-name (string-append name "-" version ".tar.gz")))) + "1ng4yliy4cqpjr4fxxjbpwyk1wkch5f8vblm1kvwf328s4gibszs")) + (file-name (git-file-name name version)))) (arguments `(#:jar-name "plexus-sec-dispatcher.jar" #:source-dir "src/main/java" -- cgit v1.2.3 From 16c62763995ccdb3165a9d5760df4097aca822fb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:26:23 +0300 Subject: gnu: java-sisu-build-api: Don't use unstable tarball. * gnu/packages/java.scm (java-sisu-build-api)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 81a17c040e..fe9a8998ba 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4102,12 +4102,14 @@ Plexus components.") (name "java-sisu-build-api") (version "0.0.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sonatype/sisu-build-api/" - "archive/plexus-build-api-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/sisu-build-api") + (commit (string-append "plexus-build-api-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1c3rrpma3x634xp2rm2p5iskfhzdyc7qfbhjzr70agrl1jwghgy2")))) + "1d5w6c58gkx30d51v7qwv1xrhc0ly76848gihmgshj19yf6yhca0")))) (build-system ant-build-system) (arguments `(#:jar-name "sisu-build-api.jar" -- cgit v1.2.3 From df9487c5943d923751127c20ccb2e8bec726113d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:39:14 +0300 Subject: gnu: java-modello-core: Don't use unstable tarball. * gnu/packages/java.scm (java-modello-core)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fe9a8998ba..5a7a75a86b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4159,12 +4159,14 @@ project and determining what files need to be rebuilt.") (name "java-modello-core") (version "1.9.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/modello" - "/archive/modello-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/modello") + (commit (string-append "modello-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0l2pvns8pmlrmjm3iknp7gpg3654y1m8qhy55b19sdwdchdcyxfh")))) + "1di6ni42aqllpdvkpyfcw70352vr2i8wf6hd5nhd9kmqjb5dj5j4")))) (build-system ant-build-system) (arguments `(#:jar-name "modello-core.jar" -- cgit v1.2.3 From 654f997d98fd96c0a2eaa36e0dda1518eb40fb90 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:40:52 +0300 Subject: gnu: java-asm: Download using https. * gnu/packages/java.scm (java-asm)[source]: Use https URL. --- 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 5a7a75a86b..f124eb6278 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4333,7 +4333,7 @@ on the XPP3 API (XML Pull Parser)."))) (version "6.0") (source (origin (method url-fetch) - (uri (string-append "http://download.forge.ow2.org/asm/" + (uri (string-append "https://download.forge.ow2.org/asm/" "asm-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 3dc7a8ce73943f8bd0a34e39440356b0f2a75e5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:43:17 +0300 Subject: gnu: java-objenesis: Don't use unstable tarball. * gnu/packages/java.scm (java-objenesis)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f124eb6278..5a124b5115 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4435,13 +4435,14 @@ to generate and transform Java byte code.") (name "java-objenesis") (version "2.5.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/easymock/objenesis/" - "archive/" version ".tar.gz")) - (file-name (string-append "objenesis-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/easymock/objenesis") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1va5qz1i2wawwavhnxfzxnfgrcaflz9p1pg03irrjh4nd3rz8wh6")))) + "054yi200wj00x6dp1sxfrwgndwywadsbn8d8ij1j0v45j9g2vdya")))) (build-system ant-build-system) (arguments `(#:jar-name "objenesis.jar" -- cgit v1.2.3 From 7cf90f641981b61f9811ef6848761fe031f03b71 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:46:24 +0300 Subject: gnu: java-easymock: Don't use unstable tarball. * gnu/packages/java.scm (java-easymock)[source]: Download using git-fetch. [home-page]: Use https. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5a124b5115..d1cd62bf83 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4465,12 +4465,14 @@ constructor on object instantiation.") (name "java-easymock") (version "3.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/easymock/easymock/" - "archive/easymock-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/easymock/easymock/") + (commit (string-append "easymock-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1yzg0kv256ndr57gpav46cyv4a1ns5sj722l50zpxk3j6sk9hnmi")))) + "02vybm8hc0i0n9sp2f2iiqn54zwqhq835f76wc6b2m7819z5a8dq")))) (build-system ant-build-system) (arguments `(#:jar-name "easymock.jar" @@ -4515,7 +4517,7 @@ constructor on object instantiation.") (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://easymock.org") + (home-page "https://easymock.org/") (synopsis "Java library providing mock objects for unit tests") (description "EasyMock is a Java library that provides an easy way to use mock objects in unit testing.") -- cgit v1.2.3 From 7cf26f249a40b67319cf624869e37828d9e322e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:51:25 +0300 Subject: gnu: java-jmock-1: Don't use unstable tarball. * gnu/packages/java.scm (java-jmock-1)[source]: Download using git-fetch. [home-page]: Update home-page. --- gnu/packages/java.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d1cd62bf83..1a36268da7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4528,13 +4528,14 @@ mock objects in unit testing.") (name "java-jmock") (version "1.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jmock-developers/" - "jmock-library/archive/" version ".tar.gz")) - (file-name (string-append "jmock-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmock-developers/jmock-library") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xmrlhq0fszldkbv281k9463mv496143vvmqwpxp62yzjvdkx9w0")))) + "0lkga995xd9b9mmzxmcd301hlw83p1h78nibh7djlx7wydscr85z")))) (build-system ant-build-system) (arguments `(#:build-target "jars" @@ -4542,7 +4543,7 @@ mock objects in unit testing.") #:phases (modify-phases %standard-phases (replace 'install (install-jars "build"))))) - (home-page "http://www.jmock.org") + (home-page "http://jmock.org/") (synopsis "Mock object library for test-driven development") (description "JMock is a library that supports test-driven development of Java code with mock objects. Mock objects help you design and test the -- cgit v1.2.3 From 242af2954e86e2b640c0cf3947514a22a812335f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:53:46 +0300 Subject: gnu: java-jmock: Don't use unstable tarball. * gnu/packages/java.scm (java-jmock)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 1a36268da7..e8cab46a7c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4566,13 +4566,14 @@ The jMock library (name "java-jmock") (version "2.8.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jmock-developers/" - "jmock-library/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmock-developers/jmock-library") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "18650a9g8xffcsdb6w91pbswa7f40fp2sh6s3nclkclz5dbzq8f0")))) + "12b7l22g3nrjvf2dzcw3z03fpd2chrgp0d8xkvn8w55rwb57pax6")))) (inputs `(("java-hamcrest-all" ,java-hamcrest-all) ("java-asm" ,java-asm) -- cgit v1.2.3 From 2876b23345916fdfd1468c55312aab84f46de80e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:58:51 +0300 Subject: gnu: java-javaewah: Don't use unstable tarball. * gnu/packages/java.scm (java-javaewah)[source]: Download using git-fetch. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e8cab46a7c..e1e071573d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6742,12 +6742,14 @@ This is a part of the Apache Commons Project.") (name "java-javaewah") (version "1.1.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lemire/javaewah/" - "archive/JavaEWAH-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lemire/javaewah/") + (commit (string-append "JavaEWAH-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1n7j1r1h24wlhwv9zdcj6yqjrhma2ixwyzm15l5vrv6yqjs6753b")))) + "1m8qcb1py76v7avbjjrkvyy6fhr5dk2ywy73gbsxqry04gkm2nhw")))) (build-system ant-build-system) (arguments `(#:jar-name "javaewah.jar")) (inputs @@ -6760,7 +6762,7 @@ This is a part of the Apache Commons Project.") compression scheme. It can be used to implement bitmap indexes. The goal of word-aligned compression is not to achieve the best compression, -but rather to improve query processing time. Hence, JavaEWAH tries to save CPU +but rather to improve query processing time. Hence, JavaEWAH tries to save CPU cycles, maybe at the expense of storage. However, the EWAH scheme is always more efficient storage-wise than an uncompressed bitmap (as implemented in the @code{BitSet} class by Sun).") -- cgit v1.2.3 From 043ee597a7f82c6ea0dd6de07a69bb0bdb523a64 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 10:05:39 +0300 Subject: gnu: antlr3: Don't use unstable tarball. * gnu/packages/java.scm (antlr3)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e1e071573d..9c0974a602 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7051,13 +7051,14 @@ StringTemplate also powers ANTLR.") (name "antlr3") (version "3.5.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/antlr/antlr3/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/antlr/antlr3") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0218v683081lg54z9hvjxinhxd4dqp870jx6n39gslm0bkyi4vd6")))) + "0cafavrjmzqhklghrk8c2jqxkdwxgzskm20pbrfd3r41cn00dpnf")))) (build-system ant-build-system) (arguments `(#:jar-name (string-append ,name "-" ,version ".jar") -- cgit v1.2.3