[Git][clojure-team/trapperkeeper-metrics-clojure][debian/main] 6 commits: d/patches: require clojure 1.x in lein local
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Tue Feb 7 17:41:47 GMT 2023
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-metrics-clojure
Commits:
48f7e98f by Jérôme Charaoui at 2023-02-06T23:19:27-05:00
d/patches: require clojure 1.x in lein local
- - - - -
0a6c16e0 by Jérôme Charaoui at 2023-02-07T12:19:52-05:00
drop jackson and snakeyaml version overrides
Avoid leaking bogus dependency versions in maven-repo. Requires updated
build-deps where the issue is fixed and makes the project.clj overrides
obsolete.
Closes: #1030427
- - - - -
015d6732 by Jérôme Charaoui at 2023-02-07T12:20:34-05:00
d/control: add myself to Uploaders
- - - - -
1bbc93e9 by Jérôme Charaoui at 2023-02-07T12:23:28-05:00
d/rules: fix FTBFS when package is used as Build-Dep
- - - - -
b9f2494f by Jérôme Charaoui at 2023-02-07T12:34:48-05:00
d/tests: streamline classpaths
- - - - -
7db0ff9e by Jérôme Charaoui at 2023-02-07T12:35:53-05:00
Update changelog for 1.5.0-4 release
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/patches/0001_Lein_Local.patch
- debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch
- debian/rules
- debian/tests/smoke
- debian/tests/upstream
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+trapperkeeper-metrics-clojure (1.5.0-4) unstable; urgency=medium
+
+ * drop jackson and snakeyaml version overrides (Closes: #1030427)
+ * d/control: add myself to Uploaders
+ * d/patches: require clojure 1.x in lein local
+ * d/rules: fix FTBFS when package is used as Build-Dep
+ * d/tests: streamline classpaths
+
+ -- Jérôme Charaoui <jerome at riseup.net> Tue, 07 Feb 2023 12:35:33 -0500
+
trapperkeeper-metrics-clojure (1.5.0-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -4,9 +4,10 @@ Priority: optional
Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
Uploaders:
Apollon Oikonomopoulos <apoikos at debian.org>,
+ Jérôme Charaoui <jerome at riseup.net>,
Build-Depends:
debhelper-compat (= 13),
- default-jdk,
+ default-jdk-headless,
javahelper,
leiningen,
libbcpkix-java,
@@ -17,17 +18,17 @@ Build-Depends:
libdropwizard-metrics-java,
libjava-jmx-clojure,
libjolokia-core-java,
- libkitchensink-clojure (>= 3.1.1-2) <!nocheck>,
+ libkitchensink-clojure (>= 3.2.1) <!nocheck>,
libprismatic-schema-clojure (>= 1.1.12),
- libpuppetlabs-http-client-clojure (>= 1.2.0-5) <!nocheck>,
- libpuppetlabs-i18n-clojure (>= 0.9.0-2),
- libpuppetlabs-ring-middleware-clojure (>= 1.3.0),
+ libpuppetlabs-http-client-clojure (>= 2.0.1-4) <!nocheck>,
+ libpuppetlabs-i18n-clojure (>= 0.9.2-2),
+ libpuppetlabs-ring-middleware-clojure (>= 1.3.1-3),
libring-defaults-clojure,
libring-servlet-clojure,
libtools-logging-clojure,
- libtrapperkeeper-authorization-clojure (>= 1.0.0-2),
- libtrapperkeeper-clojure (>= 3.1.0),
- libtrapperkeeper-webserver-jetty9-clojure <!nocheck>,
+ libtrapperkeeper-authorization-clojure (>= 1.0.0-3),
+ libtrapperkeeper-clojure (>= 3.2.0-2),
+ libtrapperkeeper-webserver-jetty9-clojure (>= 4.4.1-4) <!nocheck>,
maven-repo-helper,
Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure.git
=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -4,36 +4,49 @@ Subject: Patch project.clj to build locally using lein.
Forwarded: not-needed
---
- project.clj | 76 +++++++++++++++++++++++++++++++++----------------------------
- 1 file changed, 41 insertions(+), 35 deletions(-)
+ project.clj | 67 ++++++++++++++++++++++++-------------------------------------
+ 1 file changed, 26 insertions(+), 41 deletions(-)
-Index: trapperkeeper-metrics-clojure/project.clj
-===================================================================
---- trapperkeeper-metrics-clojure.orig/project.clj
-+++ trapperkeeper-metrics-clojure/project.clj
-@@ -4,34 +4,38 @@
+diff --git a/project.clj b/project.clj
+index b47f215..e5406f4 100644
+--- a/project.clj
++++ b/project.clj
+@@ -4,34 +4,28 @@
:min-lein-version "2.9.1"
- :pedantic? :abort
-+ :dependencies [[org.clojure/clojure "1.10.x"]
++ :dependencies [[org.clojure/clojure "1.x"]
- :parent-project {:coords [puppetlabs/clj-parent "5.2.6"]
- :inherit [:managed-dependencies]}
+ [prismatic/schema "debian"]
- :dependencies [[org.clojure/clojure]
--
++ [puppetlabs/kitchensink "debian"]
++ [puppetlabs/trapperkeeper "debian"]
++ [puppetlabs/trapperkeeper-authorization "debian"]
++ [puppetlabs/ring-middleware "debian"]
+
- [prismatic/schema]
--
++ [cheshire "debian"]
++ [org.clojure/java.jmx "debian"]
+
- [puppetlabs/kitchensink]
- [puppetlabs/trapperkeeper]
- [puppetlabs/trapperkeeper-authorization]
- [puppetlabs/ring-middleware]
--
++ [ring/ring-defaults "debian"]
+
- [cheshire]
- [org.clojure/java.jmx]
--
++ [org.clojure/tools.logging "debian"]
++ [io.dropwizard.metrics/metrics-core "debian"]
++ [io.dropwizard.metrics/metrics-graphite "debian"]
++ [org.jolokia/jolokia-core "debian"]
++ [puppetlabs/comidi "debian"]
++ [puppetlabs/i18n "debian"]]
+
- [ring/ring-defaults]
-
- [org.clojure/tools.logging]
@@ -45,38 +58,11 @@ Index: trapperkeeper-metrics-clojure/project.clj
-
- :plugins [[puppetlabs/i18n "0.6.0"]
- [lein-parent "0.3.7"]]
-+ [puppetlabs/kitchensink "debian"]
-+ [puppetlabs/trapperkeeper "debian"]
-+ [puppetlabs/trapperkeeper-authorization "debian"]
-+ [puppetlabs/ring-middleware "debian"]
-+
-+ [cheshire "debian"]
-+ [org.clojure/java.jmx "debian"]
-+
-+ [ring/ring-defaults "debian"]
-+
-+ [org.clojure/tools.logging "debian"]
-+ [io.dropwizard.metrics/metrics-core "debian"]
-+ [io.dropwizard.metrics/metrics-graphite "debian"]
-+ [org.jolokia/jolokia-core "debian"]
-+ [puppetlabs/comidi "debian"]
-+ [puppetlabs/i18n "debian"]]
-+
-+ :managed-dependencies [[org.yaml/snakeyaml "1.x"]
-+ [com.fasterxml.jackson.core/jackson-core "2.x"]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.x"]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.x"]
-+ [org.eclipse.jetty/jetty-jmx "9.x"]
-+ [org.eclipse.jetty/jetty-proxy "9.x"]
-+ [org.eclipse.jetty/jetty-server "9.x"]
-+ [org.eclipse.jetty/jetty-servlet "9.x"]
-+ [org.eclipse.jetty/jetty-servlets "9.x"]
-+ [org.eclipse.jetty/jetty-webapp "9.x"]
-+ [org.flatland/ordered "debian"]]
++ :plugins [[puppetlabs/i18n "debian" :exclusions [org.clojure/clojure]]]
:source-paths ["src/clj"]
:java-source-paths ["src/java"]
-@@ -43,34 +47,23 @@
+@@ -43,34 +37,23 @@
:classifiers [["test" :testutils]]
@@ -118,7 +104,7 @@ Index: trapperkeeper-metrics-clojure/project.clj
:resource-paths ["dev-resources"]}
:testutils {:source-paths ^:replace ["test"]
-@@ -78,4 +71,6 @@
+@@ -78,4 +61,6 @@
:repl-options {:init-ns examples.ring-app.repl}
=====================================
debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch
=====================================
@@ -7,10 +7,10 @@ Forwarded: https://github.com/puppetlabs/trapperkeeper-metrics/pull/77
test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: trapperkeeper-metrics-clojure/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj
-===================================================================
---- trapperkeeper-metrics-clojure.orig/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj
-+++ trapperkeeper-metrics-clojure/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj
+diff --git a/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj b/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj
+index ca94b60..2162ffb 100644
+--- a/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj
++++ b/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj
@@ -1,6 +1,7 @@
(ns puppetlabs.trapperkeeper.services.metrics.metrics-testutils
(:import (com.codahale.metrics.graphite GraphiteSender))
=====================================
debian/rules
=====================================
@@ -14,7 +14,10 @@ override_dh_auto_configure:
cd debian && ln -sf /usr/share/maven-repo .
override_dh_auto_build:
- lein pom debian/pom.xml
+ # "with-profile -dev" below is a workaround for
+ # https://codeberg.org/leiningen/leiningen/issues/14
+ # upstream needs to fix their project.clj
+ lein with-profile -dev pom debian/pom.xml
lein jar
# symlink so we don't need a version in debian/*.poms
cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
=====================================
debian/tests/smoke
=====================================
@@ -1,5 +1,5 @@
#!/bin/sh
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/trapperkeeper-metrics.jar
+CLASSPATH=/usr/share/java/trapperkeeper-metrics.jar
-clojure -cp $CLASSPATH -e '(use '"'"'puppetlabs.metrics)'
+clojure -cp $CLASSPATH -e '(use '"'"'puppetlabs.trapperkeeper.services.metrics.metrics-core)'
=====================================
debian/tests/upstream
=====================================
@@ -1,7 +1,8 @@
#!/bin/sh
+
set -efu
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/schema.jar:/usr/share/java/kitchensink.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-authorization.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/cheshire.jar:/usr/share/java/java.jmx.jar:/usr/share/java/ring-defaults.jar:/usr/share/java/tools.logging.jar:/usr/share/java/metrics-core.jar:/usr/share/java/metrics-graphite.jar:/usr/share/java/comidi.jar:/usr/share/java/puppetlabs-i18n.jar:/usr/share/java/trapperkeeper-metrics.jar:/usr/share/java/trapperkeeper-webserver-jetty9.jar:test
+CLASSPATH=/usr/share/java/bultitude.jar:/usr/share/java/trapperkeeper-webserver-jetty9.jar:/usr/share/java/puppetlabs-http-client.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-metrics.jar:test
cp -a dev-resources test "$AUTOPKGTEST_TMP"
cp debian/gen-pki.sh "$AUTOPKGTEST_TMP/dev-resources"
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/compare/0d3ad55950ae19f7d92539033aa188239b854c1a...7db0ff9ead8655d58f5f6caa677ebb61e63198c5
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/compare/0d3ad55950ae19f7d92539033aa188239b854c1a...7db0ff9ead8655d58f5f6caa677ebb61e63198c5
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/20230207/2e565261/attachment.htm>
More information about the pkg-java-commits
mailing list