[Git][clojure-team/trapperkeeper-clojure][debian/main] 10 commits: remove dependency on nrepl-clojure
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Sat Feb 4 03:16:37 GMT 2023
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-clojure
Commits:
848fc074 by Jérôme Charaoui at 2023-02-03T15:58:40-05:00
remove dependency on nrepl-clojure
This downgrades the dependency on nrepl to Suggests: as it's not
strictly required for trapperkeeper to function in most contexts. The
testsuite expects it on the classpath however, so keep it as a
test-only Build-Dep (nocheck) and install it explicitely for
autopkgtests.
- - - - -
2ada2450 by Jérôme Charaoui at 2023-02-03T15:58:40-05:00
Update changelog for 3.2.0-2 release
- - - - -
66be2ce7 by Jérôme Charaoui at 2023-02-03T15:58:41-05:00
d/rules: get rid of override_jh_installlibs
Also installs the -test pom with a proper classifier.
- - - - -
f354aa52 by Jérôme Charaoui at 2023-02-03T15:58:41-05:00
d/patches: leiningen patch not relevant upstream
- - - - -
929ecad2 by Jérôme Charaoui at 2023-02-03T15:59:29-05:00
d/patches: renumber patches
Gbp-Dch: ignore
- - - - -
ef37e996 by Jérôme Charaoui at 2023-02-03T16:00:56-05:00
d/control: bump Standards-Version, no changes needed
- - - - -
286c9850 by Jérôme Charaoui at 2023-02-03T16:05:45-05:00
lint
Gbp-Dch: ignore
- - - - -
249dfa8d by Jérôme Charaoui at 2023-02-03T16:06:03-05:00
run wrap-and-sort -bastk
- - - - -
be832754 by Jérôme Charaoui at 2023-02-03T16:06:56-05:00
d/control: add myself to Uploaders
- - - - -
875a7d49 by Jérôme Charaoui at 2023-02-03T17:36:03-05:00
d/tests: run nrepl autopkgtest on amd64/arm64 only
- - - - -
12 changed files:
- debian/changelog
- debian/control
- debian/libtrapperkeeper-clojure.classpath
- debian/libtrapperkeeper-clojure.poms
- debian/patches/0001_Lein_Local.patch
- debian/patches/0001_Fix_Testsuite_Failure.patch → debian/patches/0002_Fix_Testsuite_Failure.patch
- + debian/patches/0003-Remove-nREPL-dependency.patch
- debian/patches/series
- debian/rules
- debian/tests/control
- + debian/tests/nrepl
- debian/tests/unittests
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+trapperkeeper-clojure (3.2.0-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * remove dependency on nrepl-clojure
+
+ -- Jérôme Charaoui <jerome at riseup.net> Fri, 03 Feb 2023 11:29:46 -0500
+
trapperkeeper-clojure (3.2.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -2,32 +2,34 @@ Source: trapperkeeper-clojure
Section: java
Priority: optional
Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
-Uploaders: Louis-Philippe Véronneau <pollo at debian.org>
+Uploaders:
+ Jérôme Charaoui <jerome at riseup.net>,
+ Louis-Philippe Véronneau <pollo at debian.org>,
Build-Depends:
debhelper-compat (= 13),
default-jdk-headless,
javahelper,
- maven-repo-helper,
+ leiningen,
+ libbeckon-clojure,
+ libclj-time-clojure (>= 0.15.2),
+ libclj-yaml-clojure,
libclojure-java,
- libtools-logging-clojure,
- libtools-macro-clojure,
+ libcomplete-clojure <!nocheck>,
libcore-async-clojure (>=1.3.610-4),
- libslf4j-java,
- liblogback-java,
libjanino-java,
- libclj-time-clojure (>= 0.15.2),
- libraynes-fs-clojure (>= 1.5.2),
- libclj-yaml-clojure,
+ libkitchensink-clojure (>= 3.1.1-2),
+ liblogback-java,
+ libnrepl-clojure <!nocheck>,
libprismatic-plumbing-clojure (>= 0.5.5-2),
libprismatic-schema-clojure (>= 1.1.12),
- libbeckon-clojure,
- libtypesafe-config-clojure,
- libkitchensink-clojure (>= 3.1.1-2),
libpuppetlabs-i18n-clojure (>= 0.9.0),
- libnrepl-clojure,
- libcomplete-clojure <!nocheck>,
- leiningen,
-Standards-Version: 4.6.1
+ libraynes-fs-clojure (>= 1.5.2),
+ libslf4j-java,
+ libtools-logging-clojure,
+ libtools-macro-clojure,
+ libtypesafe-config-clojure,
+ maven-repo-helper,
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/clojure-team/trapperkeeper-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/trapperkeeper-clojure
Homepage: https://github.com/puppetlabs/trapperkeeper
@@ -36,26 +38,28 @@ Rules-Requires-Root: no
Package: libtrapperkeeper-clojure
Architecture: all
Depends:
- ${java:Depends},
- ${misc:Depends},
- libclojure-java,
- libtools-logging-clojure,
- libtools-macro-clojure,
- libcore-async-clojure (>=1.3.610-4),
- libslf4j-java,
- liblogback-java,
- libjanino-java,
+ libbeckon-clojure,
libclj-time-clojure (>= 0.15.2),
- libraynes-fs-clojure (>= 1.5.2),
libclj-yaml-clojure,
+ libclojure-java,
+ libcore-async-clojure (>= 1.3.610-4),
+ libjanino-java,
+ libkitchensink-clojure (>= 3.1.1-2),
+ liblogback-java,
libprismatic-plumbing-clojure (>= 0.5.5-2),
libprismatic-schema-clojure (>= 1.1.12),
- libbeckon-clojure,
- libtypesafe-config-clojure,
- libkitchensink-clojure (>= 3.1.1-2),
libpuppetlabs-i18n-clojure (>= 0.9.0),
+ libraynes-fs-clojure (>= 1.5.2),
+ libslf4j-java,
+ libtools-logging-clojure,
+ libtools-macro-clojure,
+ libtypesafe-config-clojure,
+ ${java:Depends},
+ ${misc:Depends},
+Recommends:
+ ${java:Recommends},
+Suggests:
libnrepl-clojure,
-Recommends: ${java:Recommends}
Description: framework for configuring, composing and running Clojure services
Trapperkeeper is a Clojure framework for hosting long-running applications and
services. It acts as a sort of "binder" for Ring applications and other
=====================================
debian/libtrapperkeeper-clojure.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/trapperkeeper.jar /usr/share/java/clojure.jar /usr/share/java/tools.logging.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/fs.jar /usr/share/java/clj-yaml.jar /usr/share/java/plumbing.jar /usr/share/java/schema.jar /usr/share/java/beckon.jar /usr/share/java/clj-typesafe-config.jar /usr/share/java/kitchensink.jar /usr/share/java/puppetlabs-i18n.jar /usr/share/java/nrepl.jar
+usr/share/java/trapperkeeper.jar /usr/share/java/clojure.jar /usr/share/java/tools.logging.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/fs.jar /usr/share/java/clj-yaml.jar /usr/share/java/plumbing.jar /usr/share/java/schema.jar /usr/share/java/beckon.jar /usr/share/java/clj-typesafe-config.jar /usr/share/java/kitchensink.jar /usr/share/java/puppetlabs-i18n.jar
=====================================
debian/libtrapperkeeper-clojure.poms
=====================================
@@ -1 +1,2 @@
-debian/pom.xml --artifact=target/trapperkeeper.jar --usj-name=trapperkeeper
+debian/pom.xml --java-lib --artifact=target/trapperkeeper.jar --usj-name=trapperkeeper
+debian/pom.xml --java-lib --artifact=target/test/trapperkeeper-test.jar --usj-name=trapperkeeper-test --classifier=test
=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -2,6 +2,7 @@ From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
Date: Thu, 20 Oct 2022 20:20:26 -0400
Subject: Patch project.clj to build locally with lein.
+Forwarded: not-needed
---
project.clj | 55 ++++++++++++++++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 25 deletions(-)
=====================================
debian/patches/0001_Fix_Testsuite_Failure.patch → debian/patches/0002_Fix_Testsuite_Failure.patch
=====================================
=====================================
debian/patches/0003-Remove-nREPL-dependency.patch
=====================================
@@ -0,0 +1,28 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Wed, 1 Feb 2023 22:31:57 -0500
+Subject: Remove nREPL dependency
+
+This patch removes the nREPL dependency from trapperkeeper, which is only
+useful in development. In addition, enabling this service by accident
+may represent a security risk. And finally, since libnrepl-clojure is
+not arch:all in Debian, removing this dependency will unlock more
+architectures for TK and TK-dependent apps like puppetdb and
+puppetserver.
+
+Forwarded: not-needed
+---
+ project.clj | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/project.clj b/project.clj
+index f565446..259c96b 100644
+--- a/project.clj
++++ b/project.clj
+@@ -38,7 +38,6 @@
+ [puppetlabs/typesafe-config "debian"]
+ [puppetlabs/kitchensink "debian"]
+ [puppetlabs/i18n "debian"]
+- [nrepl/nrepl "debian"]
+
+ [org.yaml/snakeyaml "1.x"]
+ [com.fasterxml.jackson.core/jackson-core "2.x"]
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
0001_Lein_Local.patch
-0001_Fix_Testsuite_Failure.patch
+0002_Fix_Testsuite_Failure.patch
+0003-Remove-nREPL-dependency.patch
=====================================
debian/rules
=====================================
@@ -26,10 +26,6 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
lein test
endif
-override_jh_installlibs:
- jh_installlibs target/$(NAME).jar
- jh_installlibs target/test/$(NAME)-test.jar
-
override_dh_clean:
rm -f debian/maven-repo
rm -Rf target ressources
=====================================
debian/tests/control
=====================================
@@ -1,7 +1,19 @@
Tests: build
-Depends: @, clojure
+Depends:
+ clojure,
+ @,
Restrictions: superficial, allow-stderr
Tests: unittests
-Depends: @, clojure, libbultitude-clojure
-Restrictions: allow-stderr
+Depends:
+ clojure,
+ libbultitude-clojure,
+ @,
+
+Tests: nrepl
+Architecture: amd64, arm64
+Depends:
+ clojure,
+ libbultitude-clojure,
+ libnrepl-clojure,
+ @,
=====================================
debian/tests/nrepl
=====================================
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -efu
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/nrepl.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/kitchensink-test.jar:test
+
+cp -R test dev-resources plugin-test-resources "$AUTOPKGTEST_TMP"
+mkdir "$AUTOPKGTEST_TMP/target"
+touch "$AUTOPKGTEST_TMP/empty.ini"
+cd "$AUTOPKGTEST_TMP"
+
+clojure \
+ -cp $CLASSPATH \
+ -e "(require '[clojure.test])" \
+ -e "(require '[bultitude.core :as b])" \
+ -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
+ -e "(map #(require %) all-tests)" \
+ -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"puppetlabs.trapperkeeper.services.nrepl.\S+-test")) 0 1))'
=====================================
debian/tests/unittests
=====================================
@@ -8,10 +8,13 @@ mkdir "$AUTOPKGTEST_TMP/target"
touch "$AUTOPKGTEST_TMP/empty.ini"
cd "$AUTOPKGTEST_TMP"
+# don't load/run nrepl tests
+rm -rf test/puppetlabs/trapperkeeper/services/nrepl
+
clojure \
-cp $CLASSPATH \
-e "(require '[clojure.test])" \
-e "(require '[bultitude.core :as b])" \
-e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
-e "(map #(require %) all-tests)" \
- -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"puppetlabs.trapperkeeper.+-test")) 0 1))'
+ -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"puppetlabs.trapperkeeper.\S+-test")) 0 1))'
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/5c03a47632fc2e9a296db8f4c58d298b986af531...875a7d49d1d0dc974ac2988d7ff4933c9abfdfbe
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/5c03a47632fc2e9a296db8f4c58d298b986af531...875a7d49d1d0dc974ac2988d7ff4933c9abfdfbe
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230204/ca38a44b/attachment.htm>
More information about the pkg-java-commits
mailing list