Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin/master' into JENKINS-34753
  • Loading branch information
rsandell committed May 18, 2016
2 parents c40227e + 5470360 commit b1c6b5242b94c802960a339a957e425b185ad7bd
Showing with 1 addition and 19 deletions.
  1. +1 −19 pom.xml
20 pom.xml
@@ -70,26 +70,8 @@
<dependency>
<groupId>com.sonymobile.tools.gerrit</groupId>
<artifactId>gerrit-events</artifactId>
<version>2.9.5</version>
<version>2.10.0</version>
<!-- New source is here: https://github.com/sonyxperiadev/gerrit-events -->
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<!--
We could release a version of gerrit-events that uses the newer required version.
I ran the full test suite with v 4.5 and it worked.
But a new module version just for that feels like too much of a hassle.
TODO remove when gerrit-events comes with the newer dependency.
-->
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5</version>
<!-- TODO remove when gerrit-events comes with the newer dependency. -->
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>

0 comments on commit b1c6b52

Please sign in to comment.