From 59e0021cc79b577daaf0f23a9f0b93e166400261 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 13 Dec 2017 21:18:50 +0100 Subject: gnu: java-powermock-core: Include resources. * gnu/packages/java.scm (java-powermock-core)[arguments]: Add a phase to include resources. --- gnu/packages/java.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8dd6356058f..c05e4c3fabe 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7418,7 +7418,13 @@ done to the IDE or continuous integration servers which simplifies adoption.") #:source-dir "powermock-core/src/main/java" #:test-dir "powermock-core/src/test" #:tests? #f; requires powermock-api - #:jdk ,icedtea-8)) + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "powermock-core/src/main/resources" + "build/classes")))))) (inputs `(("reflect" ,java-powermock-reflect) ("javassist" ,java-jboss-javassist))) -- cgit v1.3 From 1124683d8cfddf7869c52ff2a4e4fb402a36ac88 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 13 Dec 2017 21:20:30 +0100 Subject: gnu: java-powermock-modules-junit4: Fix junit version detection. * gnu/packages/java.scm (java-powermock-modules-junit4)[arguments]: Fix junit version detection. --- gnu/packages/java.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c05e4c3fabe..598249aa8c7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7473,7 +7473,15 @@ done to the IDE or continuous integration servers which simplifies adoption.") `(#:jar-name "java-powermock-modules-junit4.jar" #:jdk ,icedtea-8 #:source-dir "powermock-modules/powermock-module-junit4/src/main/java" - #:test-dir "powermock-modules/powermock-module-junit4/src/test")) + #:test-dir "powermock-modules/powermock-module-junit4/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-junit-detection + (lambda _ + ;; Our junit version is 4.12-SNAPSHOT + (substitute* (find-files "powermock-modules/powermock-module-junit4" + "PowerMockJUnit4MethodValidator.java") + (("4.12") "4.12-SNAPSHOT"))))))) (inputs `(("core" ,java-powermock-core) ("reflect" ,java-powermock-reflect) -- cgit v1.3 From c353d0140e2f20fd75c8dc97fe65411337fb259a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Jan 2018 01:54:03 +0100 Subject: gnu: java: Use HTTPS for osgi.org home pages. * gnu/packages/java.scm (java-osgi-annotation, java-osgi-core) (java-osgi-service-event, java-osgi-cmpn) (java-osgi-service-component-annotations, java-osgi-dto, java-osgi-resource) (java-osgi-namespace-contract, java-osgi-namespace-extender) (java-osgi-namespace-service, java-osgi-util-function) (java-osgi-util-promise, java-osgi-service-metatype-annotations) (java-osgi-service-repository, java-osgi-framework, java-osgi-service-log) (java-osgi-service-jdbc, java-osgi-service-resolver, java-osgi-util-tracker) (java-osgi-service-cm, java-osgi-service-packageadmin)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 598249aa8c7..32d3a287d89 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3841,7 +3841,7 @@ Custom formats can be created using a fluent style API.") (arguments `(#:tests? #f ; no tests #:jar-name "osgi-annotation.jar")) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Annotation module of OSGi framework") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -3868,7 +3868,7 @@ components.") #:jar-name "osgi-core.jar")) (inputs `(("java-osgi-annotation" ,java-osgi-annotation))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Core module of OSGi framework") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -3896,7 +3896,7 @@ the OSGi Core module.") (inputs `(("java-osgi-annotation" ,java-osgi-annotation) ("java-osgi-core" ,java-osgi-core))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGi service event module") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5350,7 +5350,7 @@ used to generate this API.") ("java-datanucleus-javax-persistence" ,java-datanucleus-javax-persistence) ("microemulator" ,java-microemulator-cldc) ("servlet" ,java-classpathx-servletapi))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Compendium specification module of OSGi framework") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5378,7 +5378,7 @@ in compiling bundles.") #:tests? #f)); no tests (inputs `(("annotation" ,java-osgi-annotation))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Support annotations for osgi-service-component") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5404,7 +5404,7 @@ the support annotations for osgi-service-component.") #:tests? #f)); no tests (inputs `(("annotation" ,java-osgi-annotation))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Data Transfer Objects") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5435,7 +5435,7 @@ objects of the listed types or aggregates.") (inputs `(("annotation" ,java-osgi-annotation) ("dto" ,java-osgi-dto))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGI Resource") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5463,7 +5463,7 @@ the definition of common types in osgi packages.") (arguments `(#:jar-name "osgi-namespace-contract.jar" #:tests? #f)); no tests - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Contract Capability and Requirement Namespace") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5491,7 +5491,7 @@ the names for the attributes and directives for a namespace with contracts.") (arguments `(#:jar-name "osgi-namespace-extendent.jar" #:tests? #f)); no tests - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Extender Capability and Requirement Namespace") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5519,7 +5519,7 @@ the names for the attributes and directives for an extender namespace.") (arguments `(#:jar-name "osgi-namespace-service.jar" #:tests? #f)); no tests - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Service Capability and Requirement Namespace") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5546,7 +5546,7 @@ the names for the attributes and directives for a service namespace.") #:tests? #f)); no tests (inputs `(("annotation" ,java-osgi-annotation))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGI Util Function") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5574,7 +5574,7 @@ an interface for a function that accepts a single argument and produces a result (inputs `(("annotation" ,java-osgi-annotation) ("function" ,java-osgi-util-function))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Promise of a value") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5602,7 +5602,7 @@ value. It handles the interactions for asynchronous processing.") #:tests? #f)); no tests (inputs `(("annotation" ,java-osgi-annotation))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Support annotations for metatype") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5631,7 +5631,7 @@ the support annotations for metatype.") `(("annotation" ,java-osgi-annotation) ("promise" ,java-osgi-util-promise) ("resource" ,java-osgi-resource))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGI service repository") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5659,7 +5659,7 @@ a repository service that contains resources.") `(("annotation" ,java-osgi-annotation) ("resource" ,java-osgi-resource) ("dto" ,java-osgi-dto))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGi framework") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5685,7 +5685,7 @@ and service platform for the Java programming language.") #:tests? #f)); no tests (inputs `(("java-osgi-framework" ,java-osgi-framework))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Provides methods for bundles to write messages to the log") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5710,7 +5710,7 @@ the log service.") (arguments `(#:jar-name "osgi-service-jdbc.jar" #:tests? #f)); no tests - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Factory for JDBC connection factories") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5745,7 +5745,7 @@ factories for getting JDBC connections: (inputs `(("annotation" ,java-osgi-annotation) ("resource" ,java-osgi-resource))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGI Resolver service") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5774,7 +5774,7 @@ by the caller.") (inputs `(("framework" ,java-osgi-framework) ("annotation" ,java-osgi-annotation))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "Bundle tracking") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5802,7 +5802,7 @@ bundle tracking utility classes.") (inputs `(("framework" ,java-osgi-framework) ("annotation" ,java-osgi-annotation))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGI Configuration Management") (description "OSGi, for Open Services Gateway initiative framework, is a module system @@ -5829,7 +5829,7 @@ utility classes for the configuration of services.") #:tests? #f)); no tests (inputs `(("framework" ,java-osgi-framework))) - (home-page "http://www.osgi.org") + (home-page "https://www.osgi.org") (synopsis "OSGI Package Administration") (description "OSGi, for Open Services Gateway initiative framework, is a module system -- cgit v1.3 From 1d47ea86ff2fca7d34908501ec3232a68ea4c7d9 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 15 Jan 2018 22:52:59 +0800 Subject: gnu: clojure: Update to 1.9.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (clojure): Update to 1.9.0. Add "core-specs-alpha-src" and "spec-alpha-src". Remove "java-classpath-src" and "tools-reader-src". Signed-off-by: Ludovic Courtès --- gnu/packages/java.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 32d3a287d89..e2a0f75f76e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2016, 2017 Alex Vong +;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -1833,15 +1833,15 @@ IcedTea build harness.") (snippet remove-archives))))) (package (name "clojure") - (version "1.8.0") + (version "1.9.0") (source (origin (method url-fetch) (uri - (string-append "http://repo1.maven.org/maven2/org/clojure/clojure/" - version "/clojure-" version ".zip")) + (string-append "https://github.com/clojure/clojure/archive/clojure-" + version ".tar.gz")) (sha256 - (base32 "1nip095fz5c492sw15skril60i1vd21ibg6szin4jcvyy3xr6cym")) + (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")) (modules '((guix build utils))) (snippet remove-archives))) (build-system ant-build-system) @@ -1871,12 +1871,12 @@ IcedTea build harness.") (error "failed to unpack tarball" name))) (copy-recursively (string-append name "/src/main/clojure/") "src/clj/")) - '("data-generators-src" - "java-classpath-src" + '("core-specs-alpha-src" + "data-generators-src" + "spec-alpha-src" "test-check-src" "test-generative-src" - "tools-namespace-src" - "tools-reader-src")) + "tools-namespace-src")) #t)) ;; The javadoc target is not built by default. (add-after 'build 'build-doc @@ -1908,14 +1908,18 @@ IcedTea build harness.") #t)))))) ;; The native-inputs below are needed to run the tests. (native-inputs - `(("data-generators-src" + `(("core-specs-alpha-src" + ,(submodule "core.specs.alpha/archive/core.specs.alpha-" + "0.1.24" + "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) + ("data-generators-src" ,(submodule "data.generators/archive/data.generators-" "0.1.2" "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) - ("java-classpath-src" - ,(submodule "java.classpath/archive/java.classpath-" - "0.2.3" - "0sjymly9xh1lkvwn5ygygpsfwz4dabblnlq0c9bx76rkvq62fyng")) + ("spec-alpha-src" + ,(submodule "spec.alpha/archive/spec.alpha-" + "0.1.143" + "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) ("test-check-src" ,(submodule "test.check/archive/test.check-" "0.9.0" @@ -1927,11 +1931,7 @@ IcedTea build harness.") ("tools-namespace-src" ,(submodule "tools.namespace/archive/tools.namespace-" "0.2.11" - "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")) - ("tools-reader-src" - ,(submodule "tools.reader/archive/tools.reader-" - "1.0.0" - "1lafblmmj4hkg0aqrf19qkdw9wdcsh3qxmn6cbkmnzbhffpyv2lv")))) + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") (description "Clojure is a dynamic, general-purpose programming language, -- cgit v1.3