]> source.dussan.org Git - sonarqube.git/commitdiff
Automatic merge from master
authorJenkins CI <ci@sonarsource.com>
Thu, 5 Mar 2015 10:40:59 +0000 (11:40 +0100)
committerJenkins CI <ci@sonarsource.com>
Thu, 5 Mar 2015 10:40:59 +0000 (11:40 +0100)
* origin/master:
  SONAR-5884 update coverage tooltips
  Fix quality flaws
  Fix indexing of issues -> mix functional and technical dates
  SONAR-4624 Add "won't fix" in the Administer Issues permission
  SONAR-6055 Embed latest Java 3.0 plugin and stop embedding Findbugs Plugin

1  2 
pom.xml
server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java
sonar-application/pom.xml
sonar-core/src/main/resources/org/sonar/l10n/core.properties

diff --cc pom.xml
Simple merge
index 43efce0022e8d5c9a54af4a9ec678ca96e000a70,12dee15de9658bbd391a2dae32c39ca0790cef09..d12664859de80f89e49780a39cdc0e0c04030460
@@@ -23,12 -23,8 +23,12 @@@ import org.junit.ClassRule
  import org.junit.Rule;
  import org.junit.Test;
  import org.junit.rules.TemporaryFolder;
 +import org.mockito.Mockito;
 +import org.sonar.api.config.Settings;
 +import org.sonar.api.utils.ZipUtils;
 +import org.sonar.api.utils.internal.DefaultTempFolder;
  import org.sonar.batch.protocol.Constants;
- import org.sonar.batch.protocol.output.BatchOutputWriter;
+ import org.sonar.batch.protocol.output.BatchReportWriter;
  import org.sonar.batch.protocol.output.BatchReport;
  import org.sonar.batch.protocol.output.BatchReportReader;
  import org.sonar.core.component.ComponentDto;
Simple merge