[Git][clojure-team/trapperkeeper-scheduler-clojure][debian/main] 8 commits: d/patches: drop jackson and snakeyaml version overrides

Tue Feb 7 15:24:40 GMT 2023


Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-scheduler-clojure


Commits:
572ef858 by Jérôme Charaoui at 2023-02-07T09:00:59-05:00
d/patches: 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.

Also changes the clojure version dependency to use 1.x

- - - - -
9a602c4e by Jérôme Charaoui at 2023-02-07T09:01:00-05:00
fix bogus org.quartz-scheduler "debian" version in poms

- - - - -
c04d2ea9 by Jérôme Charaoui at 2023-02-07T09:01:01-05:00
d/control: add myself to Uploaders

- - - - -
3fb5b1dd by Jérôme Charaoui at 2023-02-07T09:01:01-05:00
d/control: use headless jdk in build-deps

- - - - -
e3cd8f7f by Jérôme Charaoui at 2023-02-07T09:01:02-05:00
d/control: remove unneeded test build-dep

- - - - -
339d9cec by Jérôme Charaoui at 2023-02-07T09:01:02-05:00
d/rules: remove "ressources" form dh_clean

- - - - -
1be15bbe by Jérôme Charaoui at 2023-02-07T10:00:41-05:00
d/tests: mark upstream testsuite as flaky

The upstream tests are flaky in autopkgtests, possibly because of short
timeouts. Might be fixable but it shouldn't block migration to stable as
these tests are new. Also, a container is not really needed for these
tests.

- - - - -
f1b58e3b by Jérôme Charaoui at 2023-02-07T10:17:23-05:00
Update changelog for 1.1.3-7 release

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/maven.rules
- debian/patches/0001_Lein_Local.patch
- debian/rules
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+trapperkeeper-scheduler-clojure (1.1.3-7) unstable; urgency=medium
+
+  * d/patches: drop jackson and snakeyaml version overrides
+  * d/control:
+    + add myself to Uploaders
+    + use headless jdk in build-deps
+    - remove unneeded test build-dep
+  * d/rules: remove "ressources" form dh_clean
+  * d/tests: mark upstream testsuite as flaky
+  * fix bogus org.quartz-scheduler "debian" version in poms
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Tue, 07 Feb 2023 09:59:17 -0500
+
 trapperkeeper-scheduler-clojure (1.1.3-6) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -2,18 +2,19 @@ Source: trapperkeeper-scheduler-clojure
 Section: java
 Priority: optional
 Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
-Uploaders: Apollon Oikonomopoulos <apoikos at 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,
  maven-repo-helper,
- libclojure-java,
- libtrapperkeeper-clojure (>= 3.1.0),
- libpuppetlabs-i18n-clojure (>= 0.9.0),
- libkitchensink-clojure (>= 3.1.1-2),
+ libclojure-java (>= 1.11.1-2),
+ libtrapperkeeper-clojure (>= 3.2.0-2),
+ libpuppetlabs-i18n-clojure (>= 0.9.2-2),
+ libkitchensink-clojure (>= 3.2.1),
  libquartz2-java,
- libcomplete-clojure <!nocheck>,
  leiningen,
 Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/clojure-team/trapperkeeper-scheduler-clojure.git


=====================================
debian/maven.rules
=====================================
@@ -0,0 +1,3 @@
+# with patched project.clj
+# do not apply any version rules
+org.quartz-scheduler * * * *


=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -6,14 +6,14 @@ Patch project.clj to build locally using lein.
 
 Forwarded: not-needed
 ---
- project.clj | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
+ project.clj | 23 ++++++++++-------------
+ 1 file changed, 10 insertions(+), 13 deletions(-)
 
 diff --git a/project.clj b/project.clj
-index cb13b74..2a4d54a 100644
+index cb13b74..43eaeea 100644
 --- a/project.clj
 +++ b/project.clj
-@@ -1,17 +1,18 @@
+@@ -1,17 +1,14 @@
  (defproject puppetlabs/trapperkeeper-scheduler "1.1.3"
    :description "Trapperkeeper Scheduler Service"
  
@@ -22,15 +22,11 @@ index cb13b74..2a4d54a 100644
 -                 [puppetlabs/i18n]
 -                 [puppetlabs/kitchensink]
 -                 [org.quartz-scheduler/quartz "2.3.2" :exclusions [c3p0]]]
-+  :dependencies [[org.clojure/clojure "1.10.x"]
++  :dependencies [[org.clojure/clojure "1.x"]
 +                 [puppetlabs/trapperkeeper "debian"]
 +                 [puppetlabs/i18n "debian"]
 +                 [puppetlabs/kitchensink "debian"]
-+                 [org.quartz-scheduler/quartz "2.x" :exclusions [c3p0]]
-+                 [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.quartz-scheduler/quartz "2.x" :exclusions [c3p0]]]
  
    :min-lein-version "2.9.1"
  
@@ -40,7 +36,7 @@ index cb13b74..2a4d54a 100644
    :pedantic? :abort
  
    :test-paths ["test/unit" "test/integration"]
-@@ -25,10 +26,13 @@
+@@ -25,10 +22,10 @@
                                       :sign-releases false}]]
  
    :profiles {:dev {:source-paths ["dev"]
@@ -51,10 +47,7 @@ index cb13b74..2a4d54a 100644
  
 -  :plugins  [[lein-parent "0.3.7"]
 -             [puppetlabs/i18n "0.8.0"]]
-+  :plugins [[puppetlabs/i18n "debian" :exclusions [[org.clojure/clojure]
-+                                                   [com.fasterxml.jackson.core/jackson-core]
-+                                                   [com.fasterxml.jackson.dataformat/jackson-dataformat-smile]
-+                                                   [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]]]]
++  :plugins [[puppetlabs/i18n "debian" :exclusions [org.clojure/clojure]]]
    :aot [puppetlabs.trapperkeeper.services.scheduler.job]
 -  :repl-options {:init-ns user})
 +  :repl-options {:init-ns user}


=====================================
debian/rules
=====================================
@@ -31,6 +31,6 @@ override_dh_auto_test:
 
 override_dh_clean:
 	rm -f debian/maven-repo
-	rm -Rf target ressources
 	rm -f debian/pom.xml
+	rm -Rf target
 	dh_clean


=====================================
debian/tests/control
=====================================
@@ -9,4 +9,4 @@ Depends:
  clojure,
  libbultitude-clojure,
  @,
-Restrictions: isolation-container
+Restrictions: flaky



View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-scheduler-clojure/-/compare/8d10711b47d097580930646250d28d6034f96877...f1b58e3bfae546c8fff2d412709dcf5723de08ff

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-scheduler-clojure/-/compare/8d10711b47d097580930646250d28d6034f96877...f1b58e3bfae546c8fff2d412709dcf5723de08ff
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/752ec59d/attachment.htm>
