#544 downgrade checkstyle dependency to resolve guava version conflict with CDI weld

This commit is contained in:
Andreas Gudian 2015-05-17 22:52:55 +02:00 committed by sjaakd
parent 0890257700
commit fa1decd099
2 changed files with 7 additions and 3 deletions

View File

@ -43,7 +43,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<com.jolira.hickory.version>1.0.0</com.jolira.hickory.version>
<org.apache.maven.plugins.enforcer.version>1.2</org.apache.maven.plugins.enforcer.version>
<org.apache.maven.plugins.surefire.version>2.17</org.apache.maven.plugins.surefire.version>
<org.apache.maven.plugins.surefire.version>2.18.1</org.apache.maven.plugins.surefire.version>
<org.springframework.version>4.0.3.RELEASE</org.springframework.version>
<add.release.arguments />
<forkCount>1</forkCount>
@ -109,7 +109,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<version>14.0.1</version>
</dependency>
<dependency>
<groupId>com.jolira</groupId>
@ -121,6 +121,11 @@
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>5.9</version>
</dependency>
<!-- CDI, Weld, Arquillian -->
<dependency>

View File

@ -77,7 +77,6 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.6</version>
<scope>test</scope>
</dependency>
<dependency>