Disable JMX in Persistit

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/CachesManager.java b/sonar-batch/src/main/java/org/sonar/batch/index/CachesManager.java
index 107c62a619c2076024bba951bb3ba9106a513861..a710613d0acba1a6419185129d3f33076e66fa14 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/CachesManager.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/CachesManager.java
@@ -61,6 +61,7 @@ public class CachesManager implements Startable {
       props.setProperty("journalpath", "${datapath}/journal");
       props.setProperty("tmpvoldir", "${datapath}");
       props.setProperty("volume.1", "${datapath}/persistit,create,pageSize:8192,initialPages:10,extensionPages:100,maximumPages:25000");
+      props.setProperty("jmx", "false");
       persistit.setProperties(props);
       persistit.initialize();
 

diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java
index 61677f28b69563428720aac3d3f38ccd2b54ef5e..98d18d5a461d42b2ba0ed9c225a2ec49cc23dc38 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java
@@ -33,7 +33,6 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -146,7 +145,6 @@ public class LogListenerTest {
   }
 
   @Test
-  @Ignore("Temporarily disabled - frequent errors on local box and travis-ci")
   public void testNoFormattedMsgs() throws IOException {
     File srcDir = new File(baseDir, "src");
     srcDir.mkdir();