From c6a009912179653d08e861621cba94332b1869ea Mon Sep 17 00:00:00 2001
From: Jan Was <jan.was@starburstdata.com>
Date: Mon, 11 Apr 2022 14:48:44 +0200
Subject: [PATCH 1/3] Update airbase to version 124

This version updated maven-surefire-plugin to 3.0.0-M6,
which should reduce maximum memory usage in tests.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bded48bdff32..d0c9d2c7e163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>123</version>
+        <version>124</version>
     </parent>
 
     <groupId>io.trino</groupId>

From e16a7aff711f0b1fa18894b345cf5a2e7c4c8e86 Mon Sep 17 00:00:00 2001
From: Jan Was <jan.was@starburstdata.com>
Date: Wed, 13 Apr 2022 09:03:18 +0200
Subject: [PATCH 2/3] Restore default order of test execution

---
 plugin/trino-delta-lake/pom.xml | 7 -------
 plugin/trino-sqlserver/pom.xml  | 8 --------
 2 files changed, 15 deletions(-)

diff --git a/plugin/trino-delta-lake/pom.xml b/plugin/trino-delta-lake/pom.xml
index 3c97c87b421d..9ba231b7b9e8 100644
--- a/plugin/trino-delta-lake/pom.xml
+++ b/plugin/trino-delta-lake/pom.xml
@@ -16,13 +16,6 @@
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
 
-        <!--
-          Project's default for air.test.parallel is 'methods'. By design, 'classes' makes TestNG run tests from one class in a single thread.
-          As a side effect, it prevents TestNG from initializing multiple test instances upfront, which happens with 'methods'.
-          A potential downside can be long tail single-threaded execution of a single long test class.
-          TODO (https://github.com/trinodb/trino/issues/11294) remove when we upgrade to surefire with https://issues.apache.org/jira/browse/SUREFIRE-1967
-          -->
-        <air.test.parallel>classes</air.test.parallel>
         <!-- TODO (https://github.com/trinodb/trino/issues/11325): enable parallel tests; disabled due to tests crashing -->
         <air.test.thread-count>1</air.test.thread-count>
     </properties>
diff --git a/plugin/trino-sqlserver/pom.xml b/plugin/trino-sqlserver/pom.xml
index 634889101eca..5099a5508526 100644
--- a/plugin/trino-sqlserver/pom.xml
+++ b/plugin/trino-sqlserver/pom.xml
@@ -15,14 +15,6 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-
-        <!--
-          Project's default for air.test.parallel is 'methods'. By design, 'classes' makes TestNG run tests from one class in a single thread.
-          As a side effect, it prevents TestNG from initializing multiple test instances upfront, which happens with 'methods'.
-          A potential downside can be long tail single-threaded execution of a single long test class.
-          TODO (https://github.com/trinodb/trino/issues/11294) remove when we upgrade to surefire with https://issues.apache.org/jira/browse/SUREFIRE-1967
-          -->
-        <air.test.parallel>classes</air.test.parallel>
     </properties>
 
     <dependencies>

From 7bb9d771c0a0b4e7bcb24bb145591423a270c2bf Mon Sep 17 00:00:00 2001
From: Jan Was <jan.was@starburstdata.com>
Date: Wed, 13 Apr 2022 17:03:05 +0200
Subject: [PATCH 3/3] Avoid printing to standard output in tests

---
 .../java/io/trino/execution/TestingPageSourceProvider.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/trino-main/src/test/java/io/trino/execution/TestingPageSourceProvider.java b/core/trino-main/src/test/java/io/trino/execution/TestingPageSourceProvider.java
index fbbd6cde95a8..e68ee7e8c466 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestingPageSourceProvider.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestingPageSourceProvider.java
@@ -36,11 +36,6 @@
 public class TestingPageSourceProvider
         implements ConnectorPageSourceProvider
 {
-    public TestingPageSourceProvider()
-    {
-        System.out.println();
-    }
-
     @Override
     public ConnectorPageSource createPageSource(
             ConnectorTransactionHandle transaction,