Tony Mancill pushed to branch master at Debian Java Maintainers / jabref
Commits: 2080ad92 by tony mancill at 2018-11-08T02:26:15Z Replace mysql-connector JDBC driver with mariadb-client-java - - - - - f778b6e3 by tony mancill at 2018-11-08T02:27:53Z prepare changelog for upload to unstable - - - - - 7 changed files: - debian/changelog - debian/control - debian/jabref-wrapper - debian/patches/010_gradle_build.patch - debian/patches/080_jdk11_jaxb.patch - + debian/patches/090_mariadb.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,10 @@ -jabref (3.8.2+ds-9) UNRELEASED; urgency=medium +jabref (3.8.2+ds-9) unstable; urgency=medium * Invoke xjc from jaxb-xjc and drop build-dep on openjdk-8 * Add build-dep on libxml-commons-resolver1.1-java + * Replace mysql-connector JDBC driver with mariadb-client-java - -- tony mancill <[email protected]> Tue, 06 Nov 2018 20:11:11 -0800 + -- tony mancill <[email protected]> Wed, 07 Nov 2018 18:27:39 -0800 jabref (3.8.2+ds-8) unstable; urgency=medium ===================================== debian/control ===================================== @@ -29,7 +29,7 @@ Build-Depends-Indep: ant, libjsonp-java, liblog4j2-java (>= 2.10.0-2) | liblog4j2-java (<< 2.10), libmicroba-java, - libmysql-java, + libmariadb-java, libpdfbox-java, libpostgresql-jdbc-java (>= 9.4.1212), libreoffice-java-common, @@ -79,7 +79,7 @@ Depends: ${misc:Depends}, libunirest-java-java Recommends: xdg-utils, libreoffice-writer, - libmysql-java, + libmariadb-java, libpostgresql-jdbc-java (>= 9.4.1212) Suggests: gv | postscript-viewer, xpdf | pdf-viewer ===================================== debian/jabref-wrapper ===================================== @@ -50,7 +50,7 @@ find_jars \ log4j-core \ log4j-jcl \ microba \ - mysql-connector-java \ + mariadb-java-client \ pdfbox \ postgresql \ ridl \ ===================================== debian/patches/010_gradle_build.patch ===================================== @@ -64,7 +64,19 @@ Forwarded: not-needed compile 'com.jgoodies:jgoodies-common:1.8.1' compile 'com.jgoodies:jgoodies-forms:1.9.0' compile 'com.jgoodies:jgoodies-looks:2.7.0' -@@ -118,8 +127,8 @@ +@@ -97,9 +106,8 @@ + antlr4 'org.antlr:antlr4:4.6' + compile 'org.antlr:antlr4-runtime:4.6' + +- // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release" +- compile 'mysql:mysql-connector-java:5.1.40' +- ++ // debian would like to drop mysql-connector-java ++ compile 'org.mariadb.jdbc:mariadb-java-client:2.3.0' + compile 'org.postgresql:postgresql:9.4.1210' + + compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' +@@ -118,8 +126,8 @@ compile 'org.apache.logging.log4j:log4j-jcl:2.7' compile 'org.apache.logging.log4j:log4j-api:2.7' compile 'org.apache.logging.log4j:log4j-core:2.7' @@ -75,7 +87,7 @@ Forwarded: not-needed testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:2.6.2' -@@ -257,11 +266,12 @@ +@@ -257,11 +265,12 @@ tasks.withType(Test) { reports.html.destination = file("${reporting.baseDir}/${name}") @@ -91,7 +103,7 @@ Forwarded: not-needed jacocoTestReport { reports { xml.enabled = true // coveralls plugin depends on xml format report -@@ -299,6 +309,7 @@ +@@ -299,6 +308,7 @@ } }) } @@ -99,7 +111,7 @@ Forwarded: not-needed /* * Changes project.version to VERSION--snapshot--DATE--GIT_HASH -@@ -333,6 +344,7 @@ +@@ -333,6 +343,7 @@ project.version += "--snapshot--" + infoString } @@ -107,7 +119,7 @@ Forwarded: not-needed // has to be defined AFTER 'dev' things to have the correct project.version task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { projectFile = file('jabref.install4j') -@@ -391,3 +403,4 @@ +@@ -391,3 +402,4 @@ // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer failOnViolations = false } ===================================== debian/patches/080_jdk11_jaxb.patch ===================================== @@ -1,6 +1,6 @@ --- a/build.gradle +++ b/build.gradle -@@ -129,6 +129,7 @@ +@@ -128,6 +128,7 @@ compile 'org.apache.logging.log4j:log4j-core:2.7' //compile 'org.xmlunit:xmlunit-core:2.3.0' //compile 'org.xmlunit:xmlunit-matchers:2.3.0' ===================================== debian/patches/090_mariadb.patch ===================================== @@ -0,0 +1,15 @@ +Description: update jabref to use mariadb driver for MySQL connections +Author: tony mancill <[email protected]> +Forwarded: not-needed + +--- a/src/main/java/net/sf/jabref/shared/DBMSType.java ++++ b/src/main/java/net/sf/jabref/shared/DBMSType.java +@@ -10,7 +10,7 @@ + + MYSQL( + "MySQL", +- "com.mysql.jdbc.Driver", ++ "org.mariadb.jdbc.Driver", + "jdbc:mysql://%s:%d/%s", 3306), + ORACLE( + "Oracle", ===================================== debian/patches/series ===================================== @@ -6,3 +6,4 @@ 060_0664_perms.patch 070_jdk9_swing.patch 080_jdk11_jaxb.patch +090_mariadb.patch View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/11dfe6ba38aaaf25dc1d2a71f883a05c2ca9e3a2...f778b6e3de5b2a849c6b8873a36903d703f2eb93 -- View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/11dfe6ba38aaaf25dc1d2a71f883a05c2ca9e3a2...f778b6e3de5b2a849c6b8873a36903d703f2eb93 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
