commit bae2ea8fa3a63ed4df55e9c82206327a26479038
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Sep 17 01:05:14 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 17 01:05:14 2015 +0000
tree b427db1620e46c03dc283fcfb6daf3594a684a18
parent 39a8a766102b73871327e0db32f41f9a102f4675
parent f0febb17b9af547ce63c831286740a0c201cf197

Merge "Clean-up unneeded dependencies"

github-oauth/pom.xml

diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml
index 4ab10d4..5679222 100644
--- a/github-oauth/pom.xml
+++ b/github-oauth/pom.xml
@@ -113,6 +113,7 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.4</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

github-plugin/pom.xml

diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml
index adb635b..bc258c9 100644
--- a/github-plugin/pom.xml
+++ b/github-plugin/pom.xml
@@ -52,7 +52,6 @@
               <exclude>commons-codec:*:*</exclude>
               <exclude>commons-io:*:*</exclude>
               <exclude>com.google.guava:*</exclude>
-              <exclude>org.apache.velocity:velocity:*</exclude>
             </excludes>
           </artifactSet>
           <transformers>
@@ -137,6 +136,7 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.4</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
@@ -157,11 +157,7 @@
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
       <version>1.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-tools</artifactId>
-      <version>2.0</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jukito</groupId>