From 7612ff48cd98aa9594ac68c415c655cf36d59d57 Mon Sep 17 00:00:00 2001 From: "Dr. Christian Betz" Date: Mon, 11 Sep 2017 12:11:32 +0200 Subject: [PATCH] had to add lein-v middlewares to every project without this, pom version is wrong and upload to Clojars is broken (Clojars prevents uploading the wrong version, otherwise this problem would have gone by unnoticed for quite some time) --- admin/project.clj | 4 +++- avro/project.clj | 5 ++++- common/project.clj | 3 +++ core/project.clj | 4 +++- embedded/project.clj | 4 +++- examples/project.clj | 4 +++- fressian/project.clj | 4 +++- json/project.clj | 4 +++- mocks/project.clj | 4 +++- nippy/project.clj | 4 +++- transit/project.clj | 4 +++- 11 files changed, 34 insertions(+), 10 deletions(-) diff --git a/admin/project.clj b/admin/project.clj index 9c350db..22710d1 100644 --- a/admin/project.clj +++ b/admin/project.clj @@ -7,7 +7,9 @@ [clj-kafka.franzy/common nil] [com.taoensso/timbre "4.3.1"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"] diff --git a/avro/project.clj b/avro/project.clj index 52beed4..c9e6207 100644 --- a/avro/project.clj +++ b/avro/project.clj @@ -4,7 +4,10 @@ [org.apache.kafka/kafka-clients "0.11.0.0"] [com.damballa/abracad "0.4.13"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] + :plugins [[lein-monolith "1.0.1"] diff --git a/common/project.clj b/common/project.clj index cf103f2..71ffabe 100644 --- a/common/project.clj +++ b/common/project.clj @@ -1,6 +1,9 @@ (defproject clj-kafka.franzy/common "0.0.0" :description "Common resources for Kafka libraries, such as schemas, utility functions, and configuration." :monolith/inherit true + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :dependencies [[org.clojure/clojure "1.8.0"] [prismatic/schema "1.1.0"]] diff --git a/core/project.clj b/core/project.clj index 9392143..2fb74ac 100644 --- a/core/project.clj +++ b/core/project.clj @@ -5,7 +5,9 @@ [org.apache.kafka/kafka-clients "0.11.0.0"] [lbradstreet/franzy-common "0.0.2"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"] diff --git a/embedded/project.clj b/embedded/project.clj index c06668a..306ec94 100644 --- a/embedded/project.clj +++ b/embedded/project.clj @@ -8,7 +8,9 @@ [org.scala-lang/scala-library "2.11.8"] [clj-kafka.franzy/common nil]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins diff --git a/examples/project.clj b/examples/project.clj index f29e229..772d5d1 100644 --- a/examples/project.clj +++ b/examples/project.clj @@ -15,7 +15,9 @@ [org.slf4j/slf4j-nop "1.7.19"] [log4j/log4j "1.2.17"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"] diff --git a/fressian/project.clj b/fressian/project.clj index bf4051b..5cb2be5 100644 --- a/fressian/project.clj +++ b/fressian/project.clj @@ -4,7 +4,9 @@ [org.apache.kafka/kafka-clients "0.11.0.0"] [org.clojure/data.fressian "0.2.1"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"] diff --git a/json/project.clj b/json/project.clj index 31b5d14..ab6097d 100644 --- a/json/project.clj +++ b/json/project.clj @@ -4,7 +4,9 @@ [org.apache.kafka/kafka-clients "0.11.0.0"] [cheshire "5.5.0"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"] diff --git a/mocks/project.clj b/mocks/project.clj index d511482..edac754 100644 --- a/mocks/project.clj +++ b/mocks/project.clj @@ -5,7 +5,9 @@ [clj-kafka.franzy/common nil] [clj-kafka.franzy/core nil]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"] diff --git a/nippy/project.clj b/nippy/project.clj index 477fbb3..f187704 100644 --- a/nippy/project.clj +++ b/nippy/project.clj @@ -4,7 +4,9 @@ [org.apache.kafka/kafka-clients "0.11.0.0"] [com.taoensso/nippy "2.11.1"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"] diff --git a/transit/project.clj b/transit/project.clj index 66a2ff4..1949577 100644 --- a/transit/project.clj +++ b/transit/project.clj @@ -4,7 +4,9 @@ [org.apache.kafka/kafka-clients "0.11.0.0"] [com.cognitect/transit-clj "0.8.285"]] :monolith/inherit true - :middleware [leiningen.v/dependency-version-from-scm] + :middleware [leiningen.v/dependency-version-from-scm + leiningen.v/version-from-scm + leiningen.v/add-workspace-data] :plugins [[lein-monolith "1.0.1"]