diff --git a/pom.xml b/pom.xml index 4f0e26d8ae4..f31fb6f4cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 3.4.2 7.0.3 3.0.2 - 2.10.0 + 2.11.0 1.43.2 2.8.9 31.0.1-jre @@ -103,8 +103,8 @@ 2.0.1 2.17.1 1.3.0-alpha12 + 3.0.3 10.3.6 - 2.7.5 0.13.1 1.7.3 3.8.4 diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java index ae1007967c5..dffb4226182 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java @@ -68,7 +68,6 @@ public class DataSourceLoginServiceTest //create a datasource and bind to jndi MariaDbDataSource ds = new MariaDbDataSource(); - ds.setDatabaseName(DatabaseLoginServiceTestServer.MARIA_DB_NAME); ds.setUser(DatabaseLoginServiceTestServer.MARIA_DB_USER); ds.setPassword(DatabaseLoginServiceTestServer.MARIA_DB_PASSWORD); ds.setUrl(DatabaseLoginServiceTestServer.MARIA_DB_FULL_URL); diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java index 352853adf84..fa50a3961f3 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java @@ -56,7 +56,6 @@ public class DatabaseLoginServiceTestServer static MariaDBContainer MARIA_DB; - protected static final String MARIA_DB_NAME = "lstest"; protected static final String MARIA_DB_USER = "beer"; protected static final String MARIA_DB_PASSWORD = "pacific_ale"; public static String MARIA_DB_DRIVER_CLASS; @@ -80,8 +79,7 @@ public class DatabaseLoginServiceTestServer MARIA_DB = new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6")) .withUsername(MARIA_DB_USER) - .withPassword(MARIA_DB_PASSWORD) - .withDatabaseName(MARIA_DB_NAME); + .withPassword(MARIA_DB_PASSWORD); MARIA_DB = (MariaDBContainer)MARIA_DB.withInitScript("createdb.sql"); MARIA_DB = (MariaDBContainer)MARIA_DB.withLogConsumer(new Slf4jLogConsumer(MARIADB_LOG)); MARIA_DB.start();