From 24cf7e22e8f8381d076d18bce8d569812e1a0d26 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipe.silva@oracle.com>
Date: Tue, 23 Nov 2021 19:46:55 +0000
Subject: [PATCH] Fix for Bug#105323 (33507321), README.md contains broken
 links.

---
 CHANGES   | 2 ++
 README.md | 4 ++--
 build.xml | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3e2fe9936..a73e03340 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 8.0.28
 
+  - Fix for Bug#105323 (33507321), README.md contains broken links.
+
   - Fix for Bug#96900 (30355150), STATEMENT.CANCEL()CREATE A DATABASE CONNECTION BUT DOES NOT CLOSE THE CONNECTION.
 
   - Fix for Bug#104067 (33054827), No reset autoCommit after unknown issue occurs.
diff --git a/README.md b/README.md
index 13cc1e530..46a3f00b7 100644
--- a/README.md
+++ b/README.md
@@ -53,8 +53,8 @@ There are a few ways to contribute to the Connector/J code. Please refer to the
 * [MySQL Connector/J, JDBC and Java forum](https://forums.mysql.com/list.php?39).
 * [`#connectors` channel in MySQL Community Slack](https://mysqlcommunity.slack.com/messages/connectors). ([Sign-up](https://lefred.be/mysql-community-on-slack/) required if you do not have an Oracle account.)
 * [@MySQL on Twitter](https://twitter.com/MySQL).
-* [MySQL and Java Mailing Lists](https://lists.mysql.com/java).
-* [InsideMySQL.com Connectors Blog](https://insidemysql.com/category/mysql-development/connectors/).
+* [MySQL Blog](https://blogs.oracle.com/mysql/).
+* [MySQL Connectors Blog archive](https://dev.mysql.com/blog-archive/?cat=Connectors%20%2F%20Languages).
 * [MySQL Bugs Database](https://bugs.mysql.com/).
 
 For more information about this and other MySQL products, please visit [MySQL Contact & Questions](https://www.mysql.com/about/contact/).
diff --git a/build.xml b/build.xml
index 836ab00e1..f1fbe6655 100644
--- a/build.xml
+++ b/build.xml
@@ -1302,6 +1302,9 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
             </and>
         </condition>
 
+        <!-- ant 1.10.10 and above print report summaries to the console from where test counts can be retrieved. -->
+        <antversion property="com.mysql.cj.testsuite.ant.version" atleast="1.10.10" />
+
         <junitlauncher haltOnFailure="false" printSummary="true" failureProperty="com.mysql.cj.testsuite.junit.fail">
             <classpath refid="com.mysql.cj.testsuite.build.classpath" />
 
@@ -1314,7 +1317,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
                     <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
                     <syspropertyset refid="junit.system.properties" />
                 </fork>
-                <listener classname="testsuite.JUnitSummary" />
+                <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
                 <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
                 <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
             </test>
@@ -1328,7 +1331,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
                     <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
                     <syspropertyset refid="junit.system.properties" />
                 </fork>
-                <listener classname="testsuite.JUnitSummary" />
+                <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
                 <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
                 <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
             </test>
@@ -1343,7 +1346,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
                     <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
                     <syspropertyset refid="junit.system.properties" />
                 </fork>
-                <listener classname="testsuite.JUnitSummary" />
+                <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
                 <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
                 <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
             </testclasses>