From ed9fb0cd6e24bfed2e7b6267cc6af71c99c35956 Mon Sep 17 00:00:00 2001 From: Peter Monks Date: Mon, 14 Aug 2023 15:44:30 -0700 Subject: [PATCH 1/7] :arrow_up: Upgrade dependencies --- deps.edn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index 28e456d..9614ba0 100644 --- a/deps.edn +++ b/deps.edn @@ -21,14 +21,14 @@ org.clojure/tools.deps {:mvn/version "0.18.1354"} org.clojure/data.json {:mvn/version "2.4.0"} slipset/deps-deploy {:mvn/version "0.2.1" :exclusions [org.slf4j/slf4j-nop]} - io.github.clojure/tools.build {:mvn/version "0.9.4"} + io.github.clojure/tools.build {:mvn/version "0.9.5"} com.github.pmonks/tools-convenience {:mvn/version "1.0.135"} com.github.pmonks/tools-pom {:mvn/version "1.0.116"} com.github.pmonks/tools-licenses {:mvn/version "1.0.136"} clj-kondo/clj-kondo {:mvn/version "2023.07.13"} ; Dynamic dependencies - any time any of these changes it MUST ALSO BE CHANGED IN pbr.tasks!! - ch.qos.logback/logback-classic {:mvn/version "1.4.8"} + ch.qos.logback/logback-classic {:mvn/version "1.4.11"} org.slf4j/slf4j-api {:mvn/version "2.0.7"} org.slf4j/jcl-over-slf4j {:mvn/version "2.0.7"} org.slf4j/log4j-over-slf4j {:mvn/version "2.0.7"} From b2e817254371c85c461c8288ad6c22cd4978ca7c Mon Sep 17 00:00:00 2001 From: Peter Monks Date: Tue, 5 Sep 2023 16:14:46 -0700 Subject: [PATCH 2/7] :arrow_up: Upgrade dependencies --- .github/workflows/ci.yml | 2 +- .github/workflows/dependencies.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/vulnerabilities.yml | 2 +- deps.edn | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92fdba4..55911ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: distribution: 'temurin' diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 57bb42b..d971671 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -11,5 +11,5 @@ jobs: container: image: uochan/antq steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: java -jar /tmp/antq/antq.jar --skip=pom --error-format="::error file={{file}}::{{message}}" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6128aff..6ea8c91 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ jobs: environment: clojars steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Make sure we get the full history, or else the version number gets screwed up - uses: actions/setup-java@v3 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4f52e40..093659e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: distribution: 'temurin' diff --git a/.github/workflows/vulnerabilities.yml b/.github/workflows/vulnerabilities.yml index b30a2d0..3eab641 100644 --- a/.github/workflows/vulnerabilities.yml +++ b/.github/workflows/vulnerabilities.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Make sure we get the full history, or else the version number gets screwed up - uses: actions/setup-java@v3 diff --git a/deps.edn b/deps.edn index 9614ba0..39323b1 100644 --- a/deps.edn +++ b/deps.edn @@ -29,10 +29,10 @@ ; Dynamic dependencies - any time any of these changes it MUST ALSO BE CHANGED IN pbr.tasks!! ch.qos.logback/logback-classic {:mvn/version "1.4.11"} - org.slf4j/slf4j-api {:mvn/version "2.0.7"} - org.slf4j/jcl-over-slf4j {:mvn/version "2.0.7"} - org.slf4j/log4j-over-slf4j {:mvn/version "2.0.7"} - org.slf4j/jul-to-slf4j {:mvn/version "2.0.7"} + org.slf4j/slf4j-api {:mvn/version "2.0.9"} + org.slf4j/jcl-over-slf4j {:mvn/version "2.0.9"} + org.slf4j/log4j-over-slf4j {:mvn/version "2.0.9"} + org.slf4j/jul-to-slf4j {:mvn/version "2.0.9"} jonase/eastwood {:mvn/version "1.4.0"} codox/codox {:mvn/version "0.10.8"} com.github.athos/clj-check {:git/sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"} From 482434f72fac5bb065880e39585c0bc2d4ebec44 Mon Sep 17 00:00:00 2001 From: Peter Monks Date: Wed, 6 Sep 2023 10:36:22 -0700 Subject: [PATCH 3/7] :arrow_up: Upgrade dependencies --- .github/workflows/ci.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/vulnerabilities.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55911ae..b0d33e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@11.0 + - uses: DeLaGuardo/setup-clojure@12.0 with: cli: latest - uses: actions/cache@v3 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6ea8c91..efe2fb5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@11.0 + - uses: DeLaGuardo/setup-clojure@12.0 with: cli: latest - uses: actions/cache@v3 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 093659e..0da0d84 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@11.0 + - uses: DeLaGuardo/setup-clojure@12.0 with: cli: latest - uses: actions/cache@v3 diff --git a/.github/workflows/vulnerabilities.yml b/.github/workflows/vulnerabilities.yml index 3eab641..b711f36 100644 --- a/.github/workflows/vulnerabilities.yml +++ b/.github/workflows/vulnerabilities.yml @@ -25,7 +25,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@11.0 + - uses: DeLaGuardo/setup-clojure@12.0 with: cli: latest - uses: actions/cache@v3 From bda9712f37d2f0409b4be2b626d1545b481653f7 Mon Sep 17 00:00:00 2001 From: Peter Monks Date: Fri, 8 Sep 2023 11:22:27 -0700 Subject: [PATCH 4/7] :arrow_up: Upgrade dependencies --- .github/workflows/ci.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/vulnerabilities.yml | 2 +- deps.edn | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0d33e0..d0f35df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@12.0 + - uses: DeLaGuardo/setup-clojure@12.1 with: cli: latest - uses: actions/cache@v3 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index efe2fb5..3c059d4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@12.0 + - uses: DeLaGuardo/setup-clojure@12.1 with: cli: latest - uses: actions/cache@v3 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0da0d84..5112a0e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@12.0 + - uses: DeLaGuardo/setup-clojure@12.1 with: cli: latest - uses: actions/cache@v3 diff --git a/.github/workflows/vulnerabilities.yml b/.github/workflows/vulnerabilities.yml index b711f36..aa97c80 100644 --- a/.github/workflows/vulnerabilities.yml +++ b/.github/workflows/vulnerabilities.yml @@ -25,7 +25,7 @@ jobs: with: distribution: 'temurin' java-version: 17 - - uses: DeLaGuardo/setup-clojure@12.0 + - uses: DeLaGuardo/setup-clojure@12.1 with: cli: latest - uses: actions/cache@v3 diff --git a/deps.edn b/deps.edn index 39323b1..25c5e30 100644 --- a/deps.edn +++ b/deps.edn @@ -25,7 +25,7 @@ com.github.pmonks/tools-convenience {:mvn/version "1.0.135"} com.github.pmonks/tools-pom {:mvn/version "1.0.116"} com.github.pmonks/tools-licenses {:mvn/version "1.0.136"} - clj-kondo/clj-kondo {:mvn/version "2023.07.13"} + clj-kondo/clj-kondo {:mvn/version "2023.09.07"} ; Dynamic dependencies - any time any of these changes it MUST ALSO BE CHANGED IN pbr.tasks!! ch.qos.logback/logback-classic {:mvn/version "1.4.11"} From 4a25cf21882d27010362cb092c4bdea559aa47be Mon Sep 17 00:00:00 2001 From: Peter Monks Date: Mon, 11 Sep 2023 19:42:38 -0700 Subject: [PATCH 5/7] :arrow_up: Upgrade dependencies --- deps.edn | 2 +- src/pbr/tasks.clj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.edn b/deps.edn index 25c5e30..d0142ef 100644 --- a/deps.edn +++ b/deps.edn @@ -37,7 +37,7 @@ codox/codox {:mvn/version "0.10.8"} com.github.athos/clj-check {:git/sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"} io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd" - com.github.liquidz/antq {:mvn/version "2.4.1070"}}} + com.github.liquidz/antq {:mvn/version "2.6.1121"}}} :aliases {:build {:deps {com.github.pmonks/pbr {:local/root "."}} :ns-default pbr.build}}} diff --git a/src/pbr/tasks.clj b/src/pbr/tasks.clj index 9ccff18..0a467c8 100644 --- a/src/pbr/tasks.clj +++ b/src/pbr/tasks.clj @@ -32,11 +32,11 @@ (def ^:private ver-clj-check {:git/sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"}) (def ^:private ver-test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}) -(def ^:private ver-logback {:mvn/version "1.4.8"}) -(def ^:private ver-slf4j {:mvn/version "2.0.7"}) +(def ^:private ver-logback {:mvn/version "1.4.11"}) +(def ^:private ver-slf4j {:mvn/version "2.0.9"}) (def ^:private ver-eastwood {:mvn/version "1.4.0"}) (def ^:private ver-codox {:mvn/version "0.10.8"}) -(def ^:private ver-antq {:mvn/version "2.4.1070"}) +(def ^:private ver-antq {:mvn/version "2.6.1121"}) ; Utility functions From c4ff948a226fafa2220a9bba484dc7af6f22146b Mon Sep 17 00:00:00 2001 From: Peter Monks Date: Fri, 15 Sep 2023 18:39:02 -0700 Subject: [PATCH 6/7] :arrow_down: Downgrade logback to preserve JDK 1.8 support --- deps.edn | 2 +- src/pbr/tasks.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index d0142ef..c45f3d5 100644 --- a/deps.edn +++ b/deps.edn @@ -28,7 +28,7 @@ clj-kondo/clj-kondo {:mvn/version "2023.09.07"} ; Dynamic dependencies - any time any of these changes it MUST ALSO BE CHANGED IN pbr.tasks!! - ch.qos.logback/logback-classic {:mvn/version "1.4.11"} + ch.qos.logback/logback-classic {:mvn/version "1.3.11"} ; DO NOT UPGRADE THIS PAST 1.3.x OR pbr WON'T WORK ON JDK 1.8! org.slf4j/slf4j-api {:mvn/version "2.0.9"} org.slf4j/jcl-over-slf4j {:mvn/version "2.0.9"} org.slf4j/log4j-over-slf4j {:mvn/version "2.0.9"} diff --git a/src/pbr/tasks.clj b/src/pbr/tasks.clj index 0a467c8..0621ddb 100644 --- a/src/pbr/tasks.clj +++ b/src/pbr/tasks.clj @@ -32,7 +32,7 @@ (def ^:private ver-clj-check {:git/sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"}) (def ^:private ver-test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}) -(def ^:private ver-logback {:mvn/version "1.4.11"}) +(def ^:private ver-logback {:mvn/version "1.3.11"}) ; DO NOT UPGRADE THIS PAST 1.3.x OR pbr WON'T WORK ON JDK 1.8! (def ^:private ver-slf4j {:mvn/version "2.0.9"}) (def ^:private ver-eastwood {:mvn/version "1.4.0"}) (def ^:private ver-codox {:mvn/version "0.10.8"}) From 041e09f44db654dccab9ac1e9fe2c95370e084fc Mon Sep 17 00:00:00 2001 From: Peter Monks Date: Fri, 15 Sep 2023 18:39:58 -0700 Subject: [PATCH 7/7] :arrow_down: Downgrade logback to preserve JDK 1.8 support --- deps.edn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index c45f3d5..7533633 100644 --- a/deps.edn +++ b/deps.edn @@ -28,7 +28,8 @@ clj-kondo/clj-kondo {:mvn/version "2023.09.07"} ; Dynamic dependencies - any time any of these changes it MUST ALSO BE CHANGED IN pbr.tasks!! - ch.qos.logback/logback-classic {:mvn/version "1.3.11"} ; DO NOT UPGRADE THIS PAST 1.3.x OR pbr WON'T WORK ON JDK 1.8! +; Commented out to stop antq from barfing +; ch.qos.logback/logback-classic {:mvn/version "1.3.11"} ; DO NOT UPGRADE THIS PAST 1.3.x OR pbr WON'T WORK ON JDK 1.8! org.slf4j/slf4j-api {:mvn/version "2.0.9"} org.slf4j/jcl-over-slf4j {:mvn/version "2.0.9"} org.slf4j/log4j-over-slf4j {:mvn/version "2.0.9"}