From 2fe48280a9398fdbdde3ee9f2d18f681e03321e3 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Thu, 27 Feb 2020 20:09:37 -0500 Subject: [PATCH 01/62] Add changelog entry regarding readable --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 356aa84..3c33f3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). ## [Unreleased] +### Added +- Add support for printing message arguments readably in + `clojure.tools.logging.readable`. ## [0.6.0] - 2020-02-07 ### Added From 3d7770db3f29350096caf627427cd28d50e6b6ec Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Thu, 27 Feb 2020 20:13:31 -0500 Subject: [PATCH 02/62] Prepare for 1.0.0 release --- CHANGELOG.md | 5 ++++- README.md | 10 +++++----- project.clj | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c33f3b..ab996df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). ## [Unreleased] + +## [1.0.0] - 2020-02-27 ### Added - Add support for printing message arguments readably in `clojure.tools.logging.readable`. @@ -81,7 +83,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - Initial implementation of Clojure-aware logging abstraction. -[Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-0.6.0...HEAD +[Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...HEAD +[1.0.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.5.0...tools.logging-1.0.0 [0.6.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.5.0...tools.logging-0.6.0 [0.5.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.4.1...tools.logging-0.5.0 [0.4.1]: https://github.com/clojure/tools.logging/compare/tools.logging-0.4.0...tools.logging-0.4.1 diff --git a/README.md b/README.md index b49fb77..c7a5259 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [0.6.0] +Lastest stable release is [1.0.0] Leiningen: ```clojure -[org.clojure/tools.logging "0.6.0"] +[org.clojure/tools.logging "1.0.0"] ``` Maven: @@ -19,14 +19,14 @@ Maven: org.clojure tools.logging - 0.6.0 + 1.0.0 ``` Gradle: ```clojure -compile "org.clojure:tools.logging:0.6.0" +compile "org.clojure:tools.logging:1.0.0" ``` @@ -105,7 +105,7 @@ Copyright © 2009 Alex Taggart Licensed under the EPL. (See the file epl.html.) -[0.6.0]: https://github.com/clojure/tools.logging/tree/tools.logging-0.6.0 +[1.0.0]: https://github.com/clojure/tools.logging/tree/tools.logging-1.0.0 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options [SLF4J]: http://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging diff --git a/project.clj b/project.clj index c3c610e..c2a62c2 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.clojure/tools.logging "0.6.1-SNAPSHOT" +(defproject org.clojure/tools.logging "1.0.1-SNAPSHOT" :description "Clojure logging API." :url "https://github.com/clojure/tools.logging" :license {:name "Eclipse Public License" From 89f2310f3c3e882c3109a1ce1290a66ae921f0fb Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Thu, 27 Feb 2020 19:15:10 -0600 Subject: [PATCH 03/62] [maven-release-plugin] prepare release tools.logging-1.0.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bcf7bb3..fb3ce05 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 0.6.1-SNAPSHOT + 1.0.0 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + tools.logging-1.0.0 From a74e88a519be380d1d35879bcf9b3cd4478bd488 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Thu, 27 Feb 2020 19:15:10 -0600 Subject: [PATCH 04/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fb3ce05..3ac2b6e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.0.0 + 1.0.1-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - tools.logging-1.0.0 + HEAD From 38a9c7400e8871a501c08de28c0a6acb7a6173b4 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Fri, 28 Feb 2020 09:25:19 -0400 Subject: [PATCH 05/62] Fix the changelog diff for v1.0.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab996df..e46db1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,7 +84,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial implementation of Clojure-aware logging abstraction. [Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...HEAD -[1.0.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.5.0...tools.logging-1.0.0 +[1.0.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.6.0...tools.logging-1.0.0 [0.6.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.5.0...tools.logging-0.6.0 [0.5.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.4.1...tools.logging-0.5.0 [0.4.1]: https://github.com/clojure/tools.logging/compare/tools.logging-0.4.0...tools.logging-0.4.1 From de6933a46f53f60f98b10d295d68645e2efa74ef Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Fri, 28 Feb 2020 09:35:58 -0400 Subject: [PATCH 06/62] Add more details to the CHANGELOG --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e46db1b..8a8d880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,16 +10,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [1.0.0] - 2020-02-27 ### Added - Add support for printing message arguments readably in - `clojure.tools.logging.readable`. + [`clojure.tools.logging.readable`](https://clojure.github.io/tools.logging/#clojure.tools.logging.readable). ## [0.6.0] - 2020-02-07 ### Added - Add support for explicitly selecting a logger factory by setting the - `clojure.tools.logging.factory` system property. + `"clojure.tools.logging.factory"` system property. For details, see the + [README](https://github.com/clojure/tools.logging#configuration), + and the documentation for [*logger-factory*](https://clojure.github.io/tools.logging/#clojure.tools.logging/*logger-factory*) ## [0.5.0] - 2019-07-22 ### Added -- Add support for testing logs in `clojure.tools.logging.test` +- Add support for testing logs in [`clojure.tools.logging.test`](https://clojure.github.io/tools.logging/#clojure.tools.logging.test) ### Changed - Now passes the context classloader of current thread to `Class/forName` when From e62fcd9437f92935f5963065706fa81bb4414b20 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Fri, 28 Feb 2020 09:43:38 -0400 Subject: [PATCH 07/62] Tweak alignment in docstrings Lengths were thrown off due to backslashes in the string literals. --- src/main/clojure/clojure/tools/logging/readable.clj | 2 +- src/main/clojure/clojure/tools/logging/test.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/clojure/clojure/tools/logging/readable.clj b/src/main/clojure/clojure/tools/logging/readable.clj index b1c9465..2bd9d8d 100644 --- a/src/main/clojure/clojure/tools/logging/readable.clj +++ b/src/main/clojure/clojure/tools/logging/readable.clj @@ -15,7 +15,7 @@ '[clojure.tools.logging.readable :as logr]) (def x \"bar\") - ; Logged as... + ; Logged as... (log/debug \"foo\" x \"baz\") ; foo bar baz (logr/debug \"foo\" x \"baz\") ; foo \"bar\" baz (log/debugf \"foo %s %s\" x \"baz\") ; foo bar baz diff --git a/src/main/clojure/clojure/tools/logging/test.clj b/src/main/clojure/clojure/tools/logging/test.clj index 9c9087f..ae8618d 100644 --- a/src/main/clojure/clojure/tools/logging/test.clj +++ b/src/main/clojure/clojure/tools/logging/test.clj @@ -18,9 +18,9 @@ (with-log (log/info \"Hello World!\") (log/error (Exception. \"Did a thing\") \"Error: oops\") - (logged? 'user :info #\"Hello\") ; true + (logged? 'user :info #\"Hello\") ; true (logged? 'user :error [Throwable #\"thing\"] #\"Error:\") ; true - (logged? 'user :debug \"Hi\")) ; false"} + (logged? 'user :debug \"Hi\")) ; false"} clojure.tools.logging.test (:import [clojure.lang Fn Keyword Namespace Symbol] java.util.Set From eadcd49fe68f40f71cf392d07eea112eccf34162 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Fri, 28 Feb 2020 09:54:29 -0400 Subject: [PATCH 08/62] Improve docs for test/matches and test/logged? --- src/main/clojure/clojure/tools/logging/test.clj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/clojure/clojure/tools/logging/test.clj b/src/main/clojure/clojure/tools/logging/test.clj index ae8618d..19a8ff4 100644 --- a/src/main/clojure/clojure/tools/logging/test.clj +++ b/src/main/clojure/clojure/tools/logging/test.clj @@ -227,7 +227,9 @@ (defn matches - "Returns matching log entries, otherwise nil. + "Returns matching log entries, otherwise nil. See match-logger-ns?, + match-level?, match-throwable?, and match-message? for the default matching + behavior applied to the given args. Must be invoked within a context where *stateful-log* is bound to an instance of StatefulLog containing MatchableLogEntry items (e.g., inside with-log)." @@ -239,7 +241,9 @@ (defn logged? - "Returns true if the log contains matching entries. + "Returns true if the log contains matching entries. See match-logger-ns?, + match-level?, match-throwable?, and match-message? for the default matching + behavior applied to the given args. Must be invoked within a context where *stateful-log* is bound to an instance of StatefulLog containing MatchableLogEntry items (e.g., inside with-log)." From 3e5590b8ae60303c6793a187610916fa888bb4a5 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Fri, 28 Feb 2020 09:56:54 -0400 Subject: [PATCH 09/62] Escape asterisks in markdown --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a8d880..d5010f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Add support for explicitly selecting a logger factory by setting the `"clojure.tools.logging.factory"` system property. For details, see the [README](https://github.com/clojure/tools.logging#configuration), - and the documentation for [*logger-factory*](https://clojure.github.io/tools.logging/#clojure.tools.logging/*logger-factory*) + and the documentation for [\*logger-factory\*](https://clojure.github.io/tools.logging/#clojure.tools.logging/*logger-factory*) ## [0.5.0] - 2019-07-22 ### Added From af2e1b2d22ffeb611d98e1f5cf20e8fd3259b8ed Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Fri, 28 Feb 2020 09:58:33 -0400 Subject: [PATCH 10/62] Fix punctuation in changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5010f5..d43c5d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,11 +17,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Add support for explicitly selecting a logger factory by setting the `"clojure.tools.logging.factory"` system property. For details, see the [README](https://github.com/clojure/tools.logging#configuration), - and the documentation for [\*logger-factory\*](https://clojure.github.io/tools.logging/#clojure.tools.logging/*logger-factory*) + and the documentation for [\*logger-factory\*](https://clojure.github.io/tools.logging/#clojure.tools.logging/*logger-factory*). ## [0.5.0] - 2019-07-22 ### Added -- Add support for testing logs in [`clojure.tools.logging.test`](https://clojure.github.io/tools.logging/#clojure.tools.logging.test) +- Add support for testing logs in [`clojure.tools.logging.test`](https://clojure.github.io/tools.logging/#clojure.tools.logging.test). ### Changed - Now passes the context classloader of current thread to `Class/forName` when From 3f44502339effbef31bf9769ede1791ca7ccde9b Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Tue, 3 Mar 2020 23:26:48 -0400 Subject: [PATCH 11/62] Improve docs --- README.md | 3 ++- .../clojure/clojure/tools/logging/readable.clj | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c7a5259..a1ed775 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,8 @@ library._ To control which logging implementation is used, set the `clojure.tools.logging.factory` system property to the fully-qualified name of a no-arg function that returns an instance of `clojure.tools.logging.impl/LoggerFactory`. There are a number of -factory functions provided in the `clojure.tools.logging.impl` namespace. +factory functions provided in the [`clojure.tools.logging.impl`](https://clojure.github.io/tools.logging/#clojure.tools.logging.impl/find-factory) +namespace. [Leiningen example]: diff --git a/src/main/clojure/clojure/tools/logging/readable.clj b/src/main/clojure/clojure/tools/logging/readable.clj index 2bd9d8d..8ebf6d3 100644 --- a/src/main/clojure/clojure/tools/logging/readable.clj +++ b/src/main/clojure/clojure/tools/logging/readable.clj @@ -7,7 +7,10 @@ ;; remove this notice, or any other, from this software. (ns ^{:author "Alex Taggart" - :doc "Logging macros that support printing message arguments readably. + :doc "Logging macros that support printing message (some) arguments as + if wrapped in pr-str, the goal being to preserve their data representation + distinct from the explanatory text. See logp and logf for details regarding + which args are treated in this manner. Examples: @@ -33,8 +36,9 @@ (defmacro logp "Logs a message using print style args, where message args that are not - literal strings will be printed readably. Can optionally take a throwable as - its second arg. See level-specific macros, e.g., debug." + literal strings will be printed readably, as if wrapped in pr-str. Can + optionally take a throwable as its second arg. See level-specific macros, + e.g., debug." {:arglists '([level message & more] [level throwable message & more])} [level x & more] ; Why bind `*print-readably*` to true? @@ -65,8 +69,8 @@ (defmacro logf "Logs a message using a format string and args, where all format args will be - printed readably. Can optionally take a throwable as its second arg. See - level-specific macros, e.g., debugf." + printed readably, as if wrapped in pr-str. Can optionally take a throwable as + its second arg. See level-specific macros, e.g., debugf." {:arglists '([level fmt & fmt-args] [level throwable fmt & fmt-args])} [level x & more] (if (or (instance? String x) (nil? more)) ; optimize for non-exception case From 2472b6f84853075cb58082753ec39f49d1716dc2 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Sat, 25 Apr 2020 17:37:18 -0500 Subject: [PATCH 12/62] Decrease overhead of get-logger The previously used static methods have baked-in setup overhead. Move that overhead to instantiation. The change in the mean time to call get-logger on my laptop: - slf4j-factory: from 10ns to 7ns - cl-factory: from 198ns to 13ns - log4j2-factory: from 2587ns to 14ns --- CHANGELOG.md | 6 ++++++ project.clj | 3 ++- src/main/clojure/clojure/tools/logging/impl.clj | 16 ++++++++++------ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d43c5d3..0501545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). ## [Unreleased] +### Changed +- Decreased the per-call overhead when using SLF4J, Commons Logging, and Log4j2. + Previously, their associated `logger-factory` implementations were calling + library-specific static convenience methods for each call to `get-logger`. + These methods have some baked-in setup overhead, which now only occurs during + instantiation of the associated `logger-factory`. ## [1.0.0] - 2020-02-27 ### Added diff --git a/project.clj b/project.clj index c2a62c2..04abb2a 100644 --- a/project.clj +++ b/project.clj @@ -15,4 +15,5 @@ [log4j "1.2.16"] [org.apache.logging.log4j/log4j-api "2.8.2"] [org.apache.logging.log4j/log4j-core "2.8.2"] - [commons-logging "1.1.1"]]}}) + [commons-logging "1.1.1"] + [criterium "0.4.5"]]}}) diff --git a/src/main/clojure/clojure/tools/logging/impl.clj b/src/main/clojure/clojure/tools/logging/impl.clj index 087b190..cac7fb1 100644 --- a/src/main/clojure/clojure/tools/logging/impl.clj +++ b/src/main/clojure/clojure/tools/logging/impl.clj @@ -61,7 +61,8 @@ [] (when (class-found? "org.slf4j.Logger") (eval - `(do + `(let [; Same as is done inside LoggerFactory/getLogger(String). + factory# (org.slf4j.LoggerFactory/getILoggerFactory)] (extend org.slf4j.Logger Logger {:enabled? @@ -98,7 +99,7 @@ (name [_#] "org.slf4j") (get-logger [_# logger-ns#] - (org.slf4j.LoggerFactory/getLogger ^String (str logger-ns#)))))))) + (.getLogger factory# ^String (str logger-ns#)))))))) (defn cl-factory "Returns a Commons Logging-based implementation of the LoggerFactory protocol, or @@ -106,7 +107,8 @@ [] (when (class-found? "org.apache.commons.logging.Log") (eval - `(do + `(let [; Same as is done inside LogFactory/getLog(String). + factory# (org.apache.commons.logging.LogFactory/getFactory)] (extend org.apache.commons.logging.Log Logger {:enabled? @@ -142,7 +144,7 @@ (name [_#] "org.apache.commons.logging") (get-logger [_# logger-ns#] - (org.apache.commons.logging.LogFactory/getLog (str logger-ns#)))))))) + (.getInstance factory# (str logger-ns#)))))))) (defn log4j-factory "Returns a Log4j-based implementation of the LoggerFactory protocol, or nil if @@ -179,7 +181,9 @@ [] (when (class-found? "org.apache.logging.log4j.Logger") (eval - `(let [levels# {:trace org.apache.logging.log4j.Level/TRACE + `(let [; Same as is done inside LogManager/getLogger(String). + context# (org.apache.logging.log4j.LogManager/getContext false) + levels# {:trace org.apache.logging.log4j.Level/TRACE :debug org.apache.logging.log4j.Level/DEBUG :info org.apache.logging.log4j.Level/INFO :warn org.apache.logging.log4j.Level/WARN @@ -206,7 +210,7 @@ (name [_#] "org.apache.logging.log4j") (get-logger [_# logger-ns#] - (org.apache.logging.log4j.LogManager/getLogger ^String (str logger-ns#)))))))) + (.getLogger context# ^String (str logger-ns#)))))))) (defn jul-factory "Returns a java.util.logging-based implementation of the LoggerFactory protocol, From 658e7d2c95e7701d8fef3e4c48cab0c6a3dd80ef Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Sat, 25 Apr 2020 17:53:39 -0500 Subject: [PATCH 13/62] Add readable/spyf --- CHANGELOG.md | 3 +++ src/main/clojure/clojure/tools/logging/readable.clj | 10 ++++++++++ .../clojure/clojure/tools/logging/test_readable.clj | 12 ++++++++++++ 3 files changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0501545..8209a92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). ## [Unreleased] +### Added +- Add implementation of `spyf` to `clojure.tools.logging.readable`. + ### Changed - Decreased the per-call overhead when using SLF4J, Commons Logging, and Log4j2. Previously, their associated `logger-factory` implementations were calling diff --git a/src/main/clojure/clojure/tools/logging/readable.clj b/src/main/clojure/clojure/tools/logging/readable.clj index 8ebf6d3..b69b1c5 100644 --- a/src/main/clojure/clojure/tools/logging/readable.clj +++ b/src/main/clojure/clojure/tools/logging/readable.clj @@ -159,3 +159,13 @@ {:arglists '([fmt & fmt-args] [throwable fmt & fmt-args])} [& args] `(logf :fatal ~@args)) + +(defmacro spyf + "Evaluates expr and may write (logf level fmt result) to the log. Returns the + result of expr. Defaults to :debug log level." + ([fmt expr] + `(spyf :debug ~fmt ~expr)) + ([level fmt expr] + `(let [a# ~expr] + (logf ~level ~fmt a#) + a#))) diff --git a/src/test/clojure/clojure/tools/logging/test_readable.clj b/src/test/clojure/clojure/tools/logging/test_readable.clj index e2bc401..3ba09e2 100644 --- a/src/test/clojure/clojure/tools/logging/test_readable.clj +++ b/src/test/clojure/clojure/tools/logging/test_readable.clj @@ -188,6 +188,18 @@ (is (logged? "clojure.tools.logging.test-readable" :debug e "hello \"world\""))))) +(deftest spyf-default + (with-log + (spyf "result: %s" (str "hello" " " "world")) + (is (logged? "clojure.tools.logging.test-readable" :debug nil "result: \"hello world\"")))) + +(deftest spyf-level + (doseq [level #{:trace :debug :info :warn :error :fatal}] + (with-log + (spyf level "result: %s" (str "hello" " " "world")) + (is (logged? "clojure.tools.logging.test-readable" level nil "result: \"hello world\""))))) + + (deftest println-style (are [f kw] (with-log (f "hello" "world") From 6748dcb66bd058d49caa8c01442fad37a5b5378d Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Sat, 25 Apr 2020 18:11:38 -0500 Subject: [PATCH 14/62] Update fn docs to suggest using the readable ns --- src/main/clojure/clojure/tools/logging.clj | 45 ++++++++++++++-------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/src/main/clojure/clojure/tools/logging.clj b/src/main/clojure/clojure/tools/logging.clj index b4cc2d3..e963f06 100644 --- a/src/main/clojure/clojure/tools/logging.clj +++ b/src/main/clojure/clojure/tools/logging.clj @@ -81,7 +81,8 @@ (defmacro logp "Logs a message using print style args. Can optionally take a throwable as its - second arg. See level-specific macros, e.g., debug." + second arg. See level-specific macros, e.g., debug. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([level message & more] [level throwable message & more])} [level x & more] (if (or (instance? String x) (nil? more)) ; optimize for common case @@ -95,7 +96,8 @@ (defmacro logf "Logs a message using a format string and args. Can optionally take a - throwable as its second arg. See level-specific macros, e.g., debugf." + throwable as its second arg. See level-specific macros, e.g., debugf. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([level fmt & fmt-args] [level throwable fmt & fmt-args])} [level x & more] (if (or (instance? String x) (nil? more)) ; optimize for common case @@ -134,7 +136,8 @@ (defmacro spyf "Evaluates expr and may write (format fmt result) to the log. Returns the - result of expr. Defaults to :debug log level." + result of expr. Defaults to :debug log level. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." ([fmt expr] `(spyf :debug ~fmt ~expr)) ([level fmt expr] @@ -211,73 +214,85 @@ ;; level-specific macros (defmacro trace - "Trace level logging using print-style args." + "Trace level logging using print-style args. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([message & more] [throwable message & more])} [& args] `(logp :trace ~@args)) (defmacro debug - "Debug level logging using print-style args." + "Debug level logging using print-style args. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([message & more] [throwable message & more])} [& args] `(logp :debug ~@args)) (defmacro info - "Info level logging using print-style args." + "Info level logging using print-style args. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([message & more] [throwable message & more])} [& args] `(logp :info ~@args)) (defmacro warn - "Warn level logging using print-style args." + "Warn level logging using print-style args. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([message & more] [throwable message & more])} [& args] `(logp :warn ~@args)) (defmacro error - "Error level logging using print-style args." + "Error level logging using print-style args. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([message & more] [throwable message & more])} [& args] `(logp :error ~@args)) (defmacro fatal - "Fatal level logging using print-style args." + "Fatal level logging using print-style args. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([message & more] [throwable message & more])} [& args] `(logp :fatal ~@args)) (defmacro tracef - "Trace level logging using format." + "Trace level logging using format. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([fmt & fmt-args] [throwable fmt & fmt-args])} [& args] `(logf :trace ~@args)) (defmacro debugf - "Debug level logging using format." + "Debug level logging using format. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([fmt & fmt-args] [throwable fmt & fmt-args])} [& args] `(logf :debug ~@args)) (defmacro infof - "Info level logging using format." + "Info level logging using format. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([fmt & fmt-args] [throwable fmt & fmt-args])} [& args] `(logf :info ~@args)) (defmacro warnf - "Warn level logging using format." + "Warn level logging using format. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([fmt & fmt-args] [throwable fmt & fmt-args])} [& args] `(logf :warn ~@args)) (defmacro errorf - "Error level logging using format." + "Error level logging using format. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([fmt & fmt-args] [throwable fmt & fmt-args])} [& args] `(logf :error ~@args)) (defmacro fatalf - "Fatal level logging using format." + "Fatal level logging using format. + Use the 'logging.readable' namespace to avoid wrapping args in pr-str." {:arglists '([fmt & fmt-args] [throwable fmt & fmt-args])} [& args] `(logf :fatal ~@args)) From 1fb53f904b0429b9065ae244be6ad2a96e4bd255 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Sat, 25 Apr 2020 18:34:33 -0500 Subject: [PATCH 15/62] Prepare for 1.1.0 release --- CHANGELOG.md | 5 ++++- README.md | 10 +++++----- project.clj | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8209a92..09eca77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). ## [Unreleased] + +## [1.1.0] - 2020-04-25 ### Added - Add implementation of `spyf` to `clojure.tools.logging.readable`. @@ -94,7 +96,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - Initial implementation of Clojure-aware logging abstraction. -[Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...HEAD +[Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...HEAD +[1.1.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...tools.logging-1.1.0 [1.0.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.6.0...tools.logging-1.0.0 [0.6.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.5.0...tools.logging-0.6.0 [0.5.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.4.1...tools.logging-0.5.0 diff --git a/README.md b/README.md index a1ed775..bf719dd 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.0.0] +Lastest stable release is [1.1.0] Leiningen: ```clojure -[org.clojure/tools.logging "1.0.0"] +[org.clojure/tools.logging "1.1.0"] ``` Maven: @@ -19,14 +19,14 @@ Maven: org.clojure tools.logging - 1.0.0 + 1.1.0 ``` Gradle: ```clojure -compile "org.clojure:tools.logging:1.0.0" +compile "org.clojure:tools.logging:1.1.0" ``` @@ -106,7 +106,7 @@ Copyright © 2009 Alex Taggart Licensed under the EPL. (See the file epl.html.) -[1.0.0]: https://github.com/clojure/tools.logging/tree/tools.logging-1.0.0 +[1.1.0]: https://github.com/clojure/tools.logging/tree/tools.logging-1.1.0 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options [SLF4J]: http://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging diff --git a/project.clj b/project.clj index 04abb2a..2f19cf4 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.clojure/tools.logging "1.0.1-SNAPSHOT" +(defproject org.clojure/tools.logging "1.1.1-SNAPSHOT" :description "Clojure logging API." :url "https://github.com/clojure/tools.logging" :license {:name "Eclipse Public License" From 9a3330ca2dde44e2cf694303f3d6d82d97353260 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sat, 25 Apr 2020 18:49:59 -0500 Subject: [PATCH 16/62] [maven-release-plugin] prepare release tools.logging-1.1.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3ac2b6e..b3cd34f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.0.1-SNAPSHOT + 1.1.0 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + tools.logging-1.1.0 From beeb40a5ad7e9bd1597c4d79dc5f0bd3f778acd4 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sat, 25 Apr 2020 18:49:59 -0500 Subject: [PATCH 17/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b3cd34f..0c3d9ce 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.1.0 + 1.1.1-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - tools.logging-1.1.0 + HEAD From 91dc6f9904c509fe51fa83279969815a37d248db Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Wed, 27 May 2020 19:47:19 -0400 Subject: [PATCH 18/62] Clarify logger name --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index bf719dd..e01cfd1 100644 --- a/README.md +++ b/README.md @@ -37,25 +37,25 @@ compile "org.clojure:tools.logging:1.1.0" Logging occurs with the `log` macro, or the level-specific convenience macros (e.g., `debug`, `debugf`). Only when the specified logging level is enabled will the message arguments be evaluated and the underlying logging implementation be -invoked. By default that invocation will occur via an agent when inside a running -STM transaction. +invoked. By default, that invocation will occur via an agent when inside a +running STM transaction. ### Namespacing of log entries Unless otherwise specified, the current namespace (as identified by `*ns*`) will -be used as the log-ns. This value can be emitted in the log entry, and used by most -logging implementations when using namespace-specific logging levels. +be used as the "logger name" when interacting with logging implementations. Most +logging implementations allow for varying configuration by logger name. -Note: You should configure your logging implementation to display the name that -was passed to it. If it instead performs stack-inspection you'll see some ugly -and unhelpful text in your logs. +Note: You should configure your logging implementation to display the logger +name that was passed to it. If it instead the logging implementation performs +stack-inspection you'll see some ugly and unhelpful text in your logs. ### Redirecting output to logs You can redirect all java writes of `System.out` and `System.err` to the log system by calling `log-capture!`. To bind `*out*` and `*err*` to the log system -invoke `with-logs`. In both cases a log-ns value must be specified in order to -namespace the output. +invoke `with-logs`. In both cases a logger name must be provided in lieu of +using `*ns*`. ## Configuration From 84826de40c1700c9e1f0a39d52b82eb11ce4afb0 Mon Sep 17 00:00:00 2001 From: Alexander Taggart Date: Wed, 27 May 2020 19:48:25 -0400 Subject: [PATCH 19/62] Add log4j2 config and note about ex-info data maps --- README.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/README.md b/README.md index e01cfd1..38659e6 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,37 @@ The above approach is problematic given that applications often inadvertently pu in multiple logging implementations as transitive dependencies. As such, it is _strongly_ advised that you set the system property. +### Log4J2 + +A simple Log4j2 [configuration](https://logging.apache.org/log4j/2.x/manual/configuration.html): + +```properties +status = warn +monitorInterval = 5 + +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %date %level %logger %message%n%throwable + +rootLogger.level = info +rootLogger.appenderRef.stdout.ref = STDOUT +``` + +*Note:* The above [pattern](https://logging.apache.org/log4j/2.x/manual/layouts.html#Patterns) +explicitly uses `%throwable` so that `clojure.lang.ExceptionInfo` exceptions +will be printed with their data maps. If either `%xThrowable` (the default) or +`%rThrowable` is used, the data maps will not be printed. + +## FAQ + +#### When logging an `ex-info` exception, why isn't the data map printed? + +This is likely because the logging implementation is printing the contents of +`Throwable.getMessage()`, which returns just the message arg to `ex-info`. + +Logging implementations that print the contents of `toString()` or use `Throwable.printStackTrace(...)` +will end up printing the data map. ## Thanks From f2bf9a4b9663c8326c7a8505570c8305ece78899 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 18 Jun 2020 13:23:44 -0500 Subject: [PATCH 20/62] add LICENSE text file --- LICENSE | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e246f6a --- /dev/null +++ b/LICENSE @@ -0,0 +1,205 @@ +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation + distributed under this Agreement, and +b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are + distributed by that particular Contributor. A Contribution 'originates' + from a Contributor if it was added to the Program by such Contributor + itself or anyone acting on such Contributor's behalf. Contributions do not + include additions to the Program which: (i) are separate modules of + software distributed in conjunction with the Program under their own + license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + a) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free copyright license to + reproduce, prepare derivative works of, publicly display, publicly + perform, distribute and sublicense the Contribution of such Contributor, + if any, and such derivative works, in source code and object code form. + b) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free patent license under + Licensed Patents to make, use, sell, offer to sell, import and otherwise + transfer the Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the combination of + the Contribution and the Program if, at the time the Contribution is + added by the Contributor, such addition of the Contribution causes such + combination to be covered by the Licensed Patents. The patent license + shall not apply to any other combinations which include the Contribution. + No hardware per se is licensed hereunder. + c) Recipient understands that although each Contributor grants the licenses + to its Contributions set forth herein, no assurances are provided by any + Contributor that the Program does not infringe the patent or other + intellectual property rights of any other entity. Each Contributor + disclaims any liability to Recipient for claims brought by any other + entity based on infringement of intellectual property rights or + otherwise. As a condition to exercising the rights and licenses granted + hereunder, each Recipient hereby assumes sole responsibility to secure + any other intellectual property rights needed, if any. For example, if a + third party patent license is required to allow Recipient to distribute + the Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + b) its license agreement: + i) effectively disclaims on behalf of all Contributors all warranties + and conditions, express and implied, including warranties or + conditions of title and non-infringement, and implied warranties or + conditions of merchantability and fitness for a particular purpose; + ii) effectively excludes on behalf of all Contributors all liability for + damages, including direct, indirect, special, incidental and + consequential damages, such as lost profits; + iii) states that any provisions which differ from this Agreement are + offered by that Contributor alone and not by any other party; and + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable + manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + b) a copy of this Agreement must be included with each copy of the Program. + Contributors may not remove or alter any copyright notices contained + within the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, +if a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits and +other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such Commercial +Contributor in connection with its distribution of the Program in a commercial +product offering. The obligations in this section do not apply to any claims +or Losses relating to any actual or alleged intellectual property +infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor to control, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim at +its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to the +risks and costs of program errors, compliance with applicable laws, damage to +or loss of data, programs or equipment, and unavailability or interruption of +operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of the +Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this Agreement, +whether expressly, by implication, estoppel or otherwise. All rights in the +Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + + From 3509ba464a550d86d42152a9ff25fcb185054f6f Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Tue, 1 Sep 2020 13:31:33 -0700 Subject: [PATCH 21/62] Add CLI/deps.edn dependency information --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 38659e6..e4eab98 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,11 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. Lastest stable release is [1.1.0] +[CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information: +```clojure +org.clojure/tools.logging {:mvn/version "1.1.0"} +``` + Leiningen: ```clojure From 7508b902e85627c4dfe864cceac5152e5d11927b Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Wed, 20 Jan 2021 15:33:34 -0600 Subject: [PATCH 22/62] update to latest parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c3d9ce..e1d7bba 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.clojure pom.contrib - 0.2.2 + 1.0.0 From 016d0c9f30944527e3e442f9ac4fec9a4389cc08 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 18 Feb 2021 09:49:38 -0600 Subject: [PATCH 23/62] update old links --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d91a363..26313e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,5 +8,5 @@ more information on how to contribute. [Clojure contrib]: https://clojure.org/community/contrib_libs [Contributing]: https://clojure.org/community/contributing -[JIRA]: http://dev.clojure.org/jira/browse/TLOG +[JIRA]: https://clojure.atlassian.net/browse/TLOG [guidelines]: https://clojure.org/community/contrib_howto From 31073fe1fbb0533f3c775fa667de70809f24b127 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Wed, 24 Feb 2021 13:58:47 -0600 Subject: [PATCH 24/62] fix old link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4eab98..40699e2 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ compile "org.clojure:tools.logging:1.1.0" ## Usage -[Latest API Documentation](http://clojure.github.com/tools.logging) +[Latest API Documentation](https://clojure.github.io/tools.logging) Logging occurs with the `log` macro, or the level-specific convenience macros (e.g., `debug`, `debugf`). Only when the specified logging level is enabled will From 1c0fd826555aad0d4cf546705866c33e51bad509 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 15 Apr 2021 16:01:35 -0500 Subject: [PATCH 25/62] update parent pom version to latest --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1d7bba..3968f8d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.clojure pom.contrib - 1.0.0 + 1.1.0 From 4b99ebe53c62a66074aaf0a54e81b9ec9140fbf4 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 10 Dec 2021 08:14:10 -0600 Subject: [PATCH 26/62] update to latest deps --- pom.xml | 12 ++++++------ project.clj | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 3968f8d..664257f 100644 --- a/pom.xml +++ b/pom.xml @@ -27,37 +27,37 @@ org.slf4j slf4j-api - 1.6.2 + 1.7.32 test org.slf4j slf4j-log4j12 - 1.6.2 + 1.7.32 test log4j log4j - 1.2.16 + 1.2.17 test org.apache.logging.log4j log4j-api - 2.8.2 + 2.14.1 test org.apache.logging.log4j log4j-core - 2.8.2 + 2.14.1 test commons-logging commons-logging - 1.1.1 + 1.2 test diff --git a/project.clj b/project.clj index 2f19cf4..b545a90 100644 --- a/project.clj +++ b/project.clj @@ -9,11 +9,11 @@ :aliases {"cloverage" ["with-profile" "dev,cloverage" "cloverage" "--fail-threshold" "100"]} :profiles {:cloverage {:plugins [[lein-cloverage "1.0.9"]]} :dev {:dependencies [[org.clojure/clojure "1.8.0"] - [org.clojure/test.check "0.9.0"] - [org.slf4j/slf4j-api "1.6.2"] - [org.slf4j/slf4j-log4j12 "1.6.2"] - [log4j "1.2.16"] - [org.apache.logging.log4j/log4j-api "2.8.2"] - [org.apache.logging.log4j/log4j-core "2.8.2"] - [commons-logging "1.1.1"] - [criterium "0.4.5"]]}}) + [org.clojure/test.check "1.1.1"] + [org.slf4j/slf4j-api "1.7.32"] + [org.slf4j/slf4j-log4j12 "1.7.32"] + [log4j "1.2.17"] + [org.apache.logging.log4j/log4j-api "2.14.1"] + [org.apache.logging.log4j/log4j-core "2.14.1"] + [commons-logging "1.2"] + [criterium "0.4.6"]]}}) From dc7aea2388a952e3bcc01dd9240ade545052ea0b Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Fri, 10 Dec 2021 08:15:24 -0600 Subject: [PATCH 27/62] [maven-release-plugin] prepare release v1.2.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 664257f..e204909 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.1.1-SNAPSHOT + 1.2.0 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + v1.2.0 From de7f084109b518828b10c272e7adf523269583af Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Fri, 10 Dec 2021 08:15:24 -0600 Subject: [PATCH 28/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e204909..2343588 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.0 + 1.2.1-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - v1.2.0 + HEAD From bf3159a685e68e9e2babe18c5874de2219473d8b Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 10 Dec 2021 08:56:40 -0600 Subject: [PATCH 29/62] update for release --- CHANGELOG.md | 6 ++++++ README.md | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09eca77..e494b9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [1.2.0] - 2021-12-10 + +### Changed +- Bumped all testing deps to latest (particularly log4j) + ## [1.1.0] - 2020-04-25 ### Added - Add implementation of `spyf` to `clojure.tools.logging.readable`. @@ -97,6 +102,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial implementation of Clojure-aware logging abstraction. [Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...HEAD +[1.2.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...tools.logging-1.2.0 [1.1.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...tools.logging-1.1.0 [1.0.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.6.0...tools.logging-1.0.0 [0.6.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.5.0...tools.logging-0.6.0 diff --git a/README.md b/README.md index 40699e2..1cc94ec 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.1.0] +Lastest stable release is [1.2.0] [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information: ```clojure -org.clojure/tools.logging {:mvn/version "1.1.0"} +org.clojure/tools.logging {:mvn/version "1.2.0"} ``` Leiningen: ```clojure -[org.clojure/tools.logging "1.1.0"] +[org.clojure/tools.logging "1.2.0"] ``` Maven: @@ -24,14 +24,14 @@ Maven: org.clojure tools.logging - 1.1.0 + 1.2.0 ``` Gradle: ```clojure -compile "org.clojure:tools.logging:1.1.0" +compile "org.clojure:tools.logging:1.2.0" ``` @@ -142,7 +142,7 @@ Copyright © 2009 Alex Taggart Licensed under the EPL. (See the file epl.html.) -[1.1.0]: https://github.com/clojure/tools.logging/tree/tools.logging-1.1.0 +[1.2.0]: https://github.com/clojure/tools.logging/tree/tools.logging-1.2.0 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options [SLF4J]: http://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging From 8e8f899c00d79b03a7f5a3a83e52433d689feaf7 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 10 Dec 2021 09:15:42 -0600 Subject: [PATCH 30/62] update log4j again --- pom.xml | 10 ++-------- project.clj | 5 ++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 2343588..1c890e2 100644 --- a/pom.xml +++ b/pom.xml @@ -36,22 +36,16 @@ 1.7.32 test - - log4j - log4j - 1.2.17 - test - org.apache.logging.log4j log4j-api - 2.14.1 + 2.15.0 test org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 test diff --git a/project.clj b/project.clj index b545a90..44ab705 100644 --- a/project.clj +++ b/project.clj @@ -12,8 +12,7 @@ [org.clojure/test.check "1.1.1"] [org.slf4j/slf4j-api "1.7.32"] [org.slf4j/slf4j-log4j12 "1.7.32"] - [log4j "1.2.17"] - [org.apache.logging.log4j/log4j-api "2.14.1"] - [org.apache.logging.log4j/log4j-core "2.14.1"] + [org.apache.logging.log4j/log4j-api "2.15.0"] + [org.apache.logging.log4j/log4j-core "2.15.0"] [commons-logging "1.2"] [criterium "0.4.6"]]}}) From b1f0f6fadc94169943516565fe4cda555659c369 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Fri, 10 Dec 2021 09:16:46 -0600 Subject: [PATCH 31/62] [maven-release-plugin] prepare release v1.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1c890e2..ac4a819 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.1-SNAPSHOT + 1.2.1 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + v1.2.1 From 7298390a8119f4fc17ef4e6ffde887b5697003a6 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Fri, 10 Dec 2021 09:16:46 -0600 Subject: [PATCH 32/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ac4a819..f993d63 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.1 + 1.2.2-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - v1.2.1 + HEAD From d16ab934c50ef15cafcbfc726de617dbc8563791 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 10 Dec 2021 09:28:47 -0600 Subject: [PATCH 33/62] update for release --- CHANGELOG.md | 6 ++++++ README.md | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e494b9e..ad055e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [1.2.1] - 2021-12-10 + +### Changed +- Bumped all testing deps to latest (particularly log4j) + ## [1.2.0] - 2021-12-10 ### Changed @@ -102,6 +107,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial implementation of Clojure-aware logging abstraction. [Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...HEAD +[1.2.1]: https://github.com/clojure/tools.logging/compare/tools.logging-1.2.0...tools.logging-1.2.1 [1.2.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...tools.logging-1.2.0 [1.1.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...tools.logging-1.1.0 [1.0.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.6.0...tools.logging-1.0.0 diff --git a/README.md b/README.md index 1cc94ec..edd23eb 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.2.0] +Lastest stable release is [1.2.1] [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information: ```clojure -org.clojure/tools.logging {:mvn/version "1.2.0"} +org.clojure/tools.logging {:mvn/version "1.2.1"} ``` Leiningen: ```clojure -[org.clojure/tools.logging "1.2.0"] +[org.clojure/tools.logging "1.2.1"] ``` Maven: @@ -24,14 +24,14 @@ Maven: org.clojure tools.logging - 1.2.0 + 1.2.1 ``` Gradle: ```clojure -compile "org.clojure:tools.logging:1.2.0" +compile "org.clojure:tools.logging:1.2.1" ``` @@ -137,12 +137,12 @@ will end up printing the data map. ## License -Copyright © 2009 Alex Taggart +Copyright © 2009-2021 Rich Hickey, Alex Taggart, and contributors Licensed under the EPL. (See the file epl.html.) -[1.2.0]: https://github.com/clojure/tools.logging/tree/tools.logging-1.2.0 +[1.2.1]: https://github.com/clojure/tools.logging/tree/tools.logging-1.2.1 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options [SLF4J]: http://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging From c0986895bd9e230daa7986d7488b8327f4a40283 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 14 Dec 2021 15:33:52 -0600 Subject: [PATCH 34/62] bump log4j testing deps to 2.16.0 --- CHANGELOG.md | 3 +++ pom.xml | 4 ++-- project.clj | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad055e2..4732b70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed +- Bumped log4j testing deps to 2.16.0 + ## [1.2.1] - 2021-12-10 ### Changed diff --git a/pom.xml b/pom.xml index f993d63..507f597 100644 --- a/pom.xml +++ b/pom.xml @@ -39,13 +39,13 @@ org.apache.logging.log4j log4j-api - 2.15.0 + 2.16.0 test org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 test diff --git a/project.clj b/project.clj index 44ab705..2684cd8 100644 --- a/project.clj +++ b/project.clj @@ -12,7 +12,7 @@ [org.clojure/test.check "1.1.1"] [org.slf4j/slf4j-api "1.7.32"] [org.slf4j/slf4j-log4j12 "1.7.32"] - [org.apache.logging.log4j/log4j-api "2.15.0"] - [org.apache.logging.log4j/log4j-core "2.15.0"] + [org.apache.logging.log4j/log4j-api "2.16.0"] + [org.apache.logging.log4j/log4j-core "2.16.0"] [commons-logging "1.2"] [criterium "0.4.6"]]}}) From 113e93da71d71b95feb3ce270b9f8d616643eea3 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Tue, 14 Dec 2021 22:06:01 -0600 Subject: [PATCH 35/62] [maven-release-plugin] prepare release v1.2.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 507f597..a3b1f09 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.2-SNAPSHOT + 1.2.2 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + v1.2.2 From ab9cd07740528b090bd29778fb4c502b48412fb3 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Tue, 14 Dec 2021 22:06:01 -0600 Subject: [PATCH 36/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a3b1f09..13a378f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.2 + 1.2.3-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - v1.2.2 + HEAD From 0ede9325797ddd7938719a0dd125a178c176e234 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 14 Dec 2021 22:16:40 -0600 Subject: [PATCH 37/62] update for release --- CHANGELOG.md | 9 +++++---- README.md | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4732b70..92ee435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). -## [Unreleased] +## [1.2.2] - 2021-12-14 ### Changed -- Bumped log4j testing deps to 2.16.0 +- Bumped log4j test deps to 2.16.0 ## [1.2.1] - 2021-12-10 @@ -110,8 +110,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial implementation of Clojure-aware logging abstraction. [Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...HEAD -[1.2.1]: https://github.com/clojure/tools.logging/compare/tools.logging-1.2.0...tools.logging-1.2.1 -[1.2.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...tools.logging-1.2.0 +[1.2.1]: https://github.com/clojure/tools.logging/compare/v1.2.1...v1.2.2 +[1.2.1]: https://github.com/clojure/tools.logging/compare/v1.2.0...v1.2.1 +[1.2.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...v1.2.0 [1.1.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...tools.logging-1.1.0 [1.0.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.6.0...tools.logging-1.0.0 [0.6.0]: https://github.com/clojure/tools.logging/compare/tools.logging-0.5.0...tools.logging-0.6.0 diff --git a/README.md b/README.md index edd23eb..af2e482 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.2.1] +Lastest stable release is [1.2.2] [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information: ```clojure -org.clojure/tools.logging {:mvn/version "1.2.1"} +org.clojure/tools.logging {:mvn/version "1.2.2"} ``` Leiningen: ```clojure -[org.clojure/tools.logging "1.2.1"] +[org.clojure/tools.logging "1.2.2"] ``` Maven: @@ -24,14 +24,14 @@ Maven: org.clojure tools.logging - 1.2.1 + 1.2.2 ``` Gradle: ```clojure -compile "org.clojure:tools.logging:1.2.1" +compile "org.clojure:tools.logging:1.2.2" ``` @@ -142,7 +142,7 @@ Copyright © 2009-2021 Rich Hickey, Alex Taggart, and contributors Licensed under the EPL. (See the file epl.html.) -[1.2.1]: https://github.com/clojure/tools.logging/tree/tools.logging-1.2.1 +[1.2.2]: https://github.com/clojure/tools.logging/tree/v1.2.2 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options [SLF4J]: http://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging From 6f643d472c6ffe76f36ad706018fde52011488e9 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sat, 18 Dec 2021 16:17:03 -0600 Subject: [PATCH 38/62] update log4j TEST dependencies --- pom.xml | 4 ++-- project.clj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 13a378f..22b3f63 100644 --- a/pom.xml +++ b/pom.xml @@ -39,13 +39,13 @@ org.apache.logging.log4j log4j-api - 2.16.0 + 2.17.0 test org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 test diff --git a/project.clj b/project.clj index 2684cd8..ee056dd 100644 --- a/project.clj +++ b/project.clj @@ -12,7 +12,7 @@ [org.clojure/test.check "1.1.1"] [org.slf4j/slf4j-api "1.7.32"] [org.slf4j/slf4j-log4j12 "1.7.32"] - [org.apache.logging.log4j/log4j-api "2.16.0"] - [org.apache.logging.log4j/log4j-core "2.16.0"] + [org.apache.logging.log4j/log4j-api "2.17.0"] + [org.apache.logging.log4j/log4j-core "2.17.0"] [commons-logging "1.2"] [criterium "0.4.6"]]}}) From b20d812146740b5be2b62c089e5fcaa3c9d2f5ec Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sat, 18 Dec 2021 16:18:19 -0600 Subject: [PATCH 39/62] [maven-release-plugin] prepare release v1.2.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 22b3f63..aca129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.3-SNAPSHOT + 1.2.3 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + v1.2.3 From cffe3602232759c5b54d691b1b80f5abc06f63b8 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Sat, 18 Dec 2021 16:18:19 -0600 Subject: [PATCH 40/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index aca129a..56708db 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.3 + 1.2.4-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - v1.2.3 + HEAD From 5ef312f0e286a39f9c97539b75c2ff8d764efc04 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sat, 18 Dec 2021 16:25:58 -0600 Subject: [PATCH 41/62] update for release --- CHANGELOG.md | 8 +++++++- README.md | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92ee435..ceefc4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). +## [1.2.3] - 2021-12-18 + +### Changed +- Bumped log4j test deps to 2.17.0 + ## [1.2.2] - 2021-12-14 ### Changed @@ -110,7 +115,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial implementation of Clojure-aware logging abstraction. [Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...HEAD -[1.2.1]: https://github.com/clojure/tools.logging/compare/v1.2.1...v1.2.2 +[1.2.3]: https://github.com/clojure/tools.logging/compare/v1.2.2...v1.2.3 +[1.2.2]: https://github.com/clojure/tools.logging/compare/v1.2.1...v1.2.2 [1.2.1]: https://github.com/clojure/tools.logging/compare/v1.2.0...v1.2.1 [1.2.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...v1.2.0 [1.1.0]: https://github.com/clojure/tools.logging/compare/tools.logging-1.0.0...tools.logging-1.1.0 diff --git a/README.md b/README.md index af2e482..79e71a0 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.2.2] +Lastest stable release is [1.2.3] [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information: ```clojure -org.clojure/tools.logging {:mvn/version "1.2.2"} +org.clojure/tools.logging {:mvn/version "1.2.3"} ``` Leiningen: ```clojure -[org.clojure/tools.logging "1.2.2"] +[org.clojure/tools.logging "1.2.3"] ``` Maven: @@ -24,14 +24,14 @@ Maven: org.clojure tools.logging - 1.2.2 + 1.2.3 ``` Gradle: ```clojure -compile "org.clojure:tools.logging:1.2.2" +compile "org.clojure:tools.logging:1.2.3" ``` @@ -142,7 +142,7 @@ Copyright © 2009-2021 Rich Hickey, Alex Taggart, and contributors Licensed under the EPL. (See the file epl.html.) -[1.2.2]: https://github.com/clojure/tools.logging/tree/v1.2.2 +[1.2.3]: https://github.com/clojure/tools.logging/tree/v1.2.3 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options [SLF4J]: http://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging From 7235aceb97af973cd5b7f1e0a2105c82b5ab5410 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 4 Jan 2022 14:41:10 -0600 Subject: [PATCH 42/62] bump log4j test deps to 2.17.1 --- CHANGELOG.md | 5 +++++ pom.xml | 4 ++-- project.clj | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceefc4e..bd4f612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). +## next + +### Changed +- Bumped log4j test deps to 2.17.1 + ## [1.2.3] - 2021-12-18 ### Changed diff --git a/pom.xml b/pom.xml index 56708db..f578ec2 100644 --- a/pom.xml +++ b/pom.xml @@ -39,13 +39,13 @@ org.apache.logging.log4j log4j-api - 2.17.0 + 2.17.1 test org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 test diff --git a/project.clj b/project.clj index ee056dd..5779ec0 100644 --- a/project.clj +++ b/project.clj @@ -12,7 +12,7 @@ [org.clojure/test.check "1.1.1"] [org.slf4j/slf4j-api "1.7.32"] [org.slf4j/slf4j-log4j12 "1.7.32"] - [org.apache.logging.log4j/log4j-api "2.17.0"] - [org.apache.logging.log4j/log4j-core "2.17.0"] + [org.apache.logging.log4j/log4j-api "2.17.1"] + [org.apache.logging.log4j/log4j-core "2.17.1"] [commons-logging "1.2"] [criterium "0.4.6"]]}}) From 2838317a8c49a892e36fc9672ed9252b46e9c013 Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Tue, 4 Jan 2022 14:41:59 -0600 Subject: [PATCH 43/62] [maven-release-plugin] prepare release v1.2.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f578ec2..d7d9a91 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.4-SNAPSHOT + 1.2.4 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + v1.2.4 From d91ed16dd7090e3764522959aa986891ac0280af Mon Sep 17 00:00:00 2001 From: "Hudson @ build.clojure.org" Date: Tue, 4 Jan 2022 14:41:59 -0600 Subject: [PATCH 44/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d7d9a91..93965bd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.4 + 1.2.5-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - v1.2.4 + HEAD From 233ff932f4523e2a5181636b131740ad8e519ca8 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 4 Jan 2022 14:55:05 -0600 Subject: [PATCH 45/62] update for release --- CHANGELOG.md | 3 ++- README.md | 19 ++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd4f612..b525c64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). -## next +## [1.2.4] - 2022-01-04 ### Changed - Bumped log4j test deps to 2.17.1 @@ -120,6 +120,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial implementation of Clojure-aware logging abstraction. [Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...HEAD +[1.2.4]: https://github.com/clojure/tools.logging/compare/v1.2.3...v1.2.4 [1.2.3]: https://github.com/clojure/tools.logging/compare/v1.2.2...v1.2.3 [1.2.2]: https://github.com/clojure/tools.logging/compare/v1.2.1...v1.2.2 [1.2.1]: https://github.com/clojure/tools.logging/compare/v1.2.0...v1.2.1 diff --git a/README.md b/README.md index 79e71a0..9567d13 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.2.3] +Lastest stable release is [1.2.4] [CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information: ```clojure -org.clojure/tools.logging {:mvn/version "1.2.3"} +org.clojure/tools.logging {:mvn/version "1.2.4"} ``` Leiningen: ```clojure -[org.clojure/tools.logging "1.2.3"] +[org.clojure/tools.logging "1.2.4"] ``` Maven: @@ -24,17 +24,10 @@ Maven: org.clojure tools.logging - 1.2.3 + 1.2.4 ``` -Gradle: - -```clojure -compile "org.clojure:tools.logging:1.2.3" -``` - - ## Usage [Latest API Documentation](https://clojure.github.io/tools.logging) @@ -137,12 +130,12 @@ will end up printing the data map. ## License -Copyright © 2009-2021 Rich Hickey, Alex Taggart, and contributors +Copyright © 2009-2022 Rich Hickey, Alex Taggart, and contributors Licensed under the EPL. (See the file epl.html.) -[1.2.3]: https://github.com/clojure/tools.logging/tree/v1.2.3 +[1.2.4]: https://github.com/clojure/tools.logging/tree/v1.2.4 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options [SLF4J]: http://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging From 0ffb942f7c9b5c3fcc209183d176dd7003200d05 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 7 Feb 2022 16:07:52 -0600 Subject: [PATCH 46/62] add pull request template --- .github/PULL_REQUEST_TEMPLATE | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE new file mode 100644 index 0000000..f1a88e9 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE @@ -0,0 +1,14 @@ +Hi! Thanks for your interest in contributing to this project. + +Clojure contrib projects do not use GitHub issues or pull requests, and +require a signed Contributor Agreement. If you would like to contribute, +please read more about the CA and sign that first (this can be done online). + +Then go to this project's issue tracker in JIRA to create tickets, update +tickets, or submit patches. For help in creating tickets and patches, +please see: + +- Contributing FAQ: https://clojure.org/dev +- Signing the CA: https://clojure.org/dev/contributor_agreement +- Creating Tickets: https://clojure.org/dev/creating_tickets +- Developing Patches: https://clojure.org/dev/developing_patches From 9e0293be52035f245e47595c1f099526c91b5f60 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 7 Feb 2022 16:08:33 -0600 Subject: [PATCH 47/62] fix grammar --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9567d13..28a405e 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ be used as the "logger name" when interacting with logging implementations. Most logging implementations allow for varying configuration by logger name. Note: You should configure your logging implementation to display the logger -name that was passed to it. If it instead the logging implementation performs +name that was passed to it. If instead the logging implementation performs stack-inspection you'll see some ugly and unhelpful text in your logs. ### Redirecting output to logs From 3162019e78ad6b2a257da552cd00ea39fc7eb457 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Thu, 2 Feb 2023 09:43:55 -0600 Subject: [PATCH 48/62] TLOG-28 Move slf4j test deps to 2.0.6 --- CHANGELOG.md | 5 +++++ pom.xml | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b525c64..543b605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). +## next + +### Changed +- TLOG-28 - Moved slf4j test deps to 2.0.6 + ## [1.2.4] - 2022-01-04 ### Changed diff --git a/pom.xml b/pom.xml index 93965bd..f021228 100644 --- a/pom.xml +++ b/pom.xml @@ -27,13 +27,13 @@ org.slf4j slf4j-api - 1.7.32 + 2.0.6 test org.slf4j - slf4j-log4j12 - 1.7.32 + slf4j-reload4j + 2.0.6 test From 302cc2f095a0de7847c7d5590f37c5a7cc990954 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 26 May 2023 15:49:19 -0500 Subject: [PATCH 49/62] add workflows --- .github/workflows/release.yml | 19 +++++++++++++++++++ .github/workflows/snapshot.yml | 8 ++++++++ .github/workflows/test.yml | 7 +++++++ README.md | 2 +- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/snapshot.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..e2718bd --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,19 @@ +name: Release on demand + +on: + workflow_dispatch: + inputs: + releaseVersion: + description: "Version to release" + required: true + snapshotVersion: + description: "Snapshot version after release" + required: true + +jobs: + call-release: + uses: clojure/build.ci/.github/workflows/release.yml@master + with: + releaseVersion: ${{ github.event.inputs.releaseVersion }} + snapshotVersion: ${{ github.event.inputs.snapshotVersion }} + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 0000000..2472957 --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,8 @@ +name: Snapshot on demand + +on: [workflow_dispatch] + +jobs: + call-snapshot: + uses: clojure/build.ci/.github/workflows/snapshot.yml@master + secrets: inherit diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..1fa127c --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,7 @@ +name: Test + +on: [push] + +jobs: + call-test: + uses: clojure/build.ci/.github/workflows/test.yml@master diff --git a/README.md b/README.md index 28a405e..5e1a19d 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ will end up printing the data map. ## License -Copyright © 2009-2022 Rich Hickey, Alex Taggart, and contributors +Copyright © 2009-2023 Rich Hickey, Alex Taggart, and contributors Licensed under the EPL. (See the file epl.html.) From e9ac5b177985f1ecefd2ff3bddf8c723fe281bb5 Mon Sep 17 00:00:00 2001 From: JarrodCTaylor Date: Wed, 16 Aug 2023 14:03:24 -0500 Subject: [PATCH 50/62] Added github action to build api docs --- .github/workflows/doc-build.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/doc-build.yml diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml new file mode 100644 index 0000000..336a7f3 --- /dev/null +++ b/.github/workflows/doc-build.yml @@ -0,0 +1,10 @@ +name: Build API Docs + +on: + workflow_dispatch: + +jobs: + call-doc-build-workflow: + uses: clojure/build.ci/.github/workflows/doc-build.yml@master + with: + project: clojure/tools.logging From 7d52d598fc4e4d1c9f47cbf355abaefedf66d7d0 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 6 Feb 2024 09:28:51 -0600 Subject: [PATCH 51/62] bump Clojure dep to 1.10.3 --- CHANGELOG.md | 1 + pom.xml | 4 ++++ project.clj | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 543b605..5a45a76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - TLOG-28 - Moved slf4j test deps to 2.0.6 +- Bumped Clojure dep to 1.10.3 ## [1.2.4] - 2022-01-04 diff --git a/pom.xml b/pom.xml index f021228..d9434c7 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,10 @@ HEAD + + 1.10.3 + + org.slf4j diff --git a/project.clj b/project.clj index 5779ec0..4b84214 100644 --- a/project.clj +++ b/project.clj @@ -8,7 +8,7 @@ :dependencies [[org.clojure/clojure "1.3.0"]] :aliases {"cloverage" ["with-profile" "dev,cloverage" "cloverage" "--fail-threshold" "100"]} :profiles {:cloverage {:plugins [[lein-cloverage "1.0.9"]]} - :dev {:dependencies [[org.clojure/clojure "1.8.0"] + :dev {:dependencies [[org.clojure/clojure "1.10.3"] [org.clojure/test.check "1.1.1"] [org.slf4j/slf4j-api "1.7.32"] [org.slf4j/slf4j-log4j12 "1.7.32"] From be30369b2fcf5403ae75cebbc9e645046525f437 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Tue, 6 Feb 2024 17:10:40 +0000 Subject: [PATCH 52/62] [maven-release-plugin] prepare release v1.3.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d9434c7..2dd4628 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.2.5-SNAPSHOT + 1.3.0 tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + v1.3.0 From 596cec18cb386612701e8e0816d3732f2d86488c Mon Sep 17 00:00:00 2001 From: clojure-build Date: Tue, 6 Feb 2024 17:10:40 +0000 Subject: [PATCH 53/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2dd4628..87c6a69 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.3.0 + 1.3.1-SNAPSHOT tools.logging @@ -20,7 +20,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - v1.3.0 + HEAD From 7e67cd5c8521f2f1ca4702469f90bdcfe86d3963 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 19 Feb 2024 10:29:43 -0600 Subject: [PATCH 54/62] update parent pom --- pom.xml | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 87c6a69..3d4e926 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.clojure pom.contrib - 1.1.0 + 1.2.0 diff --git a/project.clj b/project.clj index 4b84214..ed841a2 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :source-paths ["src/main/clojure"] :test-paths ["src/test/clojure"] - :dependencies [[org.clojure/clojure "1.3.0"]] + :dependencies [[org.clojure/clojure "1.9.0"]] :aliases {"cloverage" ["with-profile" "dev,cloverage" "cloverage" "--fail-threshold" "100"]} :profiles {:cloverage {:plugins [[lein-cloverage "1.0.9"]]} :dev {:dependencies [[org.clojure/clojure "1.10.3"] From f1e5f0404cedb460a46edcb1bddb514ea6f8dc91 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 19 Feb 2024 10:34:06 -0600 Subject: [PATCH 55/62] update for release --- CHANGELOG.md | 2 +- README.md | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a45a76..5aaf78e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). -## next +## [1.3.0] - 2024-02-06 ### Changed - TLOG-28 - Moved slf4j test deps to 2.0.6 diff --git a/README.md b/README.md index 5e1a19d..bd321d9 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.2.4] +Lastest stable release is [1.3.0] -[CLI/`deps.edn`](https://clojure.org/reference/deps_and_cli) dependency information: +[CLI/`deps.edn`](https://clojure.org/reference/deps_edn) dependency information: ```clojure -org.clojure/tools.logging {:mvn/version "1.2.4"} +org.clojure/tools.logging {:mvn/version "1.3.0"} ``` Leiningen: ```clojure -[org.clojure/tools.logging "1.2.4"] +[org.clojure/tools.logging "1.3.0"] ``` Maven: @@ -24,7 +24,7 @@ Maven: org.clojure tools.logging - 1.2.4 + 1.3.0 ``` @@ -130,15 +130,16 @@ will end up printing the data map. ## License -Copyright © 2009-2023 Rich Hickey, Alex Taggart, and contributors +Copyright © Rich Hickey, Alex Taggart, and contributors Licensed under the EPL. (See the file epl.html.) +[1.3.0]: https://github.com/clojure/tools.logging/tree/v1.3.0 [1.2.4]: https://github.com/clojure/tools.logging/tree/v1.2.4 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options -[SLF4J]: http://www.slf4j.org/ +[SLF4J]: https://www.slf4j.org/ [Apache Commons Logging]: https://commons.apache.org/logging [Log4J 2]: https://logging.apache.org/log4j/2.x/ -[Log4J]: http://logging.apache.org/log4j/1.2/ +[Log4J]: https://logging.apache.org/log4j/1.2/ [java.util.logging]: https://docs.oracle.com/en/java/javase/13/docs/api/java.logging/java/util/logging/package-summary.html From ce4d642c62deba72aa455ade45f77c7ae42d3d4f Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Fri, 30 May 2025 15:24:25 -0500 Subject: [PATCH 56/62] update to new parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d4e926..d0fbc8b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.clojure pom.contrib - 1.2.0 + 1.3.0 From bd88be7df1868597cd463f34890dfdd7ce65a1f2 Mon Sep 17 00:00:00 2001 From: Fogus Date: Tue, 21 Oct 2025 08:30:43 -0400 Subject: [PATCH 57/62] Add description for tools.logging pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d0fbc8b..e44d799 100644 --- a/pom.xml +++ b/pom.xml @@ -3,6 +3,7 @@ tools.logging 1.3.1-SNAPSHOT tools.logging + Clojure logging API. org.clojure From 1a02b1505c32bbf980ca3dff082f463519f1813e Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 23 Dec 2025 12:34:15 -0600 Subject: [PATCH 58/62] update deps to latest --- CHANGELOG.md | 7 +++++++ pom.xml | 12 ++++++------ project.clj | 18 +++++++++--------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aaf78e..bbb3fd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). +## next + +### Changed + +- Bumped deps to Clojure 1.11.4 +- Bumped test deps to latest + ## [1.3.0] - 2024-02-06 ### Changed diff --git a/pom.xml b/pom.xml index e44d799..dac1c6d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,38 +25,38 @@ - 1.10.3 + 1.11.4 org.slf4j slf4j-api - 2.0.6 + 2.0.17 test org.slf4j slf4j-reload4j - 2.0.6 + 2.0.17 test org.apache.logging.log4j log4j-api - 2.17.1 + 2.25.3 test org.apache.logging.log4j log4j-core - 2.17.1 + 2.25.3 test commons-logging commons-logging - 1.2 + 1.3.5 test diff --git a/project.clj b/project.clj index ed841a2..393d661 100644 --- a/project.clj +++ b/project.clj @@ -5,14 +5,14 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :source-paths ["src/main/clojure"] :test-paths ["src/test/clojure"] - :dependencies [[org.clojure/clojure "1.9.0"]] + :dependencies [[org.clojure/clojure "1.11.4"]] :aliases {"cloverage" ["with-profile" "dev,cloverage" "cloverage" "--fail-threshold" "100"]} - :profiles {:cloverage {:plugins [[lein-cloverage "1.0.9"]]} - :dev {:dependencies [[org.clojure/clojure "1.10.3"] - [org.clojure/test.check "1.1.1"] - [org.slf4j/slf4j-api "1.7.32"] - [org.slf4j/slf4j-log4j12 "1.7.32"] - [org.apache.logging.log4j/log4j-api "2.17.1"] - [org.apache.logging.log4j/log4j-core "2.17.1"] - [commons-logging "1.2"] + :profiles {:cloverage {:plugins [[lein-cloverage "1.2.4"]]} + :dev {:dependencies [[org.clojure/clojure "1.11.4"] + [org.clojure/test.check "1.1.2"] + [org.slf4j/slf4j-api "2.0.17"] + [org.slf4j/slf4j-log4j12 "2.0.17"] + [org.apache.logging.log4j/log4j-api "2.25.3"] + [org.apache.logging.log4j/log4j-core "2.25.3"] + [commons-logging "1.3.5"] [criterium "0.4.6"]]}}) From 5b969063bfdb71a1f29f68072f7b505f4a3cd485 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 14:56:31 -0600 Subject: [PATCH 59/62] update permissions in workflows --- .github/workflows/doc-build.yml | 3 +++ .github/workflows/release.yml | 3 +++ .github/workflows/snapshot.yml | 3 +++ .github/workflows/test.yml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index 336a7f3..7bb4d73 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -1,5 +1,8 @@ name: Build API Docs +permissions: + contents: write + on: workflow_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e2718bd..286cf95 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,8 @@ name: Release on demand +permissions: + contents: write + on: workflow_dispatch: inputs: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 2472957..9fdad8c 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -1,5 +1,8 @@ name: Snapshot on demand +permissions: + contents: read + on: [workflow_dispatch] jobs: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1fa127c..2cc441a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,8 @@ name: Test +permissions: + contents: read + on: [push] jobs: From 73f939a90912081c4f9ec0820f3896a79a111e83 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 30 Dec 2025 15:00:46 -0600 Subject: [PATCH 60/62] update to latest parent pom --- CHANGELOG.md | 5 ++++- README.md | 9 +++++---- pom.xml | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbb3fd6..68461d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) ([despite its flaws](https://www.youtube.com/watch?v=oyLBGkS5ICk)). -## next +## [1.3.1] - 2025-12-30 ### Changed +- Bumped parent pom to 1.4.0 - Bumped deps to Clojure 1.11.4 - Bumped test deps to latest @@ -133,6 +134,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial implementation of Clojure-aware logging abstraction. [Unreleased]: https://github.com/clojure/tools.logging/compare/tools.logging-1.1.0...HEAD +[1.3.1]: https://github.com/clojure/tools.logging/compare/v1.3.0...v1.3.1 +[1.3.0]: https://github.com/clojure/tools.logging/compare/v1.2.4...v1.3.0 [1.2.4]: https://github.com/clojure/tools.logging/compare/v1.2.3...v1.2.4 [1.2.3]: https://github.com/clojure/tools.logging/compare/v1.2.2...v1.2.3 [1.2.2]: https://github.com/clojure/tools.logging/compare/v1.2.1...v1.2.2 diff --git a/README.md b/README.md index bd321d9..b4eba9f 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ at runtime when the `clojure.tools.logging` namespace is first loaded. ## Installation -Lastest stable release is [1.3.0] +Lastest stable release is [1.3.1] [CLI/`deps.edn`](https://clojure.org/reference/deps_edn) dependency information: ```clojure -org.clojure/tools.logging {:mvn/version "1.3.0"} +org.clojure/tools.logging {:mvn/version "1.3.1"} ``` Leiningen: ```clojure -[org.clojure/tools.logging "1.3.0"] +[org.clojure/tools.logging "1.3.1"] ``` Maven: @@ -24,7 +24,7 @@ Maven: org.clojure tools.logging - 1.3.0 + 1.3.1 ``` @@ -135,6 +135,7 @@ Copyright © Rich Hickey, Alex Taggart, and contributors Licensed under the EPL. (See the file epl.html.) +[1.3.1]: https://github.com/clojure/tools.logging/tree/v1.3.1 [1.3.0]: https://github.com/clojure/tools.logging/tree/v1.3.0 [1.2.4]: https://github.com/clojure/tools.logging/tree/v1.2.4 [Leiningen example]: https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md#setting-jvm-options diff --git a/pom.xml b/pom.xml index dac1c6d..33653cf 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.clojure pom.contrib - 1.3.0 + 1.4.0 From 41a24edd613e57f05e2b4732ee379644b355414b Mon Sep 17 00:00:00 2001 From: clojure-build Date: Tue, 30 Dec 2025 21:02:49 +0000 Subject: [PATCH 61/62] [maven-release-plugin] prepare release v1.3.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 33653cf..ade1c17 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.3.1-SNAPSHOT + 1.3.1 tools.logging Clojure logging API. @@ -21,7 +21,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - HEAD + v1.3.1 From 8fdcbac4c13212e5b27f620e49a32dddb992b414 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Tue, 30 Dec 2025 21:02:49 +0000 Subject: [PATCH 62/62] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ade1c17..5d3d47b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 tools.logging - 1.3.1 + 1.3.2-SNAPSHOT tools.logging Clojure logging API. @@ -21,7 +21,7 @@ scm:git:git@github.com:clojure/tools.logging.git scm:git:git@github.com:clojure/tools.logging.git git@github.com:clojure/tools.logging.git - v1.3.1 + HEAD