diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/aot/FlowableCommonRuntimeHints.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/aot/FlowableCommonRuntimeHints.java index 05eb7abefe1..9ae661eeb8d 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/aot/FlowableCommonRuntimeHints.java +++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/aot/FlowableCommonRuntimeHints.java @@ -26,8 +26,6 @@ public class FlowableCommonRuntimeHints implements RuntimeHintsRegistrar { @Override public void registerHints(RuntimeHints hints, ClassLoader classLoader) { ResourceHints resourceHints = hints.resources(); - resourceHints.registerPattern("META-INF/services/liquibase.hub.HubService"); - resourceHints.registerPattern("META-INF/services/liquibase.license.LicenseService"); resourceHints.registerResourceBundle("org.flowable.common.engine.impl.de.odysseus.el.misc.LocalStrings"); // If we can detect which DB is being used we can perhaps register only the appropriate DB file resourceHints.registerPattern("org/flowable/common/db/properties/*.properties"); diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/FlowableLiquibaseHubService.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/FlowableLiquibaseHubService.java deleted file mode 100644 index 066cfd10954..00000000000 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/FlowableLiquibaseHubService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.flowable.common.engine.impl.db; - -import liquibase.hub.core.MockHubService; - -/** - * This is a special implementation of the Liquibase {@link liquibase.hub.HubService} - * which is automatically disabled. - * - * @author Filip Hrisafov - */ -public class FlowableLiquibaseHubService extends MockHubService { - - public FlowableLiquibaseHubService() { - this.online = false; - } - -} diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/FlowableLiquibaseLicenseService.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/FlowableLiquibaseLicenseService.java deleted file mode 100644 index 1ad00b78c5c..00000000000 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/FlowableLiquibaseLicenseService.java +++ /dev/null @@ -1,68 +0,0 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.flowable.common.engine.impl.db; - -import liquibase.license.LicenseInstallResult; -import liquibase.license.LicenseService; -import liquibase.license.Location; - -/** - * A special Liquibase {@link LicenseService} that always returns {@code false} for the license check. - * This is there to support only using the Community Features of the Liquibase license in the scope of the Flowable Liquibase usage. - * - * @author Filip Hrisafov - */ -public class FlowableLiquibaseLicenseService implements LicenseService { - - @Override - public int getPriority() { - return PRIORITY_SPECIALIZED; - } - - @Override - public boolean licenseIsInstalled() { - return false; - } - - @Override - public boolean licenseIsValid(String subject) { - // The license is never valid - return false; - } - - @Override - public String getLicenseInfo() { - return "Temporary License Service by Flowable that works without jaxb-api. This license service is only value for the community edition of Liquibase"; - } - - @Override - public LicenseInstallResult installLicense(Location... locations) { - throw new UnsupportedOperationException("Installing licenses not supported"); - } - - @Override - public void disable() { - - } - - @Override - public boolean licenseIsAboutToExpire() { - return true; - } - - @Override - public int daysTilExpiration() { - // The license is always expired - return -1; - } -} diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseBasedSchemaManager.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseBasedSchemaManager.java index a61d27c5eeb..68654fbd9a2 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseBasedSchemaManager.java +++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseBasedSchemaManager.java @@ -42,16 +42,12 @@ */ public abstract class LiquibaseBasedSchemaManager implements SchemaManager { - private static final String LIQUIBASE_HUB_SERVICE_CLASS_NAME = "liquibase.hub.HubService"; protected static final Map LIQUIBASE_SCOPE_VALUES = new HashMap<>(); static { - if (ClassUtils.isPresent(LIQUIBASE_HUB_SERVICE_CLASS_NAME, null)) { - LIQUIBASE_SCOPE_VALUES.put("liquibase.plugin." + LIQUIBASE_HUB_SERVICE_CLASS_NAME, FlowableLiquibaseHubService.class); - LoggerUIService uiService = new LoggerUIService(); - uiService.setStandardLogLevel(Level.FINE); - LIQUIBASE_SCOPE_VALUES.put(Scope.Attr.ui.name(), uiService); - } + LoggerUIService uiService = new LoggerUIService(); + uiService.setStandardLogLevel(Level.FINE); + LIQUIBASE_SCOPE_VALUES.put(Scope.Attr.ui.name(), uiService); } protected final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/modules/flowable-engine-common/src/main/resources/META-INF/services/liquibase.hub.HubService b/modules/flowable-engine-common/src/main/resources/META-INF/services/liquibase.hub.HubService deleted file mode 100644 index a6c1b179281..00000000000 --- a/modules/flowable-engine-common/src/main/resources/META-INF/services/liquibase.hub.HubService +++ /dev/null @@ -1 +0,0 @@ -org.flowable.common.engine.impl.db.FlowableLiquibaseHubService diff --git a/modules/flowable-engine-common/src/main/resources/META-INF/services/liquibase.license.LicenseService b/modules/flowable-engine-common/src/main/resources/META-INF/services/liquibase.license.LicenseService deleted file mode 100644 index ab4f69194f9..00000000000 --- a/modules/flowable-engine-common/src/main/resources/META-INF/services/liquibase.license.LicenseService +++ /dev/null @@ -1 +0,0 @@ -org.flowable.common.engine.impl.db.FlowableLiquibaseLicenseService diff --git a/pom.xml b/pom.xml index 7b9aa064b33..d65b6d4e5ab 100644 --- a/pom.xml +++ b/pom.xml @@ -372,12 +372,28 @@ org.liquibase liquibase-core - 4.21.1 + 4.24.0 + javax.xml.bind jaxb-api + + com.opencsv + opencsv + + + org.yaml + snakeyaml + + + org.apache.commons + * +