Merge remote branch 'upstream/master'

2 files changed, 2 insertions, 2 deletions

diff --git a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
index 63b63a886fd..3036f0766fb 100644
--- a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
+++ b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
@@ -38,7 +38,7 @@ public class CoberturaMavenPluginHandler implements MavenPluginHandler {
   }
 
   public String getVersion() {
-    return "2.4";
+    return "2.5";
   }
 
   public boolean isFixedVersion() {
diff --git a/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java b/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java
index 8a81a94f843..afd80a29786 100644
--- a/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java
+++ b/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java
@@ -43,7 +43,7 @@ public class CoberturaMavenPluginHandlerTest {
   @Test
   public void notFixedVersion() {
     // first of all, version was fixed : see http://jira.codehaus.org/browse/SONAR-1055
-    // but it's more reasonable to let users fix the version : see http://jira.codehaus.org/browse/SONAR-1310
+    // but it's more reasonable to let users change the version : see http://jira.codehaus.org/browse/SONAR-1310
     assertThat(new CoberturaMavenPluginHandler().isFixedVersion(), is(false));
   }