Clean-up unneeded dependencies GitHub build had quite some warnings of conflicts in the fat-jar shading phase. This change marks httpclient and velocity as "provided" dependencies as Gerrit already includes them. Additionally velocity-tools seems to be not used anymore and can be safely removed. Change-Id: I0b311924e11a5b7c82eb3ea8cdaf0c7db812aab2
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml index e758496..bc5636b 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>
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>