MODAUD-192 - Upgrading RMB version to 35.3.0 (#172)

* MODAUD-192 - Upgrading RMB version to 35.3.0 * MODAUD-192 Fixing test failure * MODAUD-192 - Upgrading RMB version to 35.3.0 --------- Co-authored-by: Vignesh-Kalyanasundaram <[email protected]>
folio-org · Oct 23, 2024 · 4e633dc · 4e633dc
1 parent 13dbc70
commit 4e633dc
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
@@ -0,0 +1,26 @@
+name: postgres
+on:
+  workflow_dispatch:
+    inputs:
+      postgres:
+        description: "List of postgres container images, to be injected as TESTCONTAINERS_POSTGRES_IMAGE"
+        default: '["postgres:16-alpine", "postgres:18-alpine"]'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        postgres: ${{ fromJSON(github.event.inputs.postgres) }}
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        cache: maven
+    - run: mvn --batch-mode verify
+      env:
+        TESTCONTAINERS_POSTGRES_IMAGE: ${{ matrix.postgres }}
diff --git a/mod-audit-server/src/test/java/org/folio/rest/impl/AuditHandlersImplApiTest.java b/mod-audit-server/src/test/java/org/folio/rest/impl/AuditHandlersImplApiTest.java
@@ -1,6 +1,7 @@
 package org.folio.rest.impl;
 
 import static io.restassured.RestAssured.given;
+import static org.awaitility.Awaitility.await;
 import static org.folio.rest.jaxrs.model.LogRecord.Object.LOAN;
 import static org.folio.rest.jaxrs.model.LogRecord.Object.NOTICE;
 import static org.folio.rest.jaxrs.model.LogRecord.Object.N_A;
@@ -28,7 +29,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 public class AuditHandlersImplApiTest extends ApiTestBase {
 
@@ -128,7 +129,8 @@ private void postLogRecord(String payload) {
   }
 
   private void verifyNumberOfLogRecords(LogRecord.Object object, int expectedNumberOfRecords) {
-    assertEquals(expectedNumberOfRecords, getNumberOfExistingLogRecords(object));
+    await().atMost(Duration.ofSeconds(5)).untilAsserted(() ->
+      assertEquals(expectedNumberOfRecords, getNumberOfExistingLogRecords(object)));
   }
 
   private int getNumberOfExistingLogRecords(LogRecord.Object object) {

diff --git a/pom.xml b/pom.xml
@@ -18,12 +18,12 @@
   </modules>
 
   <properties>
-    <aspectj.version>1.9.21.1</aspectj.version>
-    <raml-module-builder.version>35.2.0</raml-module-builder.version>
-    <vertx.version>4.5.4</vertx.version>
+    <aspectj.version>1.9.22.1</aspectj.version>
+    <raml-module-builder.version>35.3.0</raml-module-builder.version>
+    <vertx.version>4.5.10</vertx.version>
     <wiremock.version>2.25.1</wiremock.version>
     <junit.jupiter.version>5.6.2</junit.jupiter.version>
-    <rest-assured.version>5.4.0</rest-assured.version>
+    <rest-assured.version>5.5.0</rest-assured.version>
     <pubsub.client.version>2.13.0</pubsub.client.version>
     <streamx.version>0.7.3</streamx.version>
     <main.basedir>${project.basedir}</main.basedir>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
-        <version>2.23.0</version>
+        <version>2.24.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -65,7 +65,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.13.0</version>
         <configuration>
           <release>17</release>
           <encoding>UTF-8</encoding>
@@ -141,7 +141,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.1</version>
         <configuration>
           <preparationGoals>clean verify</preparationGoals>
           <tagNameFormat>v@{project.version}</tagNameFormat>