diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/bnd.bnd b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/bnd.bnd index ff5c8d63573f96..25014e718f117d 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/bnd.bnd +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/bnd.bnd @@ -40,6 +40,6 @@ Import-Package:\ org.tukaani.*;resolution:=optional,\ \ * -Liferay-Require-SchemaVersion: 5.5.2 +Liferay-Require-SchemaVersion: 5.6.1 Liferay-Service: true -dsannotations-options: inherit \ No newline at end of file diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/registry/DDMServiceUpgradeStepRegistrator.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/registry/DDMServiceUpgradeStepRegistrator.java index 860ad3a94a997f..ee72c7cc1185a5 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/registry/DDMServiceUpgradeStepRegistrator.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/registry/DDMServiceUpgradeStepRegistrator.java @@ -570,8 +570,16 @@ protected String[] getTableNames() { "5.4.4", "5.4.5", new DDMTemplateLinkUpgradeProcess(_classNameLocalService)); + registry.register("5.4.5", "5.5.0", new DummyUpgradeStep()); + + registry.register( + "5.5.0", "5.5.1", + new com.liferay.dynamic.data.mapping.internal.upgrade.v5_5_1. + DDMFieldUpgradeProcess(), + new DDMFieldAttributeUpgradeProcess()); + registry.register( - "5.4.5", "5.5.0", + "5.5.1", "5.6.0", new BaseExternalReferenceCodeUpgradeProcess() { @Override @@ -582,14 +590,8 @@ protected String[][] getTableAndPrimaryKeyColumnNames() { }); registry.register( - "5.5.0", "5.5.1", - new com.liferay.dynamic.data.mapping.internal.upgrade.v5_5_1. - DDMFieldUpgradeProcess(), - new DDMFieldAttributeUpgradeProcess()); - - registry.register( - "5.5.1", "5.5.2", - new com.liferay.dynamic.data.mapping.internal.upgrade.v5_5_2. + "5.6.0", "5.6.1", + new com.liferay.dynamic.data.mapping.internal.upgrade.v5_6_1. DDMFieldAttributeUpgradeProcess( _classNameLocalService, _dlFileEntryLocalService, _fileEntryFriendlyURLResolver, _groupLocalService, diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_5_2/DDMFieldAttributeUpgradeProcess.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_6_1/DDMFieldAttributeUpgradeProcess.java similarity index 99% rename from modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_5_2/DDMFieldAttributeUpgradeProcess.java rename to modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_6_1/DDMFieldAttributeUpgradeProcess.java index bc5dd612165bcf..d803c4a7f96f96 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_5_2/DDMFieldAttributeUpgradeProcess.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_6_1/DDMFieldAttributeUpgradeProcess.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06 */ -package com.liferay.dynamic.data.mapping.internal.upgrade.v5_5_2; +package com.liferay.dynamic.data.mapping.internal.upgrade.v5_6_1; import com.liferay.adaptive.media.image.html.constants.AMImageHTMLConstants; import com.liferay.document.library.kernel.exception.NoSuchFileEntryException; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_5_2/test/DDMFieldAttributeUpgradeProcessTest.java b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_6_1/test/DDMFieldAttributeUpgradeProcessTest.java similarity index 97% rename from modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_5_2/test/DDMFieldAttributeUpgradeProcessTest.java rename to modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_6_1/test/DDMFieldAttributeUpgradeProcessTest.java index 3061e080ba2d88..f1e8ca68c9af4a 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_5_2/test/DDMFieldAttributeUpgradeProcessTest.java +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-test/src/testIntegration/java/com/liferay/dynamic/data/mapping/internal/upgrade/v5_6_1/test/DDMFieldAttributeUpgradeProcessTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06 */ -package com.liferay.dynamic.data.mapping.internal.upgrade.v5_5_2.test; +package com.liferay.dynamic.data.mapping.internal.upgrade.v5_6_1.test; import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian; import com.liferay.document.library.kernel.model.DLFileEntry; @@ -121,7 +121,7 @@ private void _runUpgrade() throws Exception { } private static final String _CLASS_NAME = - "com.liferay.dynamic.data.mapping.internal.upgrade.v5_5_2." + + "com.liferay.dynamic.data.mapping.internal.upgrade.v5_6_1." + "DDMFieldAttributeUpgradeProcess"; @Inject(