diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-30 09:56:55 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-30 09:56:55 +0200 |
| commit | f9b616759e48519bd59f14608fdd3057881de418 (patch) | |
| tree | 8ec893d4fbffea741d06de3f3d3fbec97c1492b7 /sonar-testing-harness/pom.xml | |
| parent | 7a6211086f961e128a3819743c59adf6eb2cd682 (diff) | |
| parent | c48b703be87fea2174450cec018b5b3209d6d6fa (diff) | |
| download | sonarqube-f9b616759e48519bd59f14608fdd3057881de418.tar.gz sonarqube-f9b616759e48519bd59f14608fdd3057881de418.zip | |
Merge remote-tracking branch 'remotes/origin/branch-4.5'
Conflicts:
plugins/sonar-core-plugin/pom.xml
plugins/sonar-cpd-plugin/pom.xml
plugins/sonar-dbcleaner-plugin/pom.xml
plugins/sonar-design-plugin/pom.xml
plugins/sonar-email-notifications-plugin/pom.xml
plugins/sonar-l10n-en-plugin/pom.xml
plugins/sonar-xoo-plugin/pom.xml
pom.xml
server/pom.xml
server/sonar-process-monitor/pom.xml
server/sonar-process/pom.xml
server/sonar-search/pom.xml
server/sonar-server/pom.xml
server/sonar-web/pom.xml
server/sonar-ws-client/pom.xml
sonar-application/pom.xml
sonar-batch-maven-compat/pom.xml
sonar-batch-protocol/pom.xml
sonar-batch/pom.xml
sonar-check-api/pom.xml
sonar-colorizer/pom.xml
sonar-core/pom.xml
sonar-deprecated/pom.xml
sonar-duplications/pom.xml
sonar-graph/pom.xml
sonar-home/pom.xml
sonar-java-api/pom.xml
sonar-markdown/pom.xml
sonar-maven-plugin/pom.xml
sonar-maven3-plugin/pom.xml
sonar-plugin-api/pom.xml
sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
sonar-testing-harness/pom.xml
Diffstat (limited to 'sonar-testing-harness/pom.xml')
| -rw-r--r-- | sonar-testing-harness/pom.xml | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml index 1988abb0009..fcb912699a0 100644 --- a/sonar-testing-harness/pom.xml +++ b/sonar-testing-harness/pom.xml @@ -20,10 +20,6 @@ <artifactId>jsonassert</artifactId> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -32,21 +28,22 @@ <artifactId>hamcrest-all</artifactId> </dependency> <dependency> - <!-- used only for org.sonar.test.channel classes --> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-channel</artifactId> - <optional>true</optional> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-plugin-api</artifactId> - <version>${project.version}</version> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-plugin-api</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <scope>provided</scope> </dependency> </dependencies> </project> |