From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Tue, 30 Jul 2013 07:09:53 +0000 (+0200)
Subject: Merge enforcer rules
X-Git-Tag: 3.7.1-RC1-~194
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df165ab527037528e3a1531bd80073e45fdbf7ee;p=sonarqube.git

Merge enforcer rules
---

diff --git a/pom.xml b/pom.xml
index 2f3542b3a3a..240715163b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,22 +349,8 @@
                   </excludes>
                   <searchTransitive>true</searchTransitive>
                 </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
-          <execution>
-            <!-- TODO Merge with execution enforce-rules as soon as we will remove exclusions for this rule - see SONAR-2938 -->
-            <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>
+                  <message>Definition of new repositories is not allowed in order to deploy to central repository.</message>
                 </requireNoRepositories>
               </rules>
             </configuration>