[Git][clojure-team/puppetlabs-http-client-clojure][debian/main] 11 commits: Add missing direct dep and jar in classpath
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Sat Jul 9 05:54:38 BST 2022
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / puppetlabs-http-client-clojure
Commits:
e08e50cc by Jérôme Charaoui at 2022-07-08T21:44:11-04:00
Add missing direct dep and jar in classpath
- - - - -
4a1fa1d4 by Jérôme Charaoui at 2022-07-08T21:45:42-04:00
Bump Standards-Version to 4.6.1, no changes needed
- - - - -
cfa4d3c8 by Jérôme Charaoui at 2022-07-08T21:46:23-04:00
d/rules: skip tests when build options contain nocheck
- - - - -
3c36305e by Jérôme Charaoui at 2022-07-08T21:54:44-04:00
d/control: tag test-specific Build-Deps
- - - - -
82bdbcfe by Jérôme Charaoui at 2022-07-08T23:37:26-04:00
Regenerate PKI for tests, should fix repro builds
- - - - -
1d6bf789 by Jérôme Charaoui at 2022-07-08T23:55:05-04:00
Reenable unittests in autopkgtest
Also migrate to using bultitude for auto test discovery
- - - - -
bbf6fd0f by Jérôme Charaoui at 2022-07-08T23:55:09-04:00
Add d/salsa-ci.yml
- - - - -
08de9ae9 by Jérôme Charaoui at 2022-07-08T23:55:09-04:00
Add d/upstream/metadata
- - - - -
6032095c by Jérôme Charaoui at 2022-07-09T00:17:48-04:00
Refresh Lein Local patch
- - - - -
220b3363 by Jérôme Charaoui at 2022-07-09T00:17:48-04:00
Add patch to fix dev-resources/gen-pki.sh in tests
- - - - -
9d2bb88b by Jérôme Charaoui at 2022-07-09T00:18:17-04:00
Update changelog for 1.2.0-4 release
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/libpuppetlabs-http-client-clojure.classpath
- debian/patches/0001_Lein_Local.patch
- + debian/patches/0003-Avoid-exit-code-1-when-running-gen-pki.sh-during-tes.patch
- debian/patches/series
- debian/rules
- + debian/salsa-ci.yml
- debian/tests/control
- debian/tests/unittests
- + debian/upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+puppetlabs-http-client-clojure (1.2.0-4) unstable; urgency=medium
+
+ * Team upload.
+ * Add missing direct dep and jar in classpath
+ * Bump Standards-Version to 4.6.1, no changes needed
+ * d/rules: skip tests when build options contain nocheck
+ * d/control: tag test-specific Build-Deps
+ * Regenerate PKI for tests, should fix repro builds
+ * Reenable unittests in autopkgtest
+ * Add d/salsa-ci.yml
+ * Add d/upstream/metadata
+ * Refresh Lein Local patch
+ * Add patch to fix dev-resources/gen-pki.sh in tests
+
+ -- Jérôme Charaoui <jerome at riseup.net> Sat, 09 Jul 2022 00:18:07 -0400
+
puppetlabs-http-client-clojure (1.2.0-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -9,6 +9,7 @@ Build-Depends:
javahelper,
maven-repo-helper,
libclojure-java,
+ libhttpclient-java,
libhttpasyncclient-java,
libprismatic-schema-clojure (>= 1.1.12),
libcommons-io-java,
@@ -16,15 +17,16 @@ Build-Depends:
libssl-utils-clojure (>= 3.1.0),
libpuppetlabs-i18n-clojure (>= 0.9.0-2),
libslf4j-java,
- libcheshire-clojure,
- libkitchensink-clojure (>= 3.1.1-2),
- libtrapperkeeper-clojure (>= 3.1.0),
- libtrapperkeeper-webserver-jetty9-clojure (>= 4.1.0-2),
- libpuppetlabs-ring-middleware-clojure (>= 1.3.0),
- libbcpkix-java,
+ libcheshire-clojure <!nocheck>,
+ libkitchensink-clojure (>= 3.1.1-2) <!nocheck>,
+ libtrapperkeeper-clojure (>= 3.1.0) <!nocheck>,
+ libtrapperkeeper-webserver-jetty9-clojure (>= 4.1.0-2) <!nocheck>,
+ libpuppetlabs-ring-middleware-clojure (>= 1.3.0) <!nocheck>,
+ libbcpkix-java <!nocheck>,
libcomplete-clojure <!nocheck>,
leiningen,
-Standards-Version: 4.5.1
+ openssl <!nocheck>
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure
Homepage: https://github.com/puppetlabs/clj-http-client
@@ -36,6 +38,7 @@ Depends:
${java:Depends},
${misc:Depends},
libclojure-java,
+ libhttpclient-java,
libhttpasyncclient-java,
libprismatic-schema-clojure (>= 1.1.12),
libcommons-io-java,
=====================================
debian/libpuppetlabs-http-client-clojure.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/puppetlabs-http-client.jar /usr/share/java/clojure.jar /usr/share/java/httpasyncclient.jar /usr/share/java/http-nio.jar /usr/share/java/schema.jar /usr/share/java/commons-io.jar /usr/share/java/metrics-core.jar /usr/share/java/ssl-utils.jar /usr/share/java/puppetlabs-i18n.jar /usr/share/java/jul-to-slf4j.jar
+usr/share/java/puppetlabs-http-client.jar /usr/share/java/clojure.jar /usr/share/java/httpclient.jar /usr/share/java/httpasyncclient.jar /usr/share/java/http-nio.jar /usr/share/java/schema.jar /usr/share/java/commons-io.jar /usr/share/java/metrics-core.jar /usr/share/java/ssl-utils.jar /usr/share/java/puppetlabs-i18n.jar /usr/share/java/jul-to-slf4j.jar
=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -1,8 +1,16 @@
-Patch project.clj to build locally using lein.
-Index: puppetlabs-http-client-clojure/project.clj
-===================================================================
---- puppetlabs-http-client-clojure.orig/project.clj
-+++ puppetlabs-http-client-clojure/project.clj
+From: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
+Date: Fri, 8 Jul 2022 23:55:20 -0400
+Subject: Patch project.clj to build locally using lein.
+
+Forwarded: not-needed
+---
+ project.clj | 58 +++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 31 insertions(+), 27 deletions(-)
+
+diff --git a/project.clj b/project.clj
+index 576c490..8db6c3c 100644
+--- a/project.clj
++++ b/project.clj
@@ -5,25 +5,22 @@
:min-lein-version "2.9.1"
@@ -15,28 +23,25 @@ Index: puppetlabs-http-client-clojure/project.clj
- ;; dependencies. Also supports :warn to simply emit warnings.
- ;; requires lein 2.2.0+.
- :pedantic? :abort
--
++ [org.apache.httpcomponents/httpasyncclient "debian"]
++ [prismatic/schema "debian"]
++ [commons-io "debian"]
++ [io.dropwizard.metrics/metrics-core "debian"]
+
- :dependencies [[org.clojure/clojure]
--
++ [puppetlabs/ssl-utils "debian"]
++ [puppetlabs/i18n "debian"]
+
- [org.apache.httpcomponents/httpasyncclient]
- [prismatic/schema]
- [commons-io]
- [io.dropwizard.metrics/metrics-core]
--
++ [org.slf4j/jul-to-slf4j "debian"]
+
- [puppetlabs/ssl-utils]
- [puppetlabs/i18n]
-
- [org.slf4j/jul-to-slf4j]]
-+ [org.apache.httpcomponents/httpasyncclient "debian"]
-+ [prismatic/schema "debian"]
-+ [commons-io "debian"]
-+ [io.dropwizard.metrics/metrics-core "debian"]
-+
-+ [puppetlabs/ssl-utils "debian"]
-+ [puppetlabs/i18n "debian"]
-+
-+ [org.slf4j/jul-to-slf4j "debian"]
-+
+ [org.yaml/snakeyaml "1.x"]
+ [com.fasterxml.jackson.core/jackson-core "2.x"]
+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.x"]
=====================================
debian/patches/0003-Avoid-exit-code-1-when-running-gen-pki.sh-during-tes.patch
=====================================
@@ -0,0 +1,19 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Fri, 8 Jul 2022 23:59:44 -0400
+Subject: Avoid exit code 1 when running gen-pki.sh during tests
+
+Forwarded: not-needed
+---
+ dev-resources/gen-pki.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dev-resources/gen-pki.sh b/dev-resources/gen-pki.sh
+index c7c70e0..2e32a26 100755
+--- a/dev-resources/gen-pki.sh
++++ b/dev-resources/gen-pki.sh
+@@ -51,4 +51,4 @@ openssl req -x509 \
+
+ echo
+ echo "Cleaning up files that will not be used by the tests"
+-rm dev-resources/ssl/{alternate-ca.key,ca.key,ca.srl,csr.pem}
++rm -f dev-resources/ssl/{alternate-ca.key,ca.key,ca.srl,csr.pem}
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
0001_Lein_Local.patch
0002_Fix_Testsuite_Failure.patch
+0003-Avoid-exit-code-1-when-running-gen-pki.sh-during-tes.patch
=====================================
debian/rules
=====================================
@@ -21,7 +21,10 @@ override_dh_auto_build:
cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ ./dev-resources/gen-pki.sh
lein test
+endif
override_dh_clean:
rm -f debian/maven-repo
=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
=====================================
debian/tests/control
=====================================
@@ -2,13 +2,14 @@ Tests: build
Depends: @, clojure
Restrictions: superficial, allow-stderr
-# This fails due to a classpath bug in core-async
-#Tests: unittests
-#Depends: @,
-# clojure,
-# libcheshire-clojure,
-# libkitchensink-clojure (>= 3.1.1-2),
-# libtrapperkeeper-clojure (>= 3.1.0),
-# libtrapperkeeper-webserver-jetty9-clojure (>= 4.1.0-2),
-# libpuppetlabs-ring-middleware-clojure (>= 1.3.0),
-# libbcpkix-java
+Tests: unittests
+Depends: @,
+ clojure,
+ libbultitude-clojure,
+ libcheshire-clojure,
+ libkitchensink-clojure (>= 3.1.1-2),
+ libtrapperkeeper-clojure (>= 3.1.0),
+ libtrapperkeeper-webserver-jetty9-clojure (>= 4.1.0-2),
+ libpuppetlabs-ring-middleware-clojure (>= 1.3.0),
+ libbcpkix-java,
+ openssl
=====================================
debian/tests/unittests
=====================================
@@ -1,30 +1,21 @@
#!/bin/sh
set -efu
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/httpasyncclient.jar:/usr/share/java/schema.jar:/usr/share/java/commons-io.jar:/usr/share/java/metrics-core.jar:/usr/share/java/ssl-utils.jar:/usr/share/java/puppetlabs-i18n.jar:/usr/share/java/jul-to-slf4j.jar:/usr/share/java/cheshire.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-webserver-jetty9.jar:/usr/share/java/trapperkeeper-webserver-jetty9-test.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/bcpkix.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore-nio.jar:/usr/share/java/puppetlabs-http-client.jar:test
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/httpasyncclient.jar:/usr/share/java/schema.jar:/usr/share/java/commons-io.jar:/usr/share/java/metrics-core.jar:/usr/share/java/ssl-utils.jar:/usr/share/java/puppetlabs-i18n.jar:/usr/share/java/jul-to-slf4j.jar:/usr/share/java/cheshire.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-webserver-jetty9.jar:/usr/share/java/trapperkeeper-webserver-jetty9-test.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/bcpkix.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore-nio.jar:/usr/share/java/puppetlabs-http-client.jar:test
-cp -a test "$AUTOPKGTEST_TMP"
+cp -a dev-resources test "$AUTOPKGTEST_TMP"
cd "$AUTOPKGTEST_TMP"
+# needed by puppetlabs.trapperkeeper.testutils.bootstrap
+mkdir target
+
+# generate test certificates
+./dev-resources/gen-pki.sh 2>/dev/null
+
clojure \
-cp $CLASSPATH \
-e "(require '[clojure.test])" \
- -e "(require '[com.puppetlabs.http.client.impl.java-client-test])" \
- -e "(require '[com.puppetlabs.http.client.impl.metrics-unit-test])" \
- -e "(require '[puppetlabs.http.client.async-plaintext-test])" \
- -e "(require '[puppetlabs.http.client.async-unbuffered-test])" \
- -e "(require '[puppetlabs.http.client.gzip-request-test])" \
- -e "(require '[puppetlabs.http.client.metrics-test])" \
- -e "(require '[puppetlabs.http.client.sync-plaintext-test])" \
- -e "(require '[puppetlabs.http.client.sync-ssl-test])" \
- -e "(require '[puppetlabs.http.client.test-common-test])" \
- -e "(System/exit (if (clojure.test/successful? (clojure.test/run-tests
- 'com.puppetlabs.http.client.impl.java-client-test
- 'com.puppetlabs.http.client.impl.metrics-unit-test
- 'puppetlabs.http.client.async-plaintext-test
- 'puppetlabs.http.client.async-unbuffered-test
- 'puppetlabs.http.client.gzip-request-test
- 'puppetlabs.http.client.metrics-test
- 'puppetlabs.http.client.sync-plaintext-test
- 'puppetlabs.http.client.sync-ssl-test
- 'puppetlabs.http.client.test-common-test)) 0 1))"
+ -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 #"(?:com\.)?puppetlabs\.http\.client\.\S+-test")) 0 1))'
=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/puppetlabs/clj-http-client/issues
+Bug-Submit: https://github.com/puppetlabs/clj-http-client/issues/new/choose
+Repository: https://github.com/puppetlabs/clj-http-client.git
+Repository-Browse: https://github.com/puppetlabs/clj-http-client
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/4394b75031140d70ad6dae219e5b19d89b04bb09...9d2bb88b7f3d341698d94014b22d82fe787952c1
--
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/4394b75031140d70ad6dae219e5b19d89b04bb09...9d2bb88b7f3d341698d94014b22d82fe787952c1
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/20220709/ccb2f3b1/attachment.htm>
More information about the pkg-java-commits
mailing list