[Git][clojure-team/puppetlabs-http-client-clojure][debian/main] 7 commits: d/rules: build without tests temporarily
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Sun Feb 5 22:23:58 GMT 2023
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / puppetlabs-http-client-clojure
Commits:
3fe3418c by Jérôme Charaoui at 2023-02-05T14:05:06-05:00
d/rules: build without tests temporarily
This is needed to fix FTBFS issue in several related packages caused by
the upgrade to leiningen 2.10.0
Closes: #1030480, #1030488
- - - - -
74ffec37 by Jérôme Charaoui at 2023-02-05T14:07:59-05:00
d/patches: drop jackson and version overrides
Avoid publishing bogus versions of these deps in maven-repo: they get
converted to "debian" in the poms installed by maven-repo-helper. They
aren't needed anymore anyway.
- - - - -
2f644fb1 by Jérôme Charaoui at 2023-02-05T14:11:50-05:00
add --has-package-version for maven pom
- - - - -
28524b77 by Jérôme Charaoui at 2023-02-05T14:14:06-05:00
d/control: bump Standards-Version, no changes needed
- - - - -
84b1a163 by Jérôme Charaoui at 2023-02-05T14:15:15-05:00
d/control: add myself to Uploaders
- - - - -
821b421a by Jérôme Charaoui at 2023-02-05T14:15:46-05:00
d/control: build using headless jdk
- - - - -
989ecac5 by Jérôme Charaoui at 2023-02-05T14:16:33-05:00
Update changelog for 2.1.0-4 release
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/libpuppetlabs-http-client-clojure.poms
- debian/patches/0001_Lein_Local.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+puppetlabs-http-client-clojure (2.1.0-4) unstable; urgency=medium
+
+ * d/rules: build without tests temporarily (Closes: #1030480, #1030488)
+ * d/control:
+ + bump Standards-Version, no changes needed
+ + add myself to Uploaders
+ + build using headless jdk
+ * d/patches: drop jackson and version overrides
+ * add --has-package-version for maven pom
+
+ -- Jérôme Charaoui <jerome at riseup.net> Sun, 05 Feb 2023 14:15:56 -0500
+
puppetlabs-http-client-clojure (2.1.0-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -2,10 +2,12 @@ Source: puppetlabs-http-client-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,
@@ -15,20 +17,20 @@ Build-Depends:
libprismatic-schema-clojure (>= 1.1.12),
libcommons-io-java,
libdropwizard-metrics-java,
- libssl-utils-clojure (>= 3.1.0),
- libpuppetlabs-i18n-clojure (>= 0.9.0-2),
+ libssl-utils-clojure (>= 3.5.0-2),
+ libpuppetlabs-i18n-clojure (>= 0.9.2-2),
libservlet-api-java,
libslf4j-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>,
+# libcheshire-clojure (>= 5.11.0-2) <!nocheck>,
+# libkitchensink-clojure (>= 3.2.1) <!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,
- openssl <!nocheck>
-Standards-Version: 4.6.1
+# openssl <!nocheck>
+Standards-Version: 4.6.2
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
=====================================
debian/libpuppetlabs-http-client-clojure.poms
=====================================
@@ -1 +1 @@
-debian/pom.xml --artifact=target/http-client.jar --java-lib --usj-name=puppetlabs-http-client
+debian/pom.xml --java-lib --artifact=target/http-client.jar --usj-name=puppetlabs-http-client --has-package-version
=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -4,14 +4,14 @@ Subject: Patch project.clj to build locally using lein.
Forwarded: not-needed
---
- project.clj | 59 +++++++++++++++++++++++++++++++----------------------------
- 1 file changed, 31 insertions(+), 28 deletions(-)
+ project.clj | 63 +++++++++++++++++++------------------------------------------
+ 1 file changed, 19 insertions(+), 44 deletions(-)
-Index: puppetlabs-http-client-clojure/project.clj
-===================================================================
---- puppetlabs-http-client-clojure.orig/project.clj
-+++ puppetlabs-http-client-clojure/project.clj
-@@ -5,25 +5,22 @@
+diff --git a/project.clj b/project.clj
+index f78cb04..15ebb87 100644
+--- a/project.clj
++++ b/project.clj
+@@ -5,25 +5,17 @@
:min-lein-version "2.9.1"
@@ -23,9 +23,15 @@ 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]
@@ -35,24 +41,11 @@ Index: puppetlabs-http-client-clojure/project.clj
- [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"]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.x"]]
++ [org.slf4j/jul-to-slf4j "debian"]]
:source-paths ["src/clj"]
:java-source-paths ["src/java"]
-@@ -34,36 +31,27 @@
+@@ -34,36 +26,21 @@
;; depend on this source jar using a :classifier in their :dependencies.
:classifiers [["sources" :sources-jar]]
@@ -70,12 +63,6 @@ Index: puppetlabs-http-client-clojure/project.clj
+ [puppetlabs/trapperkeeper "debian" :classifier "test"]
+ [puppetlabs/trapperkeeper-webserver-jetty9 "debian"]
+ [puppetlabs/trapperkeeper-webserver-jetty9 "debian" :classifier "test"]
-+ [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.eclipse.jetty/jetty-proxy "9.x"]
-+ [org.eclipse.jetty/jetty-jmx "9.x"]
+ [puppetlabs/ring-middleware "debian"]]
:resource-paths ["dev-resources"]
:jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]}
@@ -104,16 +91,13 @@ Index: puppetlabs-http-client-clojure/project.clj
:sources-jar {:java-source-paths ^:replace []
:jar-exclusions ^:replace []
:source-paths ^:replace ["src/clj" "src/java"]}}
-@@ -76,8 +64,9 @@
+@@ -76,8 +53,6 @@
:lein-release {:scm :git
:deploy-via :lein-deploy}
- :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]]]
- :repositories [["puppet-releases" "https://artifactory.delivery.puppetlabs.net/artifactory/clojure-releases__local/"]
- ["puppet-snapshots" "https://artifactory.delivery.puppetlabs.net/artifactory/clojure-snapshots__local/"]])
=====================================
debian/rules
=====================================
@@ -14,17 +14,20 @@ 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 i18n make
lein jar
# symlinks so we don't need a version in debian/*.poms
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
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+# ./dev-resources/gen-pki.sh
+# lein test
+#endif
override_dh_clean:
rm -f debian/maven-repo
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/210e82f8f4c260412489f6f83060f881cd3e96bc...989ecac5fd50e22c7ff13cb086964fcf066f7f84
--
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/210e82f8f4c260412489f6f83060f881cd3e96bc...989ecac5fd50e22c7ff13cb086964fcf066f7f84
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/20230205/b17606d3/attachment.htm>
More information about the pkg-java-commits
mailing list