Apollon Oikonomopoulos pushed to branch master at Debian Java Maintainers / trapperkeeper-clojure
Commits: 9353c936 by Apollon Oikonomopoulos at 2019-02-19T01:05:30Z Use nrepl instead of tools.nrepl B-D on libnrepl-clojure (>= 0.4.0) and adjust the namespaces throughout the code. - - - - - 597ac139 by Apollon Oikonomopoulos at 2019-02-19T01:05:30Z Sort test files - - - - - 4e9f40cb by Apollon Oikonomopoulos at 2019-02-19T01:05:30Z Bump Standards-Version to 4.3.0; no changes needed - - - - - 45d06724 by Apollon Oikonomopoulos at 2019-02-19T01:05:30Z Bump dh compat to 11; no changes needed - - - - - 7c7382f0 by Apollon Oikonomopoulos at 2019-02-19T01:07:06Z Switch Vcs-* URLs to salsa.d.o - - - - - ebb284e1 by Apollon Oikonomopoulos at 2019-02-19T01:07:22Z Release 1.5.2-2 - - - - - 6 changed files: - debian/changelog - debian/compat - debian/control - + debian/patches/0001-Switch-from-tools.nrepl-to-nrepl.patch - + debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +trapperkeeper-clojure (1.5.2-2) unstable; urgency=medium + + * Use nrepl instead of tools.nrepl + * Sort test files + * Bump Standards-Version to 4.3.0; no changes needed + * Bump dh compat to 11; no changes needed + * Switch Vcs-* URLs to salsa.d.o + + -- Apollon Oikonomopoulos <[email protected]> Tue, 19 Feb 2019 03:05:32 +0200 + trapperkeeper-clojure (1.5.2-1) unstable; urgency=medium * Initial release (Closes: #855741) ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== @@ -4,12 +4,12 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Apollon Oikonomopoulos <[email protected]> Build-Depends: - debhelper (>= 10), + debhelper (>= 11), javahelper (>= 0.32), maven-repo-helper (>= 1.7), clojure (>= 1.8), libtools-logging-clojure, - libtools-nrepl-clojure, + libnrepl-clojure (>= 0.4.0), libtools-macro-clojure, libcore-async-clojure, libslf4j-java, @@ -25,9 +25,9 @@ Build-Depends: libkitchensink-clojure, libtext-markdown-perl | markdown, default-jdk-headless -Standards-Version: 4.0.0 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/trapperkeeper-clojure.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/trapperkeeper-clojure.git +Standards-Version: 4.3.0 +Vcs-Git: https://salsa.debian.org/java-team/trapperkeeper-clojure.git +Vcs-Browser: https://salsa.debian.org/java-team/trapperkeeper-clojure Homepage: https://github.com/puppetlabs/trapperkeeper Package: libtrapperkeeper-clojure ===================================== debian/patches/0001-Switch-from-tools.nrepl-to-nrepl.patch ===================================== @@ -0,0 +1,66 @@ +From: Apollon Oikonomopoulos <[email protected]> +Date: Tue, 19 Feb 2019 02:56:20 +0200 +Subject: Switch from tools.nrepl to nrepl + +nrepl >= 0.4 uses different namespaces than tools.nrepl, so adjust +accordingly. +--- + project.clj | 2 +- + src/puppetlabs/trapperkeeper/services/nrepl/nrepl_service.clj | 2 +- + test/puppetlabs/trapperkeeper/services/nrepl/nrepl_service_test.clj | 2 +- + .../trapperkeeper/services/nrepl/nrepl_test_send_middleware.clj | 6 +++--- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/project.clj b/project.clj +index 076f9a2..2b47b53 100644 +--- a/project.clj ++++ b/project.clj +@@ -12,7 +12,7 @@ + :pedantic? :abort + :dependencies [[org.clojure/clojure] + [org.clojure/tools.logging] +- [org.clojure/tools.nrepl] ++ [nrepl] + [org.clojure/tools.macro] + [org.clojure/core.async] + +diff --git a/src/puppetlabs/trapperkeeper/services/nrepl/nrepl_service.clj b/src/puppetlabs/trapperkeeper/services/nrepl/nrepl_service.clj +index 8b6c78d..d0487d8 100644 +--- a/src/puppetlabs/trapperkeeper/services/nrepl/nrepl_service.clj ++++ b/src/puppetlabs/trapperkeeper/services/nrepl/nrepl_service.clj +@@ -1,7 +1,7 @@ + (ns puppetlabs.trapperkeeper.services.nrepl.nrepl-service + (:require + [clojure.tools.logging :as log] +- [clojure.tools.nrepl.server :as nrepl] ++ [nrepl.server :as nrepl] + [puppetlabs.kitchensink.core :refer [to-bool]] + [puppetlabs.trapperkeeper.core :refer [defservice]])) + +diff --git a/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_service_test.clj b/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_service_test.clj +index e90df56..c8fae46 100644 +--- a/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_service_test.clj ++++ b/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_service_test.clj +@@ -1,6 +1,6 @@ + (ns puppetlabs.trapperkeeper.services.nrepl.nrepl-service-test + (:require [clojure.test :refer :all] +- [clojure.tools.nrepl :as repl] ++ [nrepl :as repl] + [puppetlabs.trapperkeeper.testutils.bootstrap :refer [with-app-with-config]] + [puppetlabs.trapperkeeper.services.nrepl.nrepl-service :refer :all] + [schema.test :as schema-test])) +diff --git a/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_test_send_middleware.clj b/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_test_send_middleware.clj +index da7dc50..3288af0 100644 +--- a/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_test_send_middleware.clj ++++ b/test/puppetlabs/trapperkeeper/services/nrepl/nrepl_test_send_middleware.clj +@@ -1,7 +1,7 @@ + (ns puppetlabs.trapperkeeper.services.nrepl.nrepl-test-send-middleware +- (:require [clojure.tools.nrepl.transport :as t] +- [clojure.tools.nrepl.middleware :refer [set-descriptor!]]) +- (:use [clojure.tools.nrepl.misc :only [response-for]])) ++ (:require [nrepl.transport :as t] ++ [nrepl.middleware :refer [set-descriptor!]]) ++ (:use [nrepl.misc :only [response-for]])) + + (defn send-test + [h] ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +0001-Switch-from-tools.nrepl-to-nrepl.patch ===================================== debian/rules ===================================== @@ -6,7 +6,7 @@ MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md)) PRODUCED_JAR=trapperkeeper.jar TEST_JAR=trapperkeeper-test.jar -export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/tools.logging.jar:/usr/share/java/tools.nrepl.jar:/usr/share/java/tools.macro.jar:/usr/share/java/core.async.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/log4j-over-slf4j.jar:/usr/share/java/logback-classic.jar:/usr/share/java/logback-core.jar:/usr/share/java/logback-access.jar:/usr/share/java/janino.jar:/usr/share/java/clj-time.jar:/usr/share/java/raynes-fs.jar:/usr/share/java/clj-yaml.jar:/usr/share/java/prismatic-plumbing.jar:/usr/share/java/prismatic-schema.jar:/usr/share/java/beckon.jar:/usr/share/java/clj-typesafe-config.jar:/usr/share/java/kitchensink.jar +export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/tools.logging.jar:/usr/share/java/nrepl.jar:/usr/share/java/tools.macro.jar:/usr/share/java/core.async.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/log4j-over-slf4j.jar:/usr/share/java/logback-classic.jar:/usr/share/java/logback-core.jar:/usr/share/java/logback-access.jar:/usr/share/java/janino.jar:/usr/share/java/clj-time.jar:/usr/share/java/raynes-fs.jar:/usr/share/java/clj-yaml.jar:/usr/share/java/prismatic-plumbing.jar:/usr/share/java/prismatic-schema.jar:/usr/share/java/beckon.jar:/usr/share/java/clj-typesafe-config.jar:/usr/share/java/kitchensink.jar TEST_CLASSPATH=$(CURDIR)/test:/usr/share/java/kitchensink-test.jar %: @@ -37,5 +37,6 @@ override_dh_installdocs: override_dh_auto_test: -mkdir test/target (cd test && find . -name "*.clj" -not -path '*/testutils/*' | \ + LC_ALL=C sort | \ xargs --verbose clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH):$(TEST_CLASSPATH)) rm -rf test/target View it on GitLab: https://salsa.debian.org/java-team/trapperkeeper-clojure/compare/d61cc726d640fb66647eae101cb0cf3703e2e26f...ebb284e1f20b17181452ec04fb194fc64b64b33b -- View it on GitLab: https://salsa.debian.org/java-team/trapperkeeper-clojure/compare/d61cc726d640fb66647eae101cb0cf3703e2e26f...ebb284e1f20b17181452ec04fb194fc64b64b33b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
