Merge pull request #88 from justinstoller/logback

(maint) Clean up some annoying issues
puppetlabs · Apr 4, 2024 · 0e54582 · 0e54582
2 parents e0bd4ae + ae6a848
commit 0e54582
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 169 deletions.
diff --git a/.github/workflows/lein-test.yaml b/.github/workflows/lein-test.yaml
@@ -26,7 +26,7 @@ jobs:
           distribution: temurin
           java-version: ${{ matrix.java }}
       - name: Install Clojure tools
-        uses: DeLaGuardo/setup-clojure@10.2
+        uses: DeLaGuardo/setup-clojure@12.5
         with:
           cli: latest              # Clojure CLI based on tools.deps
           lein: latest                  # Leiningen

diff --git a/project.clj b/project.clj
@@ -46,8 +46,7 @@
   :profiles {:defaults {:dependencies [[puppetlabs/http-client]
                                        [puppetlabs/trapperkeeper :classifier "test"]
                                        [com.puppetlabs/trapperkeeper-webserver-jetty10]
-                                       [puppetlabs/kitchensink :classifier "test"]]
-                        :resource-paths ["dev-resources"]}
+                                       [puppetlabs/kitchensink :classifier "test"]]}
              :dev-dependencies {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}
              :dev [:defaults :dev-dependencies]
              :fips-dependencies {:dependencies [[org.bouncycastle/bcpkix-fips]
@@ -70,8 +69,7 @@
 
              ;; per https://github.com/technomancy/leiningen/issues/1907
              ;; the provided profile is necessary for lein jar / lein install
-             :provided {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]
-                        :resource-paths ["dev-resources"]}
+             :provided {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}
 
              :testutils {:source-paths ^:replace ["test"]
                          :java-source-paths ^:replace []}}