Merge branch 'master' into RMB-1030

# Conflicts:
#	domain-models-runtime/src/test/java/org/folio/rest/persist/cache/CachedConnectionManagerTest.java

Author: steveellis

NEWS.md

@@ -1,6 +1,6 @@
 ## 35.4.0 2025-02-28
 
-Sunflower (2025 R1) release.
+Sunflower (2025 R1) release, see [upgrade notes](doc/upgrading.md#version-354).
 
 * [RMB-1010](https://folio-org.atlassian.net/browse/RMB-1010): PostgreSQLContainer withStartupAttempts(3)
 * [RMB-1011](https://folio-org.atlassian.net/browse/RMB-1011): Timeout when trying to connect to DB\_HOST:DB\_PORT

README.md

@@ -320,13 +320,15 @@ we will get your local development server running and populated with test data.
 
 ## Command-line options
 
+Use the `-D` option before the `-jar` argument to pass options as system properties.
+
 - `-Dhttp.port=8080` Optional -- defaults to 8081
 
 - `-Ddebug_log_package=*` Optional -- Set log level to debug for all packages.
 Or use `org.folio.rest.*` for all classes within a specific package,
 or `org.folio.rest.RestVerticle` for a specific class.
 
-- `db_connection=[path]` Optional -- path to a JSON config file with
+- `-Ddb_connection=[path]` Optional -- path to a JSON config file with
   connection parameters to a PostgreSQL DB
 
   - for example Postgres: `{"host":"localhost", "port":5432, "maxPoolSize":50,
@@ -339,14 +341,6 @@ or `org.folio.rest.RestVerticle` for a specific class.
 
   - if file not found or path is relative tries to read a class path resource with that path
 
-- Other module-specific arguments can be passed via the command line in the format key=value. These will be accessible to implementing modules via `RestVerticle.MODULE_SPECIFIC_ARGS` map.
-
-- Optional JVM arguments can be passed before the `-jar` argument, e.g.
-`-XX:+HeapDumpOnOutOfMemoryError`
-`-XX:+PrintGCDetails`
-`-XX:+PrintGCTimeStamps`
-`-Xloggc:C:\Git\circulation\gc.log`
-
 ## Environment Variables
 
 RMB implementing modules expect a set of environment variables to be passed in at module startup. The environment variables expected by RMB modules are:
@@ -385,7 +379,7 @@ Use `DB_SERVER_PEM` (or `server_pem` in the JSON config) to set SSL/TLS certific
 
 The environment variable `DB_CONNECTIONRELEASEDELAY` sets the delay in milliseconds after which an idle connection is closed. A connection becomes idle if the query ends, it is not idle if it is waiting for a response. Use 0 to keep idle connections open forever. RMB's default is one minute (60000 ms).
 
-`DB_MAX_LIFETIME` limits the lifetime (non-idle time plus idle time) of a database connection in milliseconds. If exceeded the connection is closed if it is or becomes idle. 0 means unlimited lifetime. It defaults to 30000. This options exists since RMB 36.0.0 (Trillium).
+`DB_MAX_LIFETIME` limits the lifetime (non-idle time plus idle time) of a database connection in milliseconds. If exceeded the connection is closed if it is or becomes idle. 0 means unlimited lifetime. It defaults to 1800000 (30 minutes). This options exists since RMB 36.0.0 (Trillium).
 
 `DB_RECONNECTATTEMPTS` and `DB_RECONNECTINTERVAL` set the maximum number of retries after a connect to the database fails, and how many milliseconds to wait before the next reconnect. Reconnecting is disabled by default.
 

cql2pgjson-cli/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.folio</groupId>
     <artifactId>raml-module-builder</artifactId>
-    <version>35.5.0-SNAPSHOT</version>
+    <version>36.0.0-SNAPSHOT</version>
   </parent>
 
   <properties>

cql2pgjson/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.folio</groupId>
     <artifactId>raml-module-builder</artifactId>
-    <version>35.5.0-SNAPSHOT</version>
+    <version>36.0.0-SNAPSHOT</version>
   </parent>
 
   <licenses>
@@ -130,13 +130,13 @@
 
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>testcontainers-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>postgresql</artifactId>
+      <artifactId>testcontainers-postgresql</artifactId>
       <scope>test</scope>
     </dependency>
 

cql2pgjson/src/main/java/org/folio/cql2pgjson/CQL2PgJSON.java

@@ -181,7 +181,7 @@ private void loadDbSchema(String schemaPath) {
   private static Schema loadDbSchemaFromResource(String schemaPath) {
     try {
       String dbJson = ResourceUtil.asString(schemaPath, CQL2PgJSON.class);
-      logger.info("loadDbSchema: Loaded {} OK", schemaPath);
+      logger.debug("loadDbSchema: Loaded {} OK", schemaPath);
       return ObjectMapperTool.getMapper().readValue(dbJson, Schema.class);
     } catch (IOException e) {
       throw new UncheckedIOException(e);
@@ -923,7 +923,7 @@ String queryByFt(String indexText, String term, String comparator, Index schemaI
     }
     String sql = "get_tsvector(" + indexText + ") " + "@@ " + tsTerm.toString();
 
-    logger.info("full text index {} generated SQL {}", indexText, sql);
+    logger.debug("full text index {} generated SQL {}", indexText, sql);
     return sql;
   }
 
@@ -981,7 +981,7 @@ private String queryByLike(String index, DbIndex dbIndex, IndexTextAndJsonValues
       }
     }
 
-    logger.info("index {} generated SQL {}", indexText, sql);
+    logger.debug("index {} generated SQL {}", indexText, sql);
     return sql;
   }
 
@@ -1016,7 +1016,7 @@ private String queryBySql(DbIndex dbIndex, IndexTextAndJsonValues vals, CQLTermN
       logger.warn("Doing SQL query without index for {}", s);
     }
 
-    logger.info("index {} generated SQL {}", indexMod, sql);
+    logger.debug("index {} generated SQL {}", indexMod, sql);
     return sql;
   }
 

dbschema/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.folio</groupId>
     <artifactId>raml-module-builder</artifactId>
-    <version>35.5.0-SNAPSHOT</version>
+    <version>36.0.0-SNAPSHOT</version>
   </parent>
 
   <licenses>

doc/upgrading.md

@@ -4,6 +4,8 @@ These are notes to assist upgrading to newer versions.
 See the [NEWS](../NEWS.md) summary of changes for each version.
 
 <!-- ../../okapi/doc/md2toc -l 2 -h 3 upgrading.md -->
+* [Version 36.0](#version-360)
+* [Version 35.4](#version-354)
 * [Version 35.3](#version-353)
 * [Version 35.2](#version-352)
 * [Version 35.1](#version-351)
@@ -26,10 +28,55 @@ See the [NEWS](../NEWS.md) summary of changes for each version.
 * [Version 25](#version-25)
 * [Version 20](#version-20)
 
+## Version 36.0
+
+36.0.\* is the Trillium version.
+
+See also the [FOLIO Vert.x 5 migration notes](https://folio-org.atlassian.net/wiki/spaces/FOLIJET/pages/1003847853/Migration+to+Vertx+5).
+
+All command line options must be passed as system properties using `-D` before the `-jar` argument. `MODULE_SPECIFIC_ARGS` no longer exists.
+Modules should prefer environment variables.
+
+In the log4j pattern (used in log4j2.properties and log4j2-json.properties) upcase id:
+* `FolioLoggingContext:requestid` -> `FolioLoggingContext:requestId`
+* `FolioLoggingContext:tenantid` -> `FolioLoggingContext:tenantId`
+* `FolioLoggingContext:userid` -> `FolioLoggingContext:userId`
+* `FolioLoggingContext:moduleid` -> `FolioLoggingContext:moduleId`
+
+In pom.xml file add `ServicesResourceTransformer` to the `maven-shade-plugin` configuration.
+```xml
+    <configuration>
+      <transformers>
+        ...
+        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+      </transformers>
+    </configuration>
+```
+
+Consider replacing
+* `org.apache.hc.core5.http.HttpHeaders` with `org.folio.HttpHeaders`
+* `org.apache.hc.core5.http.HttpStatus` with `org.folio.HttpStatus`
+* `org.apache.http.HttpHeaders` with `org.folio.HttpHeaders`
+* `org.apache.http.HttpStatus` with `org.folio.HttpStatus`
+They are drop-in replacements and may allow to drop the `org.apache.httpcomponents.core5:httpcore5`
+or `org.apache.httpcomponents:httpcore` dependency reducing the runtime size.
+
+## Version 35.4
+
+35.4.\* is the Sunflower (R1 2025) version.
+
+RMB >= 35.4.2 requires Vert.x >= 4.5.23.
+
+RMB 35.4.0 and 35.4.1 require Vert.x <= 4.5.22.
+
 ## Version 35.3
 
 35.3.\* is the Ramsons (R2 2024) version.
 
+RMB >= 35.3.2 requires Vert.x >= 4.5.23.
+
+RMB 35.3.0 and 35.3.1 require Vert.x <= 4.5.22.
+
 Don't use `JsonObject.mapFrom` to serialize a Java class instance to JSON,
 RMB's database methods take a Java class and automatically serialize it. When writing custom SQL use
 `ObjectMapperTool.valueAsString` to serialize in a way compatible with RMB's deserializer.

domain-models-api-aspects/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.folio</groupId>
     <artifactId>raml-module-builder</artifactId>
-    <version>35.5.0-SNAPSHOT</version>
+    <version>36.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>domain-models-api-aspects</artifactId>
 

domain-models-api-aspects/src/main/resources/log4j2.properties

@@ -1,8 +1,15 @@
-# variables are substituted from filters-[production|development].properties
-log4j.rootLogger=INFO, CONSOLE
-#log4j.rootLogger=DEBUG, CONSOLE
 
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss:SSS} %-5p %C{1} %X{reqId} %m%n
+# Log4j 2 properties configuration
+status = error
+name = PropertiesConfig
+
+# Console appender
+appender.console.type = Console
+appender.console.name = CONSOLE
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{dd MMM yyyy HH:mm:ss:SSS} %-5p %C{1} %X{reqId} %m%n
+
+# Root logger
+rootLogger.level = info
+rootLogger.appenderRefs = console
+rootLogger.appenderRef.console.ref = CONSOLE

domain-models-api-interfaces/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.folio</groupId>
     <artifactId>raml-module-builder</artifactId>
-    <version>35.5.0-SNAPSHOT</version>
+    <version>36.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>domain-models-api-interfaces</artifactId>