Merge remote-tracking branch 'refs/remotes/origin/master'

config/sql/native-new/postgres-new-upgrade-audit.sql

@@ -10,9 +10,24 @@
 -- If you use audit and main repository in a single database, this still must be run as well.
 -- It is safe to run this script repeatedly, so if you're not sure, just run it to be up to date.
 
+-- Using psql is strongly recommended, don't use tools with messy autocommit behavior like pgAdmin!
+-- Using flag to stop on first error is also recommended, for example:
+-- psql -v ON_ERROR_STOP=1 -h localhost -U midaudit -W -d midaudit -f postgres-new-upgrade-audit.sql
+
 -- SCHEMA-COMMIT is a commit which should be used to initialize the DB for testing changes below it.
 -- Check out that commit and initialize a fresh DB with postgres-new-audit.sql to test upgrades.
 
+DO $$
+    BEGIN
+        if to_regproc('apply_audit_change') is null then
+            raise exception 'You are running AUDIT UPGRADE script, but the procedure ''apply_audit_change'' is missing.
+Are you sure you are running this upgrade script on the correct database?
+Current database name is ''%'', schema name is ''%''.
+Perhaps you have separate audit database?', current_database(), current_schema();
+        end if;
+    END
+$$;
+
 -- SCHEMA-COMMIT 4.4: commit 69e8c29b
 
 -- changes for 4.4.1

config/sql/native-new/postgres-new-upgrade.sql

@@ -12,9 +12,23 @@
 -- If necessary, split your changes into multiple apply_changes calls to enforce the commit
 -- before another change - for example when adding values to the custom enum types.
 
+-- Using psql is strongly recommended, don't use tools with messy autocommit behavior like pgAdmin!
+-- Using flag to stop on first error is also recommended, for example:
+-- psql -v ON_ERROR_STOP=1 -h localhost -U midpoint -W -d midpoint -f postgres-new-upgrade.sql
+
 -- SCHEMA-COMMIT is a Git commit which should be used to initialize the DB for testing changes below it.
 -- Check out that commit and initialize a fresh DB with postgres-new-audit.sql to test upgrades.
 
+DO $$
+    BEGIN
+        if to_regproc('apply_change') is null then
+            raise exception 'You are running MAIN UPGRADE script, but the procedure ''apply_change'' is missing.
+Are you sure you are running this upgrade script on the correct database?
+Current database name is ''%'', schema name is ''%''.', current_database(), current_schema();
+        end if;
+    END
+$$;
+
 -- SCHEMA-COMMIT 4.4: commit 69e8c29b
 
 -- changes for 4.4.1

pom.xml

@@ -206,7 +206,7 @@
         <quartz.version>2.3.2.e3</quartz.version>
         <selenium.version>3.141.59</selenium.version>
         <slf4j.version>1.7.30</slf4j.version>
-        <logback.version>1.2.3e1</logback.version>
+        <logback.version>1.2.11</logback.version>
         <spring-security.version>5.6.0</spring-security.version>
         <opensaml.version>4.1.1</opensaml.version>
         <cache2k.version>2.0.0.Final</cache2k.version>
@@ -215,7 +215,7 @@
         <xmlunit.version>2.8.2</xmlunit.version>
         <hibernate.version>5.5.3.Final</hibernate.version>
         <!--
-        Default Spring Boot 2.4.3 uses H2 1.4.200 but that one has NPE bug:
+        Default Spring Boot 2.6.6 uses H2 1.4.200 but that one has NPE bug:
         https://github.com/h2database/h2database/issues/1808
         Sometimes occurs on heavy concurrent test, e.g. on TestDummyParallelism, but also during app run.
         This bug was introduced in 1.4.198, which was major version that also changed queries in OrgClosureManager.

tools/jenkins/midpoint-main-pipeline

@@ -58,7 +58,7 @@ podTemplate(
             container('maven') {
                 try {
                     sh """
-                        mvn verify -P extratest -Dfailsafe.args="-Xms2g -Xmx8g -Duser.language=en --add-exports java.management/sun.management=ALL-UNNAMED"
+                        mvn verify -P extratest -Dfailsafe.args="-Xms2g -Xmx6g -Duser.language=en --add-exports java.management/sun.management=ALL-UNNAMED"
                     """
                 } catch (err) {
                     echo "Caught: ${err}"