diff options
| -rw-r--r-- | plugins/sonar-checkstyle-plugin/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | sonar-core/src/test/resources/logback-test.xml | 2 | ||||
| -rw-r--r-- | sonar-duplications/pom.xml | 5 | ||||
| -rw-r--r-- | sonar-graph/pom.xml | 4 | ||||
| -rw-r--r-- | sonar-plugin-api/pom.xml | 4 |
6 files changed, 12 insertions, 13 deletions
diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml index 1d94817ee37..e05c28e874d 100644 --- a/plugins/sonar-checkstyle-plugin/pom.xml +++ b/plugins/sonar-checkstyle-plugin/pom.xml @@ -33,8 +33,8 @@ <artifactId>commons-logging</artifactId> </exclusion> <exclusion> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </exclusion> <exclusion> <groupId>commons-lang</groupId> @@ -546,9 +546,9 @@ <version>3.2.1</version> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>10.0.1</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/sonar-core/src/test/resources/logback-test.xml b/sonar-core/src/test/resources/logback-test.xml index a2ba00f96b8..a0c5d2f364f 100644 --- a/sonar-core/src/test/resources/logback-test.xml +++ b/sonar-core/src/test/resources/logback-test.xml @@ -15,7 +15,7 @@ <level value="WARN"/> </logger> - <logger name="org.dbunit.database.DatabaseDataSet"> + <logger name="org.dbunit"> <level value="WARN"/> </logger> diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml index c1bdecf2f9c..3adaa49fb40 100644 --- a/sonar-duplications/pom.xml +++ b/sonar-duplications/pom.xml @@ -16,9 +16,8 @@ <artifactId>sonar-channel</artifactId> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> diff --git a/sonar-graph/pom.xml b/sonar-graph/pom.xml index 036b940d961..975fcde8f66 100644 --- a/sonar-graph/pom.xml +++ b/sonar-graph/pom.xml @@ -18,8 +18,8 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>junit</groupId> diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index 5c400a14bf8..63d8282e79a 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -61,8 +61,8 @@ </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <!-- TODO remove dependencies on Maven |