Merge pull request #152 from graben/ag25

Update Agroal to 2.5
snowdrop · Jul 13, 2024 · 5a7e0e7 · 5a7e0e7
2 parents bc809c6 + e8ecdcd
commit 5a7e0e7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/...g-boot-starter-it/src/test/java/dev/snowdrop/boot/narayana/generic/GenericRecoveryIT.java b/...g-boot-starter-it/src/test/java/dev/snowdrop/boot/narayana/generic/GenericRecoveryIT.java
@@ -32,7 +32,7 @@
 import dev.snowdrop.boot.narayana.app.MessagesService;
 import dev.snowdrop.boot.narayana.app.TestApplication;
 import dev.snowdrop.boot.narayana.utils.BytemanHelper;
-import io.agroal.springframework.boot.AgroalDataSourceConfiguration;
+import io.agroal.springframework.boot.AgroalDataSourceAutoConfiguration;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMUnitConfig;
 import org.jboss.byteman.contrib.bmunit.WithByteman;
@@ -60,7 +60,7 @@
 @WithByteman
 @BMUnitConfig
 @SpringBootTest(classes = TestApplication.class)
-@EnableAutoConfiguration(exclude = AgroalDataSourceConfiguration.class)
+@EnableAutoConfiguration(exclude = AgroalDataSourceAutoConfiguration.class)
 public class GenericRecoveryIT {
 
     @Mock
@@ -117,7 +117,7 @@ void testCrashBeforeCommit() throws Exception {
         assertEntriesAfterCrash(this.entriesService.getEntries());
 
         await("Wait for the recovery to happen")
-                .atMost(Duration.ofSeconds(60))
+                .atMost(Duration.ofSeconds(30))
                 .pollInterval(Duration.ofSeconds(1))
                 .untilAsserted(() -> {
                     assertMessagesAfterRecovery(this.messagesService.getReceivedMessages());

diff --git a/...t-starter-it/src/test/java/dev/snowdrop/boot/narayana/generic/GenericTransactionalIT.java b/...t-starter-it/src/test/java/dev/snowdrop/boot/narayana/generic/GenericTransactionalIT.java
@@ -25,7 +25,7 @@
 import dev.snowdrop.boot.narayana.app.Entry;
 import dev.snowdrop.boot.narayana.app.MessagesService;
 import dev.snowdrop.boot.narayana.app.TestApplication;
-import io.agroal.springframework.boot.AgroalDataSourceConfiguration;
+import io.agroal.springframework.boot.AgroalDataSourceAutoConfiguration;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -41,7 +41,7 @@
  * @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
  */
 @SpringBootTest(classes = TestApplication.class)
-@EnableAutoConfiguration(exclude = AgroalDataSourceConfiguration.class)
+@EnableAutoConfiguration(exclude = AgroalDataSourceAutoConfiguration.class)
 public class GenericTransactionalIT {
 
     @Autowired

diff --git a/...ing-boot-starter-it/src/test/java/dev/snowdrop/boot/narayana/pooled/PooledRecoveryIT.java b/...ing-boot-starter-it/src/test/java/dev/snowdrop/boot/narayana/pooled/PooledRecoveryIT.java
@@ -27,6 +27,7 @@
 @SpringBootTest(classes = TestApplication.class, properties = {
     "narayana.messaginghub.enabled=true",
     "narayana.messaginghub.name=jms",
+    "spring.datasource.agroal.flushOnClose=true",
     "spring.datasource.generateUniqueName=false",
     "spring.datasource.name=jdbc"
 })

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <agroal.version>2.4</agroal.version>
+    <agroal.version>2.5</agroal.version>
     <awaitility.version>4.2.0</awaitility.version>
     <byteman.version>4.0.21</byteman.version>
     <camel.version>4.4.3</camel.version>