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

Merge pull request #7467 from eclipse/dependabot/maven/jetty-10.0.x/org.mariadb.jdbc-mariadb-java-client-3.0.3 

Bump mariadb-java-client from 2.7.5 to 3.0.3
This commit is contained in:
Simone Bordet 2022-01-28 12:01:07 +01:00 committed by GitHub
parent 29aee93898 43cb27b36d
commit ae4bf41b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -105,7 +105,7 @@
<kerb-simplekdc.version>2.0.1</kerb-simplekdc.version> <kerb-simplekdc.version>2.0.1</kerb-simplekdc.version>
<log4j2.version>2.17.1</log4j2.version> <log4j2.version>2.17.1</log4j2.version>
<logback.version>1.3.0-alpha12</logback.version> <logback.version>1.3.0-alpha12</logback.version>
<mariadb.version>2.7.5</mariadb.version> <mariadb.version>3.0.3</mariadb.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version> <mariadb.docker.version>10.3.6</mariadb.docker.version>
<maven.version>3.8.4</maven.version> <maven.version>3.8.4</maven.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version> <maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.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 //create a datasource and bind to jndi
MariaDbDataSource ds = new MariaDbDataSource(); MariaDbDataSource ds = new MariaDbDataSource();
ds.setDatabaseName(DatabaseLoginServiceTestServer.MARIA_DB_NAME);
ds.setUser(DatabaseLoginServiceTestServer.MARIA_DB_USER); ds.setUser(DatabaseLoginServiceTestServer.MARIA_DB_USER);
ds.setPassword(DatabaseLoginServiceTestServer.MARIA_DB_PASSWORD); ds.setPassword(DatabaseLoginServiceTestServer.MARIA_DB_PASSWORD);
ds.setUrl(DatabaseLoginServiceTestServer.MARIA_DB_FULL_URL); 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; 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_USER = "beer";
protected static final String MARIA_DB_PASSWORD = "pacific_ale"; protected static final String MARIA_DB_PASSWORD = "pacific_ale";
public static String MARIA_DB_DRIVER_CLASS; public static String MARIA_DB_DRIVER_CLASS;
@ -80,8 +79,7 @@ public class DatabaseLoginServiceTestServer
MARIA_DB = MARIA_DB =
new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6")) new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6"))
.withUsername(MARIA_DB_USER) .withUsername(MARIA_DB_USER)
.withPassword(MARIA_DB_PASSWORD) .withPassword(MARIA_DB_PASSWORD);
.withDatabaseName(MARIA_DB_NAME);
MARIA_DB = (MariaDBContainer)MARIA_DB.withInitScript("createdb.sql"); MARIA_DB = (MariaDBContainer)MARIA_DB.withInitScript("createdb.sql");
MARIA_DB = (MariaDBContainer)MARIA_DB.withLogConsumer(new Slf4jLogConsumer(MARIADB_LOG)); MARIA_DB = (MariaDBContainer)MARIA_DB.withLogConsumer(new Slf4jLogConsumer(MARIADB_LOG));
MARIA_DB.start(); MARIA_DB.start();