Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-10.0.x' into jetty-10.0.x-update-infinispan-deps

This commit is contained in:
Simone Bordet 2022-01-28 12:07:21 +01:00 committed by GitHub
parent 846ea27da2 ae4bf41b79
commit 080d761607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -42,7 +42,7 @@
<disruptor.version>3.4.2</disruptor.version>
<felix.version>7.0.3</felix.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
<google.errorprone.version>2.10.0</google.errorprone.version>
<google.errorprone.version>2.11.0</google.errorprone.version>
<grpc.version>1.43.2</grpc.version>
<gson.version>2.8.9</gson.version>
<guava.version>31.0.1-jre</guava.version>
@ -103,8 +103,8 @@
<kerb-simplekdc.version>2.0.1</kerb-simplekdc.version>
<log4j2.version>2.17.1</log4j2.version>
<logback.version>1.3.0-alpha12</logback.version>
<mariadb.version>3.0.3</mariadb.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>2.7.5</mariadb.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
<maven.resolver.version>1.7.3</maven.resolver.version>
<maven.version>3.8.4</maven.version>

1
tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java
View File

@ -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);

4
tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java
View File

@ -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();