diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index e1b908c4f95..7761c8f12ad 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -106,7 +106,7 @@ org.apache.maven.shared maven-artifact-transfer - 0.12.0 + 0.13.1 org.apache.maven diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 2aced4a13d5..1c24d8fc659 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -19,7 +19,7 @@ com.googlecode.xmemcached xmemcached - 2.4.6 + 2.4.7 org.slf4j diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 19f51f31095..2dcc01812de 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -13,8 +13,8 @@ 3.16.300 - 3.9.0 - 3.5.300 + 3.10.100 + 3.6.0 1.0.0-v20070606 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 49a3cd0eec0..68a7c113509 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -15,7 +15,7 @@ target/distribution 4.13.1 2.6.2 - 5.2.0 + 5.3.0 1.8.3 3.0.0 1.2 diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index e95b176f4ab..8d8e8b7a235 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -33,6 +33,7 @@ ${project.build.directory}/classes false true + compile diff --git a/pom.xml b/pom.xml index cfe973e7cb8..bc231334b33 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.5 8.37 - 1.7.30 + 1.7.32 2.14.0 3.4.2 1.2.3 @@ -27,21 +27,22 @@ 8.5.70 9.4.8.Final 4.3.4.Final - 2.8.6 + 2.8.8 + 1.40.1 2.0.10 - 2.5.1 + 2.5.2 9.2 1.33 benchmarks 2.1.0 - 5.7.0 - 3.6.3 - 1.7.1 + 5.8.0 + 3.8.2 + 1.7.2 3.1.0 3.1.5.Final 3.12.12 - 3.4.1.Final - 1.0.6 + 3.4.2.Final + 1.0.7 1.10.11 @@ -54,21 +55,21 @@ 3.1.2 3.2.0 3.2.1 - 3.3.1 - 3.6.0 + 3.3.2 + 3.6.1 3.0.0-M1 3.0.0-M1 false - 5.5 + 5.8 2.1.1.RELEASE 1.0 1.3.2 ${project.build.directory}/local-repo src/it/settings.xml 0 - 1.15.1 + 1.16.0 2.7.0 @@ -395,7 +396,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 jetty-checkstyle.xml true @@ -562,7 +563,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 8 UTF-8 @@ -579,7 +580,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.0.0 + 3.3.1 org.apache.maven.plugins @@ -673,7 +674,7 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.7 com.agilejava.docbkx @@ -899,6 +900,17 @@ h2spec-maven-plugin 1.0.7 + + org.codehaus.mojo + versions-maven-plugin + 2.8.1 + + true + true + true + true + + @@ -1012,7 +1024,7 @@ org.codehaus.plexus plexus-utils - 3.3.0 + 3.4.1 org.apache.maven @@ -1029,6 +1041,11 @@ maven-core ${maven.version} + + org.apache.maven + maven-settings + ${maven.version} + org.apache.maven.plugin-tools maven-plugin-tools-api @@ -1045,6 +1062,13 @@ junit-jupiter ${junit.version} + + org.junit + junit-bom + ${junit.version} + pom + import + org.awaitility awaitility @@ -1065,7 +1089,7 @@ net.java.dev.jna jna - 5.6.0 + 5.9.0 @@ -1106,13 +1130,13 @@ com.github.jnr jnr-unixsocket - 0.38.3 + 0.38.10 io.grpc grpc-core - 1.33.1 + ${grpc.version} org.apache.ant diff --git a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java index 44a0beebc73..b0f96f00cf2 100644 --- a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java +++ b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java @@ -142,8 +142,10 @@ public class MemcachedTestHelper private static final Logger MEMCACHED_LOG = LoggerFactory.getLogger("org.eclipse.jetty.memcached.sessions.MemcachedLogs"); + @SuppressWarnings({"unchecked", "rawtypes"}) static GenericContainer memcached = new GenericContainer("memcached:" + System.getProperty("memcached.docker.version", "1.6.6")) + .withExposedPorts(11211) .withLogConsumer(new Slf4jLogConsumer(MEMCACHED_LOG)); static diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java index 6e75978aba8..92e15655fc2 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java @@ -52,11 +52,14 @@ public class MongoTestHelper public static final String DB_NAME = "HttpSessions"; public static final String COLLECTION_NAME = "testsessions"; + private static final int MONGO_PORT = 27017; + static GenericContainer mongo = new GenericContainer("mongo:" + System.getProperty("mongo.docker.version", "2.2.7")) .withLogConsumer(new Slf4jLogConsumer(MONGO_LOG)) .waitingFor(new LogMessageWaitStrategy() - .withRegEx(".*waiting for connections.*")); + .withRegEx(".*waiting for connections.*")) + .withExposedPorts(MONGO_PORT); static MongoClient mongoClient; @@ -69,10 +72,10 @@ public class MongoTestHelper { long start = System.currentTimeMillis(); mongo.start(); - mongoHost = mongo.getHost(); - mongoPort = mongo.getMappedPort(27017); + mongoHost = mongo.getHost(); + mongoPort = mongo.getMappedPort(MONGO_PORT); LOG.info("Mongo container started for {}:{} - {}ms", mongoHost, mongoPort, - System.currentTimeMillis() - start); + System.currentTimeMillis() - start); mongoClient = new MongoClient(mongoHost, mongoPort); } catch (Exception e) diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 4a091204878..0b5e9d1d027 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -13,7 +13,7 @@ ${project.groupId}.cdi.owb - 2.0.20 + 2.0.23