diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-06-02 17:19:45 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-06-05 09:54:05 +0200 |
| commit | 2e790bfe3d0eacb3bfc38535276d091f3bfeaa4b (patch) | |
| tree | 0c1254fb472da1006f765a0e665595d266115724 | |
| parent | 492a4f4f833ce18ccbf682e149140333b38ed3c8 (diff) | |
| download | sonarqube-2e790bfe3d0eacb3bfc38535276d091f3bfeaa4b.tar.gz sonarqube-2e790bfe3d0eacb3bfc38535276d091f3bfeaa4b.zip | |
SONAR-6370 remove dependency on sonar-deprecated
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/platform/PluginClassloaderFactory.java | 3 | ||||
| -rw-r--r-- | sonar-plugin-api-deps/pom.xml | 10 |
3 files changed, 19 insertions, 0 deletions
@@ -625,6 +625,12 @@ <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-java-api</artifactId> <version>5.1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-deprecated</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> diff --git a/sonar-core/src/main/java/org/sonar/core/platform/PluginClassloaderFactory.java b/sonar-core/src/main/java/org/sonar/core/platform/PluginClassloaderFactory.java index 5d8b89a8360..82370413156 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/PluginClassloaderFactory.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/PluginClassloaderFactory.java @@ -160,6 +160,9 @@ public class PluginClassloaderFactory { .addInclusion("org/codehaus/staxmate/") .addInclusion("com/ctc/wstx/") + // commons-logging is provided by SLF4j bridge + .addInclusion("org/apache/commons/logging/") + // required for internal tests at SonarSource .addInclusion("org/sonar/server/platform/") diff --git a/sonar-plugin-api-deps/pom.xml b/sonar-plugin-api-deps/pom.xml index e8567f4f38c..544612c6785 100644 --- a/sonar-plugin-api-deps/pom.xml +++ b/sonar-plugin-api-deps/pom.xml @@ -31,6 +31,11 @@ <version>10.0.1</version> </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.8</version> @@ -103,6 +108,11 @@ <artifactId>maven-artifact</artifactId> <version>3.0.5</version> </dependency> + <dependency> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-java-api</artifactId> + <version>5.1</version> + </dependency> </dependencies> <build> |