Update to 8.0.13

This commit is contained in:
Jakub Janco 2018-10-22 13:28:34 +02:00
commit d20a9581ee
5 changed files with 104 additions and 18 deletions

1
.gitignore vendored
View file

@ -11,3 +11,4 @@
/mysql-connector-java-5.1.38-nojars.tar.xz
/mysql-connector-java-8.0.11-nojars.tar.xz
/mysql-connector-java-8.0.12-nojars.tar.xz
/mysql-connector-java-8.0.13-nojars.tar.xz

Binary file not shown.

View file

@ -1,7 +1,7 @@
Summary: Official JDBC driver for MySQL
Name: mysql-connector-java
Version: 8.0.12
Version: 8.0.13
Release: 1%{?dist}
Epoch: 1
License: GPLv2 with exceptions
@ -103,6 +103,9 @@ ant -Dcom.mysql.cj.build.jdk=%{java_home} \
%license LICENSE
%changelog
* Mon Oct 22 2018 Jakub Janco <jjanco@redhat.com> - 1:8.0.13-1
- Update to 8.0.13
* Tue Aug 07 2018 Jakub Janco <jjanco@redhat.com> - 1:8.0.12-1
- new version

View file

@ -1,17 +1,22 @@
From 61336321d9dbd5628c24e51782cdc7e155a3b485 Mon Sep 17 00:00:00 2001
From: Jakub Janco <jjanco@redhat.com>
Date: Thu, 12 Jul 2018 14:32:54 +0200
Subject: [PATCH] Remove coverage testing
---
build.xml | 52 ----------------------------------------------------
1 file changed, 52 deletions(-)
diff --git a/build.xml b/build.xml
index 659baaca..907585c4 100644
index 03efb55f..9bf9abfe 100644
--- a/build.xml
+++ b/build.xml
@@ -1179,58 +1179,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -306,13 +306,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
<pathelement location="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}" />
</path>
- <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
- <classpath>
- <fileset dir="${com.mysql.cj.extra.libs}">
- <include name="**/jacocoant.jar" />
- </fileset>
- </classpath>
- </taskdef>
<!-- ************************* -->
@@ -1182,58 +1175,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</condition>
<echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
@ -36,6 +41,7 @@ index 659baaca..907585c4 100644
- <classpath>
- <fileset dir="${com.mysql.cj.extra.libs}">
- <include name="**/*.jar" />
- <exclude name="**/protobuf-java-2.6.0.jar" />
- </fileset>
- <fileset dir="${com.mysql.cj.build.dir.driver}/lib">
- <include name="**/*.jar" />
@ -66,10 +72,86 @@ index 659baaca..907585c4 100644
- </batchtest>
- </junit>
- </jacoco:coverage>
-
<junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
<fileset dir="${com.mysql.cj.testsuite.junit.results}">
<include name="**/TEST-*.xml" />
--
2.14.3
@@ -1253,79 +1194,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</target>
- <!-- ********************************* -->
- <!-- ***** TESTING CODE COVERAGE ***** -->
- <!-- ********************************* -->
-
-
- <target name="test-coverage" description="Runs tests collecting coverage results." depends="-set-test-coverage-detaults, test" />
-
-
- <target name="-set-test-coverage-detaults">
- <condition property="com.mysql.cj.coverage.result.dir.final"
- value="${com.mysql.cj.coverage.result.dir}"
- else="${com.mysql.cj.testsuite.build.dir}/coverage">
- <isset property="com.mysql.cj.coverage.result.dir" />
- </condition>
- <condition property="com.mysql.cj.coverage.result.name.final" value="${com.mysql.cj.coverage.result.name}" else="jacoco.exec">
- <isset property="com.mysql.cj.coverage.result.name" />
- </condition>
- </target>
-
-
- <!-- *********************************** -->
- <!-- ***** REPORTING CODE COVERAGE ***** -->
- <!-- *********************************** -->
-
-
- <target name="report-coverage"
- depends="-extra-libs-check, -set-report-coverage-detaults, -jacoco-merge"
- description="Merges coverage results and creates HTML coverage report.">
- <jacoco:report>
- <executiondata>
- <file file="${com.mysql.cj.coverage.merge.result.final}" />
- </executiondata>
-
- <structure name="Connector/J classes">
- <classfiles>
- <fileset dir="${com.mysql.cj.build.dir.driver}">
- <include name="com/mysql/cj/**" />
- <exclude name="com/mysql/cj/x/protobuf/**" />
- </fileset>
- </classfiles>
- <sourcefiles encoding="UTF-8">
- <fileset dir="${com.mysql.cj.build.dir.driver}">
- <include name="com/mysql/cj/**" />
- <exclude name="com/mysql/cj/x/protobuf/**" />
- </fileset>
- </sourcefiles>
- </structure>
-
- <html destdir="${com.mysql.cj.coverage.report.dir.final}" />
-
- </jacoco:report>
- </target>
-
-
- <target name="-jacoco-merge" depends="-set-report-coverage-detaults" if="com.mysql.cj.coverage.merge.files">
- <jacoco:merge destfile="${com.mysql.cj.coverage.merge.result.final}">
- <fileset dir="${com.mysql.cj.coverage.result.dir.final}" includes="${com.mysql.cj.coverage.merge.files}" />
- </jacoco:merge>
- </target>
-
-
- <target name="-set-report-coverage-detaults" depends="-set-test-coverage-detaults">
- <condition property="com.mysql.cj.coverage.merge.result.final"
- value="${com.mysql.cj.coverage.merge.result}"
- else="${com.mysql.cj.coverage.result.dir.final}/jacoco.exec">
- <isset property="com.mysql.cj.coverage.merge.result" />
- </condition>
- <condition property="com.mysql.cj.coverage.report.dir.final"
- value="${com.mysql.cj.coverage.report.dir}"
- else="${com.mysql.cj.coverage.result.dir.final}/report">
- <isset property="com.mysql.cj.coverage.report.dir" />
- </condition>
- </target>
<!-- ***************************** -->

View file

@ -1 +1 @@
SHA512 (mysql-connector-java-8.0.12-nojars.tar.xz) = fc656aab499e4978509bc020c16049b87ee5edeb2920be5ed1fff5676c71ad9218176120d48b50dbe90e0c32eb1f2df980e86c4e7d3e6935f40851f2826c57b1
SHA512 (mysql-connector-java-8.0.13-nojars.tar.xz) = d68a1aef488f384b700f58ba3dadff66c5ed3180355d04bbaba6fbc84316615aafdaa62f9d28e72b45b8cb0198839cbc4557290379bcd5d19bb51534dcc8d019