Merge pull request #761 from folio-org/release_6.1.2

chore: Release 6.1.2

NEWS.md

@@ -1,3 +1,6 @@
+## 6.1.2 2024-05-01
+  * ERM-3138 Grails 5.3.6 fixing databinding DoS (CVE-2023-46131)
+
 ## 6.1.1 2024-04-01
   * ERM-3177 Check on `noSICount` in WorkSourceIdentifierTIRSImpl is not correct
   * ERM-3139 Propose additional info.log messages for jobs/processes

service/gradle.properties

@@ -1,11 +1,11 @@
-grailsVersion=5.3.2
-grailsGradlePluginVersion=5.3.0
+grailsVersion=5.3.6
+grailsGradlePluginVersion=5.3.1
 groovyVersion=3.0.11
 gorm.version=7.3.3
 
 # Application
 appName=mod-agreements
-appVersion=6.1.1
+appVersion=6.1.2
 dockerTagSuffix=
 dockerRepo=folioci
 

service/grails-app/conf/application-dc.yml

@@ -0,0 +1,35 @@
+##
+# This config file connects to the postgres install from a rancher desktop instance.
+# Use the flag '-Dgrails.env=rancher-desktop-db' when running
+##
+
+dataSource:
+  dbCreate: none
+  url: "jdbc:postgresql://${db.host:localhost}:${db.port:5432}/${db.database:okapi_modules_test}" # Port 5432 forwarded so as not to clash.
+  username: postgres
+  password: pa55w0rd
+  driverClassName: org.postgresql.Driver
+  dialect: com.k_int.hibernate.dialects.postgres.KIPostgres94Dialect
+  schemaHandler: com.k_int.okapi.OkapiSchemaHandler
+  logSql: false
+  properties:
+      jmxEnabled: false
+      maximumPoolSize: ${db.maxpoolsize:10}
+      transactionIsolation: TRANSACTION_READ_COMMITTED
+
+  hibernate:
+    enable_lazy_load_no_trans: true
+
+okapi: 
+  service:
+    host: localhost
+    port: 30100
+logging:
+  config: classpath:logback-development.xml
+
+
+
+#    register: true
+#    deploy: true
+
+

tools/testing/init.sql

@@ -2,13 +2,13 @@ select 1;
 
 CREATE USER folio_admin WITH PASSWORD 'folio_admin';
 CREATE USER folio WITH PASSWORD 'folio';
-DROP DATABASE if exists okapi_modules;
+DROP DATABASE if exists okapi_modules_test;
 DROP DATABASE if exists olfdev;
 DROP DATABASE if exists olftest;
 CREATE DATABASE olftest;
-CREATE DATABASE okapi_modules;
+CREATE DATABASE okapi_modules_test;
 CREATE DATABASE olfdev;
-GRANT ALL PRIVILEGES ON DATABASE okapi_modules to folio_admin;
+GRANT ALL PRIVILEGES ON DATABASE okapi_modules_test to folio_admin;
 GRANT ALL PRIVILEGES ON DATABASE olfdev to folio;
 GRANT ALL PRIVILEGES ON DATABASE olftest to folio;
 
@@ -18,4 +18,4 @@ ALTER USER folio WITH SUPERUSER;
 ALTER USER folio_admin CREATEDB;
 ALTER USER folio_admin CREATEROLE;
 ALTER USER folio_admin WITH SUPERUSER;
-CREATE EXTENSION IF NOT EXISTS pg_trgm;
+CREATE EXTENSION IF NOT EXISTS pg_trgm;