Upgrade to latest ervilla.

io7m-com · Apr 21, 2024 · bdccca8 · bdccca8
1 parent 7f44479
commit bdccca8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/com.io7m.jqpage.tests/src/main/java/com/io7m/jqpage/tests/JQPaginationTest.java b/com.io7m.jqpage.tests/src/main/java/com/io7m/jqpage/tests/JQPaginationTest.java
@@ -17,7 +17,7 @@
 package com.io7m.jqpage.tests;
 
 import com.io7m.ervilla.api.EContainerSupervisorType;
-import com.io7m.ervilla.test_extension.ErvillaCloseAfterAll;
+import com.io7m.ervilla.test_extension.ErvillaCloseAfterSuite;
 import com.io7m.ervilla.test_extension.ErvillaConfiguration;
 import com.io7m.ervilla.test_extension.ErvillaExtension;
 import com.io7m.jqpage.core.JQField;
@@ -56,14 +56,14 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @ExtendWith({ErvillaExtension.class})
-@ErvillaConfiguration(disabledIfUnsupported = true)
+@ErvillaConfiguration(disabledIfUnsupported = true, projectName = "com.io7m.jqpage")
 public final class JQPaginationTest
 {
   private static JQDatabaseFixture DATABASE_FIXTURE;
 
   @BeforeAll
   public static void setupOnce(
-    final @ErvillaCloseAfterAll EContainerSupervisorType containers)
+    final @ErvillaCloseAfterSuite EContainerSupervisorType containers)
     throws Exception
   {
     DATABASE_FIXTURE =

diff --git a/com.io7m.jqpage.tests/src/main/java/com/io7m/jqpage/tests/JQTestContainers.java b/com.io7m.jqpage.tests/src/main/java/com/io7m/jqpage/tests/JQTestContainers.java
@@ -19,6 +19,7 @@
 
 import com.io7m.ervilla.api.EContainerSupervisorType;
 import com.io7m.ervilla.api.EContainerType;
+import com.io7m.ervilla.api.EPortAddressType;
 import com.io7m.ervilla.postgres.EPgSpecs;
 
 import java.io.IOException;
@@ -152,7 +153,7 @@ public static JQDatabaseFixture createDatabase(
       supervisor.start(
         EPgSpecs.builderFromDockerIO(
           JQTestProperties.POSTGRESQL_VERSION,
-          Optional.empty(),
+          new EPortAddressType.All(),
           port,
           "postgres",
           "postgres",

diff --git a/pom.xml b/pom.xml
@@ -26,12 +26,16 @@
   </modules>
 
   <properties>
-    <com.io7m.ervilla.version>0.0.5</com.io7m.ervilla.version>
+    <!-- Configuration. -->
     <io7m.api.previousVersion>0.0.4-SNAPSHOT</io7m.api.previousVersion>
     <io7m.java.targetJavaVersion>21</io7m.java.targetJavaVersion>
+
+    <!-- io7m dependencies. -->
+    <com.io7m.ervilla.version>1.0.0-beta0002</com.io7m.ervilla.version>
+
+    <!-- Third-party dependencies. -->
     <jooq.version>3.19.1</jooq.version>
     <junit.version>5.10.1</junit.version>
-
     <containers.postgresql.version>15.2</containers.postgresql.version>
   </properties>