LPD-38542 Move upgrade to head as some customers might skip it due to…

… BPR-7796
matyaswollner · Oct 9, 2024 · f20b09f · f20b09f
1 parent 8fb761c
commit f20b09f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
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
@@ -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
diff --git a/...eray/dynamic/data/mapping/internal/upgrade/registry/DDMServiceUpgradeStepRegistrator.java b/...eray/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/..._5_2/DDMFieldAttributeUpgradeProcess.java → ..._6_1/DDMFieldAttributeUpgradeProcess.java b/..._5_2/DDMFieldAttributeUpgradeProcess.java → ..._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/.../DDMFieldAttributeUpgradeProcessTest.java → .../DDMFieldAttributeUpgradeProcessTest.java b/.../DDMFieldAttributeUpgradeProcessTest.java → .../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(