Fix quality flaw and increase timeout of EmbeddedDatabaseTest for slow boxes

diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java b/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java
index a47dfc8f1fab2434618164568ea10ee63631f452..1b7f96a5eaf40fa9946b244e965d72e6ac0d5da3 100644 (file)
--- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java
+++ b/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java
@@ -92,7 +92,7 @@ public class DefaultMavenPluginExecutor implements MavenPluginExecutor {
         .toString();
   }
 
-  public void concreteExecute(MavenProject pom, String goal) throws SecurityException {
+  public void concreteExecute(MavenProject pom, String goal) {
     Method executeMethod = null;
     for (Method m : lifecycleExecutor.getClass().getMethods()) {
       if ("execute".equals(m.getName())) {

diff --git a/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java b/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
index 0ab8811667473c063dba1663ba8abd06330c2319..89a8016095f99371225e867bd92baa0630e10d33 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
@@ -32,7 +32,7 @@ import java.sql.DriverManager;
 import static junit.framework.Assert.fail;
 
 public class EmbeddedDatabaseTest {
-  @Test(timeout = 5000)
+  @Test(timeout = 10000)
   public void should_start_and_stop() throws IOException {
     int port = freeServerPort();
 
@@ -50,7 +50,7 @@ public class EmbeddedDatabaseTest {
     database.stop();
   }
 
-  @Test(timeout = 5000)
+  @Test(timeout = 10000)
   public void should_support_memory_database() throws IOException {
     int port = freeServerPort();