Merge remote-tracking branch 'origin/jetty-9.4.x'

2016-09-02 11:23:18 +10:00 · 2016-09-02 11:23:18 +10:00 · c52eec226e
parent f208b1d46f e261dd0880
commit c52eec226e
2 changed files with 3 additions and 2 deletions
--- a/jetty-home/src/main/resources/modules/jamon.mod
+++ b/jetty-home/src/main/resources/modules/jamon.mod
@ -12,8 +12,8 @@ etc/jamon.xml

 [files]
 lib/jamon/
-maven://com.jamonapi/jamon/2.79|lib/jamon/jamon-2.79.jar
-maven://com.jamonapi/jamon_war/2.79/war|lib/jamon/jamon.war
+maven://com.jamonapi/jamon/2.81|lib/jamon/jamon-2.81.jar
+maven://com.jamonapi/jamon_war/2.81/war|lib/jamon/jamon.war

 [lib]
 lib/jamon/**.jar
--- a/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ConnectorServerTest.java
+++ b/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ConnectorServerTest.java
@ -62,6 +62,7 @@ public class ConnectorServerTest
    }

    @Test
+    @Ignore // collides on ci server
    public void testConnServerWithRmiDefaultPort() throws Exception
    {
        // given