Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump mariadb-java-client from 2.7.5 to 3.0.3 #7467

Merged
merged 5 commits into from
Jan 28, 2022
Merged

Bump mariadb-java-client from 2.7.5 to 3.0.3 #7467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67dd3b8
Bump mariadb-java-client from 2.7.5 to 3.0.3
dependabot[bot] Jan 27, 2022
9181457
Updated copyright years.
sbordet Jan 27, 2022
af74b79
Bump mariadb-java-client from 2.7.5 to 3.0.3
dependabot[bot] Jan 27, 2022
0d92ad8
Merge branch 'dependabot/maven/jetty-10.0.x/org.mariadb.jdbc-mariadb-…
joakime Jan 27, 2022
43cb27b
Fix test compile due to mariadb 3.x API change
joakime Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerCodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<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>2.7.5</mariadb.version>
<mariadb.version>3.0.3</mariadb.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<maven.version>3.8.4</maven.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
Expand Down
1 change: 0 additions & 1 deletion tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public static void setUp() throws Exception

//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);
Expand Down
4 changes: 1 addition & 3 deletions tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down