From 9b2792d249d58dce30a56bd48f26277297766142 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <phil@hagelb.org>
Date: Fri, 5 May 2017 15:47:19 -0700
Subject: [PATCH] Remove pedantic version warnings in leiningen-core.

[skip ci]
---
 leiningen-core/pom.xml          | 18 ++++++++++++++----
 leiningen-core/project.clj      |  9 ++++++---
 src/leiningen/new/templates.clj |  4 ++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/leiningen-core/pom.xml b/leiningen-core/pom.xml
index 4358c050..30621555 100644
--- a/leiningen-core/pom.xml
+++ b/leiningen-core/pom.xml
@@ -14,7 +14,7 @@
     </license>
   </licenses>
   <scm>
-    <tag>bbbead38b2bbf6e4e7bb315b67dbde6948a6eb84
+    <tag>a441ba12ca9723d99e34da2d4aa3483cdf00331b
 </tag>
     <url/>
   </scm>
@@ -48,7 +48,7 @@
     </repository>
     <repository>
       <id>clojars</id>
-      <url>https://clojars.org/repo/</url>
+      <url>https://repo.clojars.org/</url>
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
@@ -72,8 +72,8 @@
       <version>0.2.8</version>
       <exclusions>
         <exclusion>
-          <groupId>org.tcrawley</groupId>
           <artifactId>dynapath</artifactId>
+          <groupId>org.tcrawley</groupId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -93,8 +93,12 @@
       <version>0.3.1</version>
       <exclusions>
         <exclusion>
-          <groupId>org.tcrawley</groupId>
           <artifactId>dynapath</artifactId>
+          <groupId>org.tcrawley</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>plexus-utils</artifactId>
+          <groupId>org.codehaus.plexus</groupId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -107,6 +111,12 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http</artifactId>
       <version>2.12</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>wagon-provider-api</artifactId>
+          <groupId>org.apache.maven.wagon</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.hypirion</groupId>
diff --git a/leiningen-core/project.clj b/leiningen-core/project.clj
index a0ae0e34..d3d64aa0 100644
--- a/leiningen-core/project.clj
+++ b/leiningen-core/project.clj
@@ -7,12 +7,15 @@
                  [bultitude "0.2.8" :exclusions [org.tcrawley/dynapath]]
                  [org.flatland/classlojure "0.7.1"]
                  [robert/hooke "1.3.0"]
-                 [com.cemerick/pomegranate "0.3.1" :exclusions [org.tcrawley/dynapath]]
+                 [com.cemerick/pomegranate "0.3.1"
+                  :exclusions [org.tcrawley/dynapath
+                               org.codehaus.plexus/plexus-utils]]
                  [org.tcrawley/dynapath "0.2.5"]
-                 [org.apache.maven.wagon/wagon-http "2.12"]
+                 [org.apache.maven.wagon/wagon-http "2.12"
+                  :exclusions [org.apache.maven.wagon/wagon-provider-api]]
                  [com.hypirion/io "0.3.1"]
                  [pedantic "0.2.0"]
-                 [org.slf4j/slf4j-nop "1.7.22"] ;; wagon-http started to use slf4j
+                 [org.slf4j/slf4j-nop "1.7.22"] ; wagon-http uses slf4j
                  ;; we pull this in transitively but want a newer version
                  [org.clojure/tools.macro "0.1.5"]]
   :scm {:dir ".."}
diff --git a/src/leiningen/new/templates.clj b/src/leiningen/new/templates.clj
index 02219156..304a20a8 100644
--- a/src/leiningen/new/templates.clj
+++ b/src/leiningen/new/templates.clj
@@ -130,7 +130,7 @@
   "Create a renderer function that looks for mustache templates in the
   right place given the name of your template. If no data is passed, the
   file is simply slurped and the content returned unchanged.
-  
+
   render-fn - Optional rendering function that will be used in place of the
               default renderer. This allows rendering templates that contain
               tags that conflic with the Stencil renderer such as {{..}}."
@@ -145,7 +145,7 @@
           (main/abort (format "Template resource '%s' not found." path)))))))
 
 ;; We  provide a hier order function which returns  a function to generate
-;; binary resources such as images placed in `leiningen/new/<template>/` 
+;; binary resources such as images placed in `leiningen/new/<template>/`
 (defn raw-resourcer
   "Create a renderer function that looks for raw files in the
   right place given the name of your template."