diff options
| author | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-06-09 19:59:33 +0400 |
|---|---|---|
| committer | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-06-13 22:48:21 +0400 |
| commit | 149554969475326e13a69b7bd6d3c2778d3444cd (patch) | |
| tree | 47fc6eb2b60a2b5166b2e44e142f282f34908657 | |
| parent | 0fc5c10eba789774ae1bf08f00b83ac003cb8b5d (diff) | |
| download | sonarqube-149554969475326e13a69b7bd6d3c2778d3444cd.tar.gz sonarqube-149554969475326e13a69b7bd6d3c2778d3444cd.zip | |
Remove dependency on classworlds - use only plexus-classworlds
| -rw-r--r-- | plugins/sonar-squid-java-plugin/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 54 | ||||
| -rw-r--r-- | sonar-core/pom.xml | 2 | ||||
| -rw-r--r-- | sonar-server/pom.xml | 4 |
4 files changed, 44 insertions, 20 deletions
diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml index 3af4a6616c3..fe11970f883 100644 --- a/plugins/sonar-squid-java-plugin/pom.xml +++ b/plugins/sonar-squid-java-plugin/pom.xml @@ -76,8 +76,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>classworlds</groupId> - <artifactId>classworlds</artifactId> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-classworlds</artifactId> <scope>provided</scope> </dependency> <!-- unit tests --> @@ -27,7 +27,7 @@ <module>sonar-graph</module> <module>sonar-gwt-api</module> <module>sonar-java-api</module> - <module>sonar-markdown</module> + <module>sonar-markdown</module> <module>sonar-maven-plugin</module> <module>sonar-maven3-plugin</module> <module>sonar-plugin-api</module> @@ -346,11 +346,20 @@ <configuration> <rules> <bannedDependencies> - <searchTransitive>true</searchTransitive> - <message>commons-beanutils should be used instead</message> + <!-- See SONAR-2512 --> + <message>commons-beanutils:commons-beanutils should be used instead</message> <excludes> <exclude>commons-beanutils:commons-beanutils-core</exclude> </excludes> + <searchTransitive>true</searchTransitive> + </bannedDependencies> + <bannedDependencies> + <!-- See SONAR-2455 --> + <message>org.codehaus.plexus:plexus-classworlds should be used instead</message> + <excludes> + <exclude>classworlds:classworlds</exclude> + </excludes> + <searchTransitive>true</searchTransitive> </bannedDependencies> </rules> </configuration> @@ -503,9 +512,9 @@ <version>3.2</version> </dependency> <dependency> - <groupId>classworlds</groupId> - <artifactId>classworlds</artifactId> - <version>1.1</version> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-classworlds</artifactId> + <version>2.2.3</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -680,10 +689,10 @@ <version>${derby.version}</version> </dependency> <dependency> - <!-- - IMPORTANT: DO NOT UPGRADE THIS LIB. Indeed v.1.0.0.1 is a dedicated branch to support Tomcat 5.x. Versions 1.0.5 and greater do not support Tomcat 5. - See http://jira.codehaus.org/browse/SONAR-2212 - --> + <!-- + IMPORTANT: DO NOT UPGRADE THIS LIB. Indeed v.1.0.0.1 is a dedicated branch to support Tomcat 5.x. Versions 1.0.5 and greater do not support Tomcat 5. + See http://jira.codehaus.org/browse/SONAR-2212 + --> <groupId>org.jruby.rack</groupId> <artifactId>jruby-rack</artifactId> <version>1.0.0.1</version> @@ -754,6 +763,13 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>2.0.7</version> + <exclusions> + <exclusion> + <!-- See SONAR-2455 --> + <groupId>classworlds</groupId> + <artifactId>classworlds</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -769,11 +785,25 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>2.0.7</version> + <exclusions> + <exclusion> + <!-- See SONAR-2455 --> + <groupId>classworlds</groupId> + <artifactId>classworlds</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> <version>1.2</version> + <exclusions> + <exclusion> + <!-- See SONAR-2455 --> + <groupId>classworlds</groupId> + <artifactId>classworlds</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> @@ -955,11 +985,11 @@ <module>samples</module> </modules> </profile> - + <profile> <id>dev</id> <properties> - <!-- used in sonar-core-gwt and sonar-design-plugin --> + <!-- used in sonar-core-gwt and sonar-design-plugin --> <gwt.permutationSuffix>Dev</gwt.permutationSuffix> <gwt.extraJvmArgs>-Xmx512m -Xss1024k -Dgwt.draftCompile=true</gwt.extraJvmArgs> </properties> diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index 509ab6b2ecc..f8b17f3b2ae 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -103,8 +103,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-classworlds</artifactId> - <!-- TODO version should be defined in parent --> - <version>2.2.3</version> </dependency> </dependencies> </project> diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index 8b65aa8e98c..7d1fe84dcdc 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -135,10 +135,6 @@ <artifactId>logback-classic</artifactId> </dependency> <dependency> - <groupId>classworlds</groupId> - <artifactId>classworlds</artifactId> - </dependency> - <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> </dependency> |