]> source.dussan.org Git - sonarqube.git/commitdiff
Merge branch medium-tests
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 18 Apr 2014 11:27:05 +0000 (13:27 +0200)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 18 Apr 2014 11:27:05 +0000 (13:27 +0200)
1  2 
pom.xml
sonar-application/pom.xml
sonar-batch-maven-compat/pom.xml
sonar-batch/pom.xml
sonar-plugin-api/pom.xml
sonar-server/pom.xml

diff --cc pom.xml
Simple merge
Simple merge
Simple merge
index 3965e7ced3f73032aafcd3147fc1a37588fc96d2,caeffd62bcd3219775ca4b14cef3eee177035aaf..e0c8a4389d0fbc11fb2615052d302194989ced00
@@@ -4,10 -4,9 +4,9 @@@
    <parent>
      <groupId>org.codehaus.sonar</groupId>
      <artifactId>sonar</artifactId>
 -    <version>4.3-SNAPSHOT</version>
 +    <version>4.4-SNAPSHOT</version>
    </parent>
  
-   <groupId>org.codehaus.sonar</groupId>
    <artifactId>sonar-batch</artifactId>
    <name>SonarQube :: Batch</name>
  
Simple merge
Simple merge