Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / ring-clojure
Commits: d186c7dc by Jérôme Charaoui at 2023-02-08T10:49:39-05:00 prevent publishing bogus jetty version in pom deps - - - - - c0f49bf7 by Jérôme Charaoui at 2023-02-08T10:50:21-05:00 d/control: depend on clojure package providing 1.x - - - - - 1156f300 by Jérôme Charaoui at 2023-02-08T10:50:53-05:00 d/control: use headless jdk in build-deps - - - - - 2238edf3 by Jérôme Charaoui at 2023-02-08T10:53:18-05:00 d/control: drop obsolete test-only build-deps - - - - - 961be335 by Jérôme Charaoui at 2023-02-08T11:25:46-05:00 add built artifacts to maven-repo on the fly This avoids depending on previous versions of the package during build, making the whole process likely much more robust. - - - - - 9e01730f by Jérôme Charaoui at 2023-02-08T11:26:43-05:00 d/control: add myself to Uploaders - - - - - d99be0d1 by Jérôme Charaoui at 2023-02-08T11:28:41-05:00 use --java-lib to get rid of d/*.jlibs files - - - - - cec1fb22 by Jérôme Charaoui at 2023-02-08T11:30:07-05:00 Update changelog for 1.8.2-2 release - - - - - 10 changed files: - debian/changelog - debian/control - − debian/libring-core-clojure.jlibs - debian/libring-core-clojure.poms - − debian/libring-jetty-adapter-clojure.jlibs - debian/libring-jetty-adapter-clojure.poms - − debian/libring-servlet-clojure.jlibs - debian/libring-servlet-clojure.poms - + debian/maven.rules - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,16 @@ +ring-clojure (1.8.2-2) unstable; urgency=medium + + * prevent publishing bogus jetty version in pom deps + * d/control: + + add myself to Uploaders + + depend on clojure package providing 1.x + + use headless jdk in build-deps + - drop obsolete test-only build-deps + * add built artifacts to maven-repo on the fly + * use --java-lib to get rid of d/*.jlibs files + + -- Jérôme Charaoui <[email protected]> Wed, 08 Feb 2023 11:29:30 -0500 + ring-clojure (1.8.2-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -2,25 +2,23 @@ Source: ring-clojure Section: java Priority: optional Maintainer: Debian Clojure Maintainers <[email protected]> -Uploaders: Apollon Oikonomopoulos <[email protected]> +Uploaders: + Apollon Oikonomopoulos <[email protected]>, + Jérôme Charaoui <[email protected]>, Build-Depends: debhelper-compat (= 13), - default-jdk, + default-jdk-headless, javahelper, maven-repo-helper, - libclojure-java, + libclojure-java (>= 1.11.1-2), libring-codec-clojure (>= 1.1.2), libcommons-io-java, libcommons-fileupload-java, libclj-time-clojure (>= 0.15.2) <!nocheck>, libcrypto-random-clojure (>= 1.2.1), libcrypto-equality-clojure (>= 1.0.0-2), - libring-core-clojure (>= 1.6.2-3), libservlet-api-java, - libring-servlet-clojure, libjetty9-java, libclj-http-clojure, - libnrepl-clojure <!nocheck>, - libcomplete-clojure <!nocheck>, leiningen, Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/clojure-team/ring-clojure.git ===================================== debian/libring-core-clojure.jlibs deleted ===================================== @@ -1 +0,0 @@ -ring-core/target/ring-core.jar ===================================== debian/libring-core-clojure.poms ===================================== @@ -1 +1 @@ -debian/ring-core.pom.xml --artifact=ring-core/target/ring-core.jar --usj-name=ring-core +debian/ring-core.pom.xml --java-lib --artifact=ring-core/target/ring-core.jar --usj-name=ring-core ===================================== debian/libring-jetty-adapter-clojure.jlibs deleted ===================================== @@ -1 +0,0 @@ -ring-jetty-adapter/target/ring-jetty-adapter.jar ===================================== debian/libring-jetty-adapter-clojure.poms ===================================== @@ -1 +1 @@ -debian/ring-jetty-adapter.pom.xml --artifact=ring-jetty-adapter/target/ring-jetty-adapter.jar --usj-name=ring-jetty-adapter +debian/ring-jetty-adapter.pom.xml --java-lib --artifact=ring-jetty-adapter/target/ring-jetty-adapter.jar --usj-name=ring-jetty-adapter ===================================== debian/libring-servlet-clojure.jlibs deleted ===================================== @@ -1 +0,0 @@ -ring-servlet/target/ring-servlet.jar ===================================== debian/libring-servlet-clojure.poms ===================================== @@ -1 +1 @@ -debian/ring-servlet.pom.xml --artifact=ring-servlet/target/ring-servlet.jar --usj-name=ring-servlet +debian/ring-servlet.pom.xml --java-lib --artifact=ring-servlet/target/ring-servlet.jar --usj-name=ring-servlet ===================================== debian/maven.rules ===================================== @@ -0,0 +1,3 @@ +# with patched project.clj +# do not apply any version rules +org.eclipse.jetty * * * * ===================================== debian/rules ===================================== @@ -11,7 +11,7 @@ SUB_PROJECTS=ring-core ring-servlet ring-jetty-adapter dh $@ --with javahelper --with maven_repo_helper override_dh_auto_configure: - cd debian && ln -sf /usr/share/maven-repo . + cp -rs /usr/share/maven-repo debian override_dh_auto_build: $(foreach sub,$(SUB_PROJECTS), \ @@ -20,6 +20,12 @@ override_dh_auto_build: lein pom ../debian/$(sub).pom.xml; \ lein jar; \ cd target && ln -sf $(sub)-$(DEB_VERSION_UPSTREAM).jar $(sub).jar; \ + cd $(CURDIR); \ + mkdir -p debian/maven-repo/ring/$(sub)/debian; \ + cp -s $(CURDIR)/$(sub)/target/$(sub).jar \ + debian/maven-repo/ring/$(sub)/debian/$(sub)-debian.jar; \ + cp -s $(CURDIR)/debian/$(sub).pom.xml \ + debian/maven-repo/ring/$(sub)/debian/$(sub)-debian.pom; \ ) override_dh_auto_test: View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/daba1a8a9b1af5cc32b3175f448ac61cdf073a11...cec1fb22469e8dc6a274eacc1682c41380cfdab8 -- View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/daba1a8a9b1af5cc32b3175f448ac61cdf073a11...cec1fb22469e8dc6a274eacc1682c41380cfdab8 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
