diff options
| author | Julien HENRY <henryju@yahoo.fr> | 2015-06-03 13:46:58 +0200 |
|---|---|---|
| committer | Julien HENRY <henryju@yahoo.fr> | 2015-06-03 13:46:58 +0200 |
| commit | 472bf5b76470b9a1b1f13b12e6a3edd24a6df315 (patch) | |
| tree | 0a83bd9243b881350c8914729dae5cf4c6849b81 /pom.xml | |
| parent | 81c526901fb2f10eca77c7cccb306c959da4469b (diff) | |
| parent | 5dd7b6e298dde08601a09a5acc11e215961a6c63 (diff) | |
| download | sonarqube-472bf5b76470b9a1b1f13b12e6a3edd24a6df315.tar.gz sonarqube-472bf5b76470b9a1b1f13b12e6a3edd24a6df315.zip | |
Merge pull request #261 from SonarSource/feature/batch/drop_maven_dep
SONAR-3821 Drop any Maven dependency
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 67 |
1 files changed, 13 insertions, 54 deletions
@@ -14,8 +14,8 @@ <module>sonar-plugin-api-deps</module> <module>sonar-application</module> <module>sonar-batch</module> - <module>sonar-batch-maven-compat</module> <module>sonar-batch-protocol</module> + <module>sonar-batch-shaded</module> <module>sonar-check-api</module> <module>sonar-colorizer</module> <module>sonar-core</module> @@ -29,6 +29,7 @@ <module>sonar-testing-harness</module> <module>plugins/sonar-email-notifications-plugin</module> <module>plugins/sonar-xoo-plugin</module> + <module>plugins/sonar-batch-maven-plugin</module> </modules> <organization> @@ -163,7 +164,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.9</version> + <version>2.10</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -392,14 +393,6 @@ </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> <requireNoRepositories> <message>Definition of new repositories is not allowed in order to deploy to central repository. </message> @@ -785,6 +778,16 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.7</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>2.0.7</version> + </dependency> + <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> <!-- animal-sniffer doesn't work with 2.6.1 --> @@ -985,50 +988,6 @@ <version>1.1.3.3</version> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven.api.version}</version> - <exclusions> - <exclusion> - <!-- See SONAR-2455 --> - <groupId>classworlds</groupId> - <artifactId>classworlds</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.api.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>${maven.api.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>${maven.api.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - <version>2.1</version> - <exclusions> - <exclusion> - <!-- See SONAR-2455 --> - <groupId>classworlds</groupId> - <artifactId>classworlds</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-common-artifact-filters</artifactId> - <version>1.4</version> - </dependency> - <dependency> <groupId>org.jruby</groupId> <artifactId>jruby-complete</artifactId> <!-- do not upgrade to 1.7.10, much slower at startup --> |