Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Apply patches by Markus Koschany to use libmariadb-java. (closes: #913307)
· 05d16dc8
Bas Couwenberg
authored
Nov 09, 2018
05d16dc8
Set distribution to unstable.
· da1fe567
Bas Couwenberg
authored
Nov 09, 2018
da1fe567
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
da1fe567
osmosis (0.47-3) unstable; urgency=medium
* Apply patches by Markus Koschany to use libmariadb-java.
(closes: #913307)
-- Bas Couwenberg <sebastic@debian.org> Fri, 09 Nov 2018 16:14:34 +0100
osmosis (0.47-2) unstable; urgency=medium
* Drop patches for protobuf 3.0.0.
...
...
debian/control
View file @
da1fe567
...
...
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
libcommons-dbcp-java,
libjdepend-java,
libjpf-java,
libm
ysql
-java,
libm
ariadb
-java,
# libnetty-3.9-java,
libpostgis-java,
libpostgresql-jdbc-java,
...
...
@@ -47,7 +47,7 @@ Depends: default-jre-headless | java8-runtime-headless,
libcommons-dbcp-java,
libcommons-pool-java,
libjpf-java,
libm
ysql
-java,
libm
ariadb
-java,
# libnetty-3.9-java,
libpostgis-java,
libpostgresql-jdbc-java,
...
...
debian/maven.rules
View file @
da1fe567
...
...
@@ -5,3 +5,4 @@ org.springframework spring-jdbc * s/.*/debian/ * *
#s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * *
s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * *
s/com.fasterxml.woodstox/org.codehaus.woodstox/ s/woodstox-core/woodstox-core-lgpl/ * s/.*/debian/ * *
s/mysql/org.mariadb.jdbc/ s/mysql-connector-java/mariadb-java-client/ * s/.*/debian/ * *
debian/patches/02-fix_plexus.patch
View file @
da1fe567
...
...
@@ -14,7 +14,7 @@ Forwarded: not-needed
+load /usr/share/java/commons-compress.jar
+load /usr/share/java/commons-codec.jar
+load /usr/share/java/commons-dbcp.jar
+load /usr/share/java/m
ysql-connector-java
.jar
+load /usr/share/java/m
ariadb-java-client
.jar
+load /usr/share/java/postgis-jdbc.jar
+load /usr/share/java/postgresql.jar
+load /usr/share/java/spring3-beans.jar
...
...
debian/patches/mariadb.patch
0 → 100644
View file @
da1fe567
Description: Use MariaDB driver class.
Author: Markus Koschany <apo@debian.org>
Bug-Debian: https://bugs.debian.org/913307
Forwarded: not-needed
--- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
+++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
@@ -38,7 +38,7 @@
public final class DataSourceFactory {
/*+ "?loglevel=2"*/);
break;
case MYSQL:
- dataSource.setDriverClassName("com.mysql.jdbc.Driver");
+ dataSource.setDriverClassName("org.mariadb.jdbc.Driver");
dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + "/" + credentials.getDatabase());
break;
default:
debian/patches/series
View file @
da1fe567
...
...
@@ -2,3 +2,4 @@
02-fix_plexus.patch
04-osmosis-version.patch
disable-netty3.patch
mariadb.patch