rpms/mysql-connector-java
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebase to version 8.0.20

Browse source 
Make compatible with upcoming jdk-11 in rawhide
This commit is contained in:
Ondrej Dubaj 2020-06-25 11:26:14 +02:00
commit 77d78bc9b4
5 changed files with 34 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

46
remove-coverage-test.patch
View file

@ -1,32 +1,32 @@
From 62f1bf44f6cee0fd97500d6f761a3e03810318df Mon Sep 17 00:00:00 2001
From: Jakub Janco <jjanco@redhat.com>
Date: Mon, 6 May 2019 15:05:17 +0200
From 134dadce2a60a2d51d1c2e13d152ec11a419c575 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Thu, 14 May 2020 13:40:39 +0200
Subject: [PATCH] Remove coverage test
---
build.xml | 133 --------------------------------------------------------------
build.xml | 133 ------------------------------------------------------
1 file changed, 133 deletions(-)
diff --git a/build.xml b/build.xml
index 7572a4ce..fcce72be 100644
index 83b6e2c..af374ee 100644
--- a/build.xml
+++ b/build.xml
@@ -303,14 +303,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>
@@ -338,14 +338,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</not>
</condition>
</fail>
-
- <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>
</target>
<!-- ************************* -->
<!-- ***** VERIFICATIONS ***** -->
@@ -1276,56 +1268,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -1307,56 +1299,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</condition>
<echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
@ -41,8 +41,8 @@ index 7572a4ce..fcce72be 100644
- fork="on"
- forkmode="once"
- jvm="${com.mysql.cj.testsuite.jvm.java}"
- errorProperty="com.mysql.cj.testsuite.junit.fail"
- failureProperty="com.mysql.cj.testsuite.junit.fail">
- errorproperty="com.mysql.cj.testsuite.junit.fail"
- failureproperty="com.mysql.cj.testsuite.junit.fail">
- <jvmarg value="-Xmx1024m" />
-
- <syspropertyset refid="junit.system.properties" />
@ -83,7 +83,7 @@ index 7572a4ce..fcce72be 100644
<junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
<fileset dir="${com.mysql.cj.testsuite.junit.results}">
<include name="**/TEST-*.xml" />
@@ -1344,81 +1286,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -1375,81 +1317,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</target>
@ -166,5 +166,5 @@ index 7572a4ce..fcce72be 100644
<!-- ***** RPM/DEB PACKAGING ***** -->
<!-- ***************************** -->
--
2.14.5
2.24.1