Update to Liquibase 4.8.0 (keycloak#10839)

Closes keycloak#10678 Co-authored-by: Stefan Guilhen <sguilhen@redhat.com> Co-authored-by: Martin Kanis <mkanis@redhat.com> Co-authored-by: Bruno Oliveira da Silva <bruno@abstractj.com> Co-authored-by: Stefan Guilhen <sguilhen@redhat.com> Co-authored-by: Martin Kanis <mkanis@redhat.com>
DGuhr · Mar 21, 2022 · ae92e6e · ae92e6e
1 parent d19a830
commit ae92e6e
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 9 deletions.
diff --git a/...ution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml b/...ution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
@@ -81,11 +81,11 @@
     <dependency>
       <groupId>org.liquibase</groupId>
       <artifactId>liquibase-core</artifactId>
-      <version>4.6.2</version>
+      <version>4.8.0</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.6.2/LICENSE.txt</url>
+          <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.8.0/LICENSE.txt</url>
         </license>
       </licenses>
     </dependency>

diff --git a/...ore,4.6.2,Apache Software License 2.0.txt → ...ore,4.8.0,Apache Software License 2.0.txt b/...ore,4.6.2,Apache Software License 2.0.txt → ...ore,4.8.0,Apache Software License 2.0.txt
diff --git a/...ibution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/...ibution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
@@ -81,11 +81,11 @@
     <dependency>
       <groupId>org.liquibase</groupId>
       <artifactId>liquibase-core</artifactId>
-      <version>4.6.2.redhat-00001</version>
+      <version>4.8.0.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.6.2/LICENSE.txt</url>
+          <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.8.0/LICENSE.txt</url>
         </license>
       </licenses>
     </dependency>

diff --git a/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt b/...hat-00001,Apache Software License 2.0.txt → ...hat-00001,Apache Software License 2.0.txt
diff --git a/...n-feature-packs/server-galleon-pack/src/license/keycloak-server-galleon-pack-licenses.xml b/...n-feature-packs/server-galleon-pack/src/license/keycloak-server-galleon-pack-licenses.xml
@@ -96,11 +96,11 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>3.6.2</version>
+            <version>4.8.0</version>
             <licenses>
                 <license>
                     <name>Apache Software License 2.0</name>
-                    <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.6.2/LICENSE.txt</url>
+                    <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.8.0/LICENSE.txt</url>
                 </license>
             </licenses>
         </dependency>

diff --git a/...eon-feature-packs/server-galleon-pack/src/license/rh-sso-server-galleon-pack-licenses.xml b/...eon-feature-packs/server-galleon-pack/src/license/rh-sso-server-galleon-pack-licenses.xml
@@ -81,11 +81,11 @@
     <dependency>
       <groupId>org.liquibase</groupId>
       <artifactId>liquibase-core</artifactId>
-      <version>4.6.2.redhat-00001</version>
+      <version>4.8.0.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.6.2/LICENSE.txt</url>
+          <url>https://raw.githubusercontent.com/liquibase/liquibase/v4.8.0/LICENSE.txt</url>
         </license>
       </licenses>
     </dependency>

diff --git a/...g/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java b/...g/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java
@@ -26,6 +26,7 @@
 import liquibase.exception.LiquibaseException;
 import liquibase.resource.ClassLoaderResourceAccessor;
 import liquibase.resource.ResourceAccessor;
+import liquibase.ui.LoggerUIService;
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
 import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
@@ -81,6 +82,7 @@ protected void baseLiquibaseInitialization() {
         final Map<String, Object> scopeValues = new HashMap<>();
         scopeValues.put(Scope.Attr.resourceAccessor.name(), new ClassLoaderResourceAccessor(this.getClass().getClassLoader()));
         scopeValues.put(Scope.Attr.classLoader.name(), this.getClass().getClassLoader());
+        scopeValues.put(Scope.Attr.ui.name(), new LoggerUIService());
         try {
             Scope.enter(scopeValues);
         } catch (Exception e) {

diff --git a/pom.xml b/pom.xml
@@ -137,7 +137,7 @@
         <freemarker.version>2.3.31</freemarker.version>
 
         <jetty9.version>${jetty92.version}</jetty9.version>
-        <liquibase.version>4.6.2</liquibase.version>
+        <liquibase.version>4.8.0</liquibase.version>
         <osgi.version>4.2.0</osgi.version>
         <pax.web.version>7.1.0</pax.web.version>
         <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>

diff --git a/...ycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java b/...ycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java
@@ -19,9 +19,13 @@
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.parsers.SAXParserFactory;
 
+import liquibase.Scope;
+import liquibase.ui.LoggerUIService;
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
 import org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProvider;
@@ -63,6 +67,16 @@ public LiquibaseConnectionProvider create(KeycloakSession session) {
     protected void baseLiquibaseInitialization(KeycloakSession session) {
         resourceAccessor = new ClassLoaderResourceAccessor(getClass().getClassLoader());
 
+        // initialize Liquibase using a custom scope
+        final Map<String, Object> scopeValues = new HashMap<>();
+        scopeValues.put(Scope.Attr.ui.name(), new LoggerUIService());
+        try {
+            Scope scope = Scope.getCurrentScope();
+            scope.enter(scopeValues);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to initialize Liquibase: " + e.getMessage(), e);
+        }
+
         // disables XML validation
         for (ChangeLogParser parser : ChangeLogParserFactory.getInstance().getParsers()) {
             if (parser instanceof XMLChangeLogSAXParser) {