diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index b791893628e7e..c41ec27e17071 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -158,7 +158,7 @@
1.0.10
8.5.13
1.0.11
- 4.13.0
+ 4.14.0
1.30
6.0.0
4.6.1
diff --git a/docs/src/main/asciidoc/liquibase-mongodb.adoc b/docs/src/main/asciidoc/liquibase-mongodb.adoc
index 78dc1beb65c3e..6c426827f780f 100644
--- a/docs/src/main/asciidoc/liquibase-mongodb.adoc
+++ b/docs/src/main/asciidoc/liquibase-mongodb.adoc
@@ -97,7 +97,7 @@ YAML, JSON and XML formats are supported for the changeLog.
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
- xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
diff --git a/docs/src/main/asciidoc/liquibase.adoc b/docs/src/main/asciidoc/liquibase.adoc
index 6f1f6525f8c0e..d7119945791ce 100644
--- a/docs/src/main/asciidoc/liquibase.adoc
+++ b/docs/src/main/asciidoc/liquibase.adoc
@@ -106,7 +106,7 @@ The yaml, json, xml and sql changeLog file formats are also supported.
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
http://www.liquibase.org/xml/ns/dbchangelog
- https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+ https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseMongodbProcessor.java b/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseMongodbProcessor.java
index 4cbd8f3a464cc..a703644297d49 100644
--- a/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseMongodbProcessor.java
+++ b/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseMongodbProcessor.java
@@ -5,6 +5,7 @@
import java.io.IOException;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -96,11 +97,12 @@ void nativeImageConfiguration(
liquibase.database.jvm.JdbcConnection.class.getName()));
reflective.produce(new ReflectiveClassBuildItem(true, true, true,
- liquibase.parser.ChangeLogParserCofiguration.class.getName(),
+ liquibase.parser.ChangeLogParserConfiguration.class.getName(),
liquibase.hub.HubServiceFactory.class.getName(),
liquibase.logging.core.DefaultLoggerConfiguration.class.getName(),
+ // deprecated, but still used by liquibase.nosql.lockservice.AbstractNoSqlLockService
liquibase.configuration.GlobalConfiguration.class.getName(),
- com.datical.liquibase.ext.config.LiquibaseProConfiguration.class.getName(),
+ liquibase.GlobalConfiguration.class.getName(),
liquibase.license.LicenseServiceFactory.class.getName(),
liquibase.executor.ExecutorService.class.getName(),
liquibase.change.ChangeFactory.class.getName(),
@@ -136,7 +138,6 @@ void nativeImageConfiguration(
Stream.of(liquibase.change.Change.class,
liquibase.changelog.ChangeLogHistoryService.class,
- liquibase.command.LiquibaseCommand.class,
liquibase.database.Database.class,
liquibase.database.DatabaseConnection.class,
liquibase.datatype.LiquibaseDataType.class,
@@ -163,6 +164,10 @@ void nativeImageConfiguration(
// Register Precondition services, and the implementation class for reflection while also registering fields for reflection
addService(services, reflective, liquibase.precondition.Precondition.class, true);
+ // CommandStep implementations are needed (just like in non-mongodb variant)
+ addService(services, reflective, liquibase.command.CommandStep.class, false,
+ "liquibase.command.core.StartH2CommandStep");
+
// liquibase XSD
resource.produce(new NativeImageResourceBuildItem(
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.7.xsd",
@@ -172,14 +177,9 @@ void nativeImageConfiguration(
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.11.xsd",
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.12.xsd",
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.13.xsd",
+ "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.14.xsd",
+ "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd",
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.7.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.8.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.9.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.10.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.11.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.12.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.13.xsd",
"liquibase.build.properties"));
// liquibase resource bundles
@@ -188,11 +188,15 @@ void nativeImageConfiguration(
private void addService(BuildProducer services,
BuildProducer reflective, Class serviceClass,
- boolean shouldRegisterFieldForReflection) {
+ boolean shouldRegisterFieldForReflection, String... excludedImpls) {
try {
String service = "META-INF/services/" + serviceClass.getName();
Set implementations = ServiceUtil.classNamesNamedIn(Thread.currentThread().getContextClassLoader(),
service);
+ if (excludedImpls.length > 0) {
+ implementations = new HashSet<>(implementations);
+ implementations.removeAll(Arrays.asList(excludedImpls));
+ }
services.produce(new ServiceProviderBuildItem(serviceClass.getName(), implementations.toArray(new String[0])));
reflective.produce(new ReflectiveClassBuildItem(true, true, shouldRegisterFieldForReflection,
diff --git a/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java b/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java
index 95d969115f70f..88075fd790835 100644
--- a/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java
+++ b/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java
@@ -1,6 +1,7 @@
package io.quarkus.liquibase.deployment;
import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+import static java.util.function.Predicate.not;
import java.io.IOException;
import java.nio.file.Paths;
@@ -119,11 +120,10 @@ void nativeImageConfiguration(
liquibase.command.CommandFactory.class.getName()));
reflective.produce(new ReflectiveClassBuildItem(true, true, true,
- liquibase.parser.ChangeLogParserCofiguration.class.getName(),
+ liquibase.parser.ChangeLogParserConfiguration.class.getName(),
liquibase.hub.HubServiceFactory.class.getName(),
liquibase.logging.core.DefaultLoggerConfiguration.class.getName(),
- liquibase.configuration.GlobalConfiguration.class.getName(),
- com.datical.liquibase.ext.config.LiquibaseProConfiguration.class.getName(),
+ liquibase.GlobalConfiguration.class.getName(),
liquibase.license.LicenseServiceFactory.class.getName(),
liquibase.executor.ExecutorService.class.getName(),
liquibase.change.ChangeFactory.class.getName(),
@@ -154,7 +154,7 @@ void nativeImageConfiguration(
new ReflectiveClassBuildItem(true, true, true, classesMarkedWithDatabaseChangeProperty.toArray(new String[0])));
Collection dataSourceNames = jdbcDataSourceBuildItems.stream()
- .map(i -> i.getName())
+ .map(JdbcDataSourceBuildItem::getName)
.collect(Collectors.toSet());
resource.produce(
@@ -162,7 +162,6 @@ void nativeImageConfiguration(
Stream.of(liquibase.change.Change.class,
liquibase.changelog.ChangeLogHistoryService.class,
- liquibase.command.LiquibaseCommand.class,
liquibase.database.Database.class,
liquibase.database.DatabaseConnection.class,
liquibase.datatype.LiquibaseDataType.class,
@@ -198,9 +197,12 @@ void nativeImageConfiguration(
// CommandStep implementations are needed
consumeService(liquibase.command.CommandStep.class, (serviceClass, implementations) -> {
- services.produce(new ServiceProviderBuildItem(serviceClass.getName(), implementations.toArray(new String[0])));
- reflective.produce(new ReflectiveClassBuildItem(true, false, false, implementations.toArray(new String[0])));
- for (String implementation : implementations) {
+ var filteredImpls = implementations.stream()
+ .filter(not("liquibase.command.core.StartH2CommandStep"::equals))
+ .toArray(String[]::new);
+ services.produce(new ServiceProviderBuildItem(serviceClass.getName(), filteredImpls));
+ reflective.produce(new ReflectiveClassBuildItem(true, false, false, filteredImpls));
+ for (String implementation : filteredImpls) {
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem(implementation));
}
});
@@ -214,14 +216,9 @@ void nativeImageConfiguration(
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.11.xsd",
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.12.xsd",
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.13.xsd",
+ "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.14.xsd",
+ "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd",
"www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.7.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.8.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.9.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.10.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.11.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.12.xsd",
- "www.liquibase.org/xml/ns/pro/liquibase-pro-4.13.xsd",
"liquibase.build.properties"));
// liquibase resource bundles
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java
index 7853dcea6b193..0ba07915816af 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java
@@ -15,8 +15,7 @@
import io.quarkus.liquibase.runtime.LiquibaseConfig;
import io.quarkus.liquibase.runtime.LiquibaseDataSourceBuildTimeConfig;
-import liquibase.configuration.GlobalConfiguration;
-import liquibase.configuration.LiquibaseConfiguration;
+import liquibase.GlobalConfiguration;
/**
* This fixture provides access to read the expected and the actual configuration of liquibase.
@@ -51,15 +50,16 @@ public void assertDefaultConfigurationSettings(LiquibaseConfig configuration) {
assertEquals(configuration.changeLog, LiquibaseDataSourceBuildTimeConfig.defaultConfig().changeLog);
- GlobalConfiguration globalConfiguration = LiquibaseConfiguration.getInstance()
- .getConfiguration(GlobalConfiguration.class);
assertEquals(configuration.databaseChangeLogTableName,
- globalConfiguration.getDatabaseChangeLogTableName());
+ GlobalConfiguration.DATABASECHANGELOG_TABLE_NAME.getCurrentValue());
assertEquals(configuration.databaseChangeLogLockTableName,
- globalConfiguration.getDatabaseChangeLogLockTableName());
- assertEquals(configuration.liquibaseTablespaceName.orElse(null), globalConfiguration.getLiquibaseTablespaceName());
- assertEquals(configuration.liquibaseCatalogName.orElse(null), globalConfiguration.getLiquibaseCatalogName());
- assertEquals(configuration.liquibaseSchemaName.orElse(null), globalConfiguration.getLiquibaseSchemaName());
+ GlobalConfiguration.DATABASECHANGELOGLOCK_TABLE_NAME.getCurrentValue());
+ assertEquals(configuration.liquibaseTablespaceName.orElse(null),
+ GlobalConfiguration.LIQUIBASE_TABLESPACE_NAME.getCurrentValue());
+ assertEquals(configuration.liquibaseCatalogName.orElse(null),
+ GlobalConfiguration.LIQUIBASE_CATALOG_NAME.getCurrentValue());
+ assertEquals(configuration.liquibaseSchemaName.orElse(null),
+ GlobalConfiguration.LIQUIBASE_SCHEMA_NAME.getCurrentValue());
}
diff --git a/extensions/liquibase/deployment/src/test/resources/db/all/changeLog.xml b/extensions/liquibase/deployment/src/test/resources/db/all/changeLog.xml
index c3dfc74f8e052..8fc05da2beee5 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/all/changeLog.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/all/changeLog.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
http://www.liquibase.org/xml/ns/dbchangelog
- https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+ https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml b/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml
index 81e1b479f6445..9f558728d39f7 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/deployment/src/test/resources/db/inventory/changeLog.xml b/extensions/liquibase/deployment/src/test/resources/db/inventory/changeLog.xml
index d6111469592b3..fe6d4463d71a3 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/inventory/changeLog.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/inventory/changeLog.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/deployment/src/test/resources/db/users/changeLog.xml b/extensions/liquibase/deployment/src/test/resources/db/users/changeLog.xml
index d6111469592b3..fe6d4463d71a3 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/users/changeLog.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/users/changeLog.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml b/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml
index 653a3813911a8..c634ed5ed686b 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml
@@ -2,7 +2,7 @@
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
- https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+ https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/deployment/src/test/resources/db/xml/create-tables.xml b/extensions/liquibase/deployment/src/test/resources/db/xml/create-tables.xml
index fa380295af5f5..b5603786ef5ca 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/xml/create-tables.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/xml/create-tables.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/deployment/src/test/resources/db/xml/create-views.xml b/extensions/liquibase/deployment/src/test/resources/db/xml/create-views.xml
index 27e20abb6a56c..040b291853028 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/xml/create-views.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/xml/create-views.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/deployment/src/test/resources/db/xml/test/test.xml b/extensions/liquibase/deployment/src/test/resources/db/xml/test/test.xml
index 5fee4dc5842af..57882a24e1c7b 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/xml/test/test.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/xml/test/test.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteEnvironmentValueProvider.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteEnvironmentValueProvider.java
deleted file mode 100644
index c5be0d75980fd..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteEnvironmentValueProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.quarkus.liquibase.runtime.graal;
-
-import java.util.Map;
-
-import com.oracle.svm.core.annotate.Delete;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-@TargetClass(className = "liquibase.configuration.pro.EnvironmentValueProvider")
-final class SubstituteEnvironmentValueProvider {
-
- @Delete
- private Map environment;
-
- @Substitute
- protected Map getMap() {
- return System.getenv();
- }
-
-}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStartH2CommandStep.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStartH2CommandStep.java
deleted file mode 100644
index ef9212d4a2fa9..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStartH2CommandStep.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.quarkus.liquibase.runtime.graal;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-import liquibase.command.CommandResultsBuilder;
-
-@TargetClass(className = "liquibase.command.core.StartH2CommandStep")
-final class SubstituteStartH2CommandStep {
-
- @Substitute
- public void run(CommandResultsBuilder builder) {
- throw new UnsupportedOperationException("Starting h2 is not supported by quarkus-liquibase");
- }
-}
diff --git a/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml b/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml
index 39c2287db95cd..7be4d34eb7f8a 100644
--- a/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml
+++ b/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml
@@ -2,7 +2,7 @@
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
- xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
diff --git a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java
index c08d0effabe3a..4c09bbc46f0a4 100644
--- a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java
+++ b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java
@@ -13,8 +13,7 @@
import liquibase.Liquibase;
import liquibase.changelog.ChangeSet;
import liquibase.changelog.ChangeSetStatus;
-import liquibase.command.CommandFactory;
-import liquibase.command.core.DropAllCommand;
+import liquibase.command.CommandScope;
@Path("/")
public class LiquibaseFunctionalityResource {
@@ -25,7 +24,7 @@ public class LiquibaseFunctionalityResource {
@GET
@Path("update")
public String doUpdateAuto() {
- assertCommandFactoryResolvesProperly();
+ assertCommandScopeResolvesProperly();
try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
liquibase.update(liquibaseFactory.createContexts(), liquibaseFactory.createLabels());
@@ -43,11 +42,11 @@ public String doUpdateAuto() {
}
}
- private void assertCommandFactoryResolvesProperly() {
+ private void assertCommandScopeResolvesProperly() {
try {
- DropAllCommand dropAll = (DropAllCommand) CommandFactory.getInstance().getCommand("dropAll");
+ new CommandScope("dropAll");
} catch (Exception e) {
- throw new RuntimeException("Unable to load 'dropAll' command from Liquibase's CommandFactory", e);
+ throw new RuntimeException("Unable to load 'dropAll' via Liquibase's CommandScope", e);
}
}
diff --git a/integration-tests/liquibase/src/main/resources/db/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/changeLog.xml
index 15b0d18cc7f53..cc34ccd0c22c9 100644
--- a/integration-tests/liquibase/src/main/resources/db/changeLog.xml
+++ b/integration-tests/liquibase/src/main/resources/db/changeLog.xml
@@ -2,7 +2,7 @@
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
- https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+ https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/complex-schema/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/complex-schema/changeLog.xml
index 5fbe1cfb51f16..9eb0a231ffab8 100644
--- a/integration-tests/liquibase/src/main/resources/db/complex-schema/changeLog.xml
+++ b/integration-tests/liquibase/src/main/resources/db/complex-schema/changeLog.xml
@@ -3,7 +3,7 @@
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/update/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/update/changeLog.xml
index d56c5ee0bf373..b753cf8d98ca1 100644
--- a/integration-tests/liquibase/src/main/resources/db/update/changeLog.xml
+++ b/integration-tests/liquibase/src/main/resources/db/update/changeLog.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml
index 2eb678c95fa5c..a0276c45aea2e 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml
@@ -2,7 +2,7 @@
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
- https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+ https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml b/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml
index 72434ed3b9f81..b76c6d37338b9 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/create-views.xml b/integration-tests/liquibase/src/main/resources/db/xml/create-views.xml
index f6783b801526e..61c404205718c 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/create-views.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/create-views.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test1.xml b/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test1.xml
index f1530fa1b996d..07231edc5ca6d 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test1.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test1.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test2.xml b/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test2.xml
index e1ccdbd000a80..cf7564a484c8a 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test2.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/includeAll/test2.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/test/test.xml b/integration-tests/liquibase/src/main/resources/db/xml/test/test.xml
index 5fee4dc5842af..57882a24e1c7b 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/test/test.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/test/test.xml
@@ -2,7 +2,7 @@
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">