diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-23 20:17:34 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-23 20:17:34 +0200 |
| commit | ff739ecc971cf8a9d610477cd414569540fe88b8 (patch) | |
| tree | 645391e471f181d05f7247e232cbc67d7b9255c0 | |
| parent | 15345bae3a31ed3c6157edd0ff6b6727be445dae (diff) | |
| download | sonarqube-ff739ecc971cf8a9d610477cd414569540fe88b8.tar.gz sonarqube-ff739ecc971cf8a9d610477cd414569540fe88b8.zip | |
Remove JFreeChart from batch classpath
| -rw-r--r-- | plugins/sonar-core-plugin/pom.xml | 8 | ||||
| -rw-r--r-- | sonar-batch-protocol/pom.xml | 2 | ||||
| -rw-r--r-- | sonar-batch/pom.xml | 22 | ||||
| -rw-r--r-- | sonar-core/pom.xml | 13 | ||||
| -rw-r--r-- | sonar-home/pom.xml | 10 | ||||
| -rw-r--r-- | sonar-java-api/pom.xml | 20 |
6 files changed, 72 insertions, 3 deletions
diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml index c8c6029a52b..e1c90fc7808 100644 --- a/plugins/sonar-core-plugin/pom.xml +++ b/plugins/sonar-core-plugin/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.codehaus.sonar</groupId> @@ -35,6 +36,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-batch</artifactId> <version>${project.version}</version> diff --git a/sonar-batch-protocol/pom.xml b/sonar-batch-protocol/pom.xml index 5bb8320253c..7d7a4850929 100644 --- a/sonar-batch-protocol/pom.xml +++ b/sonar-batch-protocol/pom.xml @@ -20,12 +20,14 @@ <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> + <scope>provided</scope> </dependency> <!-- unit tests --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.easytesting</groupId> diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index f1be69f94de..8fad314ca6e 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -27,6 +27,16 @@ <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-core</artifactId> + <exclusions> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </exclusion> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -35,6 +45,16 @@ <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-deprecated</artifactId> + <exclusions> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </exclusion> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -54,7 +74,7 @@ </exclusion> <exclusion> <groupId>jfree</groupId> - <artifactId>jfreechat</artifactId> + <artifactId>jfreechart</artifactId> </exclusion> </exclusions> </dependency> diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index 418132364e6..0f16861286f 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -36,6 +37,16 @@ <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-deprecated</artifactId> + <exclusions> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </exclusion> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> diff --git a/sonar-home/pom.xml b/sonar-home/pom.xml index 1c02cf6bbc2..88d3b4fd1ee 100644 --- a/sonar-home/pom.xml +++ b/sonar-home/pom.xml @@ -31,6 +31,16 @@ <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-plugin-api</artifactId> + <exclusions> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </exclusion> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/sonar-java-api/pom.xml b/sonar-java-api/pom.xml index 2b1b94ba198..7c6d579d43f 100644 --- a/sonar-java-api/pom.xml +++ b/sonar-java-api/pom.xml @@ -12,10 +12,30 @@ <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-plugin-api</artifactId> + <exclusions> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </exclusion> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-deprecated</artifactId> + <exclusions> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </exclusion> + <exclusion> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-lang</groupId> |