diff options
| author | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-10-01 05:14:56 +0400 |
|---|---|---|
| committer | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-10-26 21:33:15 +0400 |
| commit | eb20690f5b006f2e9a1bcb39b5797db19b1c75b2 (patch) | |
| tree | 89f596dabfed13df6e8334321cf155635dfae6f0 | |
| parent | af58e35a58579484d6521bd3e675c90e43c18623 (diff) | |
| download | sonarqube-eb20690f5b006f2e9a1bcb39b5797db19b1c75b2.tar.gz sonarqube-eb20690f5b006f2e9a1bcb39b5797db19b1c75b2.zip | |
SONAR-2849 Remove declarations of third-party repositories from root pom
Enforce that repositories not declared in pom.xml, except of modules
sonar-checkstyle-plugin and sonar-squid-java-plugin due to dependency
on Checktyle 5.1, which is not available in Central.
This allows to remove side effects in Maven plugins.
| -rw-r--r-- | plugins/sonar-checkstyle-plugin/pom.xml | 29 | ||||
| -rw-r--r-- | plugins/sonar-squid-java-plugin/pom.xml | 29 | ||||
| -rw-r--r-- | pom.xml | 29 |
3 files changed, 72 insertions, 15 deletions
diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml index ca05ff09557..d77722f6d66 100644 --- a/plugins/sonar-checkstyle-plugin/pom.xml +++ b/plugins/sonar-checkstyle-plugin/pom.xml @@ -17,6 +17,21 @@ <checkstyle.version>5.1</checkstyle.version> </properties> + <repositories> + <!-- for checkstyle 5.1 --> + <repository> + <id>sonar</id> + <name>Sonar</name> + <url>http://repository.sonarsource.org/content/repositories/sonar</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <dependencies> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -91,6 +106,20 @@ </testResources> <plugins> <plugin> + <!-- TODO remove (see SONAR-2938) --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-no-repositories</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> <configuration> diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml index 11b76dbdf15..e3920ee4d9b 100644 --- a/plugins/sonar-squid-java-plugin/pom.xml +++ b/plugins/sonar-squid-java-plugin/pom.xml @@ -13,6 +13,21 @@ <name>Sonar :: Plugins :: Squid Java</name> <description>Squid analyzer for Java.</description> + <repositories> + <!-- for checkstyle 5.1 --> + <repository> + <id>sonar</id> + <name>Sonar</name> + <url>http://repository.sonarsource.org/content/repositories/sonar</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <dependencies> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -86,6 +101,20 @@ <build> <plugins> <plugin> + <!-- TODO remove (see SONAR-2938) --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-no-repositories</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> <configuration> @@ -74,21 +74,6 @@ </snapshotRepository> </distributionManagement> - <repositories> - <repository> - <!-- for checkstyle 5.1--> - <id>sonar</id> - <name>Sonar</name> - <url>http://repository.sonarsource.org/content/repositories/sonar</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <properties> <!-- Warning before upgrading Derby to 10.8 : new conversion from BOOLEAN to CHAR. @@ -370,6 +355,20 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-no-repositories</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireNoRepositories> + <!-- Also see SONAR-2849 --> + <message>The rules for repo1.maven.org are that pom.xml files should not include repository definitions.</message> + </requireNoRepositories> + </rules> + </configuration> + </execution> </executions> </plugin> <plugin> |