From 0a2201d053b473ed9109a1d090ee9d08a3311a46 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Wed, 3 Apr 2019 14:07:54 -0500
Subject: [PATCH] - Update Agroal from version 1.3 to 1.4 (fixes intermittent
 test failure) - Changes to make sure a module's tests run before publishing
 any of its artifacts.  Ideally this would also make sure that a module's
 artifact would not be published before the tests for all modules are run;
 however, having trouble getting that to work (Gradle init timing?)

---
 build.gradle                        | 4 +---
 gradle/libraries.gradle             | 4 ++--
 gradle/published-java-module.gradle | 6 ++++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7d1e2bc6b6f8..84c4163e6362 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,15 +49,13 @@ allprojects {
 		}
 	}
 	apply plugin: 'idea'
+	apply plugin: 'eclipse'
 
 	// minimize changes, at least for now (gradle uses 'build' by default)..
 	buildDir = "target"
 
 	apply from: rootProject.file( 'gradle/base-information.gradle' )
 
-	apply plugin: 'idea'
-	apply plugin: 'eclipse'
-
 }
 
 
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index 3f8975897b3f..1f2a614e37ff 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -150,8 +150,8 @@ ext {
             proxool:         "proxool:proxool:0.8.3",
             hikaricp:        "com.zaxxer:HikariCP:3.2.0",
             vibur:           "org.vibur:vibur-dbcp:22.2",
-            agroal_api:      "io.agroal:agroal-api:1.3",
-            agroal_pool:     "io.agroal:agroal-pool:1.3",
+            agroal_api:      "io.agroal:agroal-api:1.4",
+            agroal_pool:     "io.agroal:agroal-pool:1.4",
 
             atomikos:         "com.atomikos:transactions:4.0.6",
             atomikos_jta:     "com.atomikos:transactions-jta:4.0.6",
diff --git a/gradle/published-java-module.gradle b/gradle/published-java-module.gradle
index f33f01d386fe..2c26f40a275e 100644
--- a/gradle/published-java-module.gradle
+++ b/gradle/published-java-module.gradle
@@ -171,3 +171,9 @@ task ciBuild( dependsOn: [test, publish] )
 
 task release( dependsOn: [test, bintrayUpload] )
 
+afterEvaluate { Project project ->
+	project.rootProject.subprojects { Project subproject ->
+		// NOTE : we want this even when `project == subproject`
+		project.tasks.bintrayUpload.dependsOn( subproject.tasks.build )
+	}
+}