DMC/scipro
7
0
Fork 0
Code Issues44 Pull Requests6 Actions Projects1 Releases Wiki Activity

3092 Switch to MariaDB JDBC driver

Browse Source
This commit is contained in:
Andreas Svanberg 2023-11-02 09:54:08 +01:00
parent 909936b290
commit 0e6f80d111
4 changed files with 8 additions and 19 deletions

4
core/pom.xml

@ -69,10 +69,6 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<!--QueryDSL-->
<dependency>

11
pom.xml

@ -27,8 +27,7 @@
<!-- See https://hibernate.org/orm/releases/ for which version Hibernate implements -->
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
<hibernate.version>6.1.7.Final</hibernate.version>
<mysql-connector-java.version>8.0.33</mysql-connector-java.version>
<protobuf-java.version>3.19.6</protobuf-java.version>
<mariadb-java-client.version>3.2.0</mariadb-java-client.version>
<querydsl.version>5.0.0</querydsl.version>
<jakarta.servlet.version>4.0.4</jakarta.servlet.version>
@ -124,11 +123,9 @@
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<!-- when updating check which version of protobuf-java it depends on -->
<!-- and upgrade to the appropriate patched version -->
<version>${mysql-connector-java.version}</version>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb-java-client.version}</version>
</dependency>
<!--QueryDSL-->

4
view/pom.xml

@ -119,6 +119,10 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>

8
view/src/main/java/ApplicationBootstrap.java

@ -6,12 +6,10 @@ import com.google.inject.name.Names;
import com.google.inject.persist.PersistFilter;
import com.google.inject.servlet.GuiceServletContextListener;
import com.google.inject.servlet.ServletModule;
import com.mysql.cj.jdbc.AbandonedConnectionCleanupThread;
import org.apache.wicket.guice.GuiceWebApplicationFactory;
import org.apache.wicket.protocol.http.WicketFilter;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import java.net.CookieHandler;
import java.net.CookieManager;
import java.time.Clock;
@ -67,10 +65,4 @@ public class ApplicationBootstrap extends GuiceServletContextListener {
}
);
}
@Override
public void contextDestroyed(final ServletContextEvent servletContextEvent) {
AbandonedConnectionCleanupThread.checkedShutdown();
super.contextDestroyed(servletContextEvent);
}
}