Finish merge of master

diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/SendIssueNotificationsPostJobTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/SendIssueNotificationsPostJobTest.java
index 87276370b60a7ba83bef32257e956f79fdb33a8d..82a1fe70ff4ad7773f0fa778ea13bc37c42b9162 100644 (file)
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/SendIssueNotificationsPostJobTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/SendIssueNotificationsPostJobTest.java
@@ -170,24 +170,4 @@ public class SendIssueNotificationsPostJobTest {
       return map.size() == 1 && map.get(issue) != null && map.get(issue).equals(rule);
     }
   }
-
-  @Test
-  public void should_not_send_notification_on_any_change() throws Exception {
-    IssueChangeContext changeContext = mock(IssueChangeContext.class);
-
-    when(project.getAnalysisDate()).thenReturn(DateUtils.parseDate("2013-05-18"));
-    RuleKey ruleKey = RuleKey.of("squid", "AvoidCycles");
-    DefaultIssue issue = new DefaultIssue()
-      .setChanged(true)
-      .setSendNotifications(false)
-      .setFieldChange(changeContext, "severity", "MINOR", "BLOCKER")
-      .setRuleKey(ruleKey);
-    when(issueCache.all()).thenReturn(Arrays.asList(issue));
-    when(ruleFinder.findByKey(ruleKey)).thenReturn(null);
-
-    SendIssueNotificationsPostJob job = new SendIssueNotificationsPostJob(issueCache, notifications, ruleFinder);
-    job.executeOn(project, sensorContext);
-
-    verify(notifications, never()).sendChanges(eq(issue), eq(changeContext), any(Rule.class), any(Component.class), any(Component.class));
-  }
 }

diff --git a/pom.xml b/pom.xml
index 6e5fe233a56d0cfdd88815883381ae80be7a7db1..e104363a5764e303f9c7e9fe54adf8c3b6454fde 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
   </prerequisites>
 
   <properties>
-    <sonarUpdateCenter.version>1.6.1</sonarUpdateCenter.version>
+    <sonarUpdateCenter.version>1.8</sonarUpdateCenter.version>
     <sonarJava.version>1.3</sonarJava.version>
     <sonarGwt.version>3.3.1</sonarGwt.version>
     <h2.version>1.3.172</h2.version>
@@ -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>
@@ -1091,7 +1077,7 @@
     <connection>scm:git:git@github.com:SonarSource/sonar.git</connection>
     <developerConnection>scm:git:git@github.com:SonarSource/sonar.git</developerConnection>
     <url>https://github.com/SonarSource/sonar</url>
-    <tag>3.7-RC1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <ciManagement>

diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml
index d9777ddd1aae79a187a1e32e24877d0c27298405..f7fb7114f783fa55f329aabcc14fbe4862b64986 100644 (file)
--- a/sonar-duplications/pom.xml
+++ b/sonar-duplications/pom.xml
@@ -25,7 +25,18 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
+    <!-- unit tests -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>pmd</groupId>
       <artifactId>pmd</artifactId>