LRCI-4167 CX & OSGi module list rename in playwright

learn-resources/data/plugins-admin-web.json

@@ -5,7 +5,7 @@
 			"url": "https://learn.liferay.com/w/dxp/system-administration/installing-and-managing-apps/managing-apps/configuring-portlets-themes-and-layout-templates"
 		},
 		"ja_JP": {
-			"message": "How can I configure permissions?",
+			"message": "権限の設定方法は？",
 			"url": "https://learn.liferay.com/ja/w/dxp/system-administration/installing-and-managing-apps/managing-apps/configuring-portlets-themes-and-layout-templates"
 		}
 	}

modules/.releng/sdk/gradle-plugins-defaults/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=ea27e403b2a2037d76d57b483a3a8ad150e488f5
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.152/com.liferay.gradle.plugins.defaults-10.1.152-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.152/com.liferay.gradle.plugins.defaults-10.1.152-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.152/com.liferay.gradle.plugins.defaults-10.1.152.jar
+artifact.git.id=be907fcf5251d8368d0ffbf93b25fa2e09a159aa
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.153/com.liferay.gradle.plugins.defaults-10.1.153-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.153/com.liferay.gradle.plugins.defaults-10.1.153-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.153/com.liferay.gradle.plugins.defaults-10.1.153.jar

modules/.releng/sdk/gradle-plugins-source-formatter/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=34be8b4753aebf852e6948e7fd505d1386498204
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.145/com.liferay.gradle.plugins.source.formatter-5.2.145-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.145/com.liferay.gradle.plugins.source.formatter-5.2.145-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.145/com.liferay.gradle.plugins.source.formatter-5.2.145.jar
+artifact.git.id=80be8dcea72da1e87ce412f52ffb6fdfb144dce9
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.146/com.liferay.gradle.plugins.source.formatter-5.2.146-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.146/com.liferay.gradle.plugins.source.formatter-5.2.146-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.146/com.liferay.gradle.plugins.source.formatter-5.2.146.jar

modules/.releng/sdk/gradle-plugins-workspace/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=fa3207ce37063753f01ba83fea8c2a0d957d8090
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/10.1.9/com.liferay.gradle.plugins.workspace-10.1.9-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/10.1.9/com.liferay.gradle.plugins.workspace-10.1.9-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/10.1.9/com.liferay.gradle.plugins.workspace-10.1.9.jar
+artifact.git.id=a2dc5ecdc84c2506802537c0f8de909d5cfeda06
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/11.0.0/com.liferay.gradle.plugins.workspace-11.0.0-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/11.0.0/com.liferay.gradle.plugins.workspace-11.0.0-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/11.0.0/com.liferay.gradle.plugins.workspace-11.0.0.jar

modules/.releng/sdk/gradle-plugins/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=ea27e403b2a2037d76d57b483a3a8ad150e488f5
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.65/com.liferay.gradle.plugins-15.0.65-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.65/com.liferay.gradle.plugins-15.0.65-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.65/com.liferay.gradle.plugins-15.0.65.jar
+artifact.git.id=be907fcf5251d8368d0ffbf93b25fa2e09a159aa
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.66/com.liferay.gradle.plugins-15.0.66-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.66/com.liferay.gradle.plugins-15.0.66-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.66/com.liferay.gradle.plugins-15.0.66.jar

modules/.releng/sdk/project-templates/project-templates-workspace/artifact.properties

@@ -1,3 +1,3 @@
-artifact.git.id=5c51ec16027a776174df70b84d35361e353e984d
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.232/com.liferay.project.templates.workspace-1.0.232-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.232/com.liferay.project.templates.workspace-1.0.232.jar
+artifact.git.id=1b43ba5a410de41037add984502209d4e21e320f
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.233/com.liferay.project.templates.workspace-1.0.233-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.233/com.liferay.project.templates.workspace-1.0.233.jar

modules/.releng/sdk/project-templates/project-templates/artifact.properties

@@ -1,6 +1,6 @@
-artifact.git.id=213bd35383da8c0530e8992a51ea9c7b4582baa9
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.298/com.liferay.project.templates-5.0.298-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.298/com.liferay.project.templates-5.0.298-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.298/com.liferay.project.templates-5.0.298.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.298/com.liferay.project.templates-5.0.298.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.298/com.liferay.project.templates-5.0.298.zip
+artifact.git.id=b7f7144753201db6324755dbd04ace085d32eb8e
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.299/com.liferay.project.templates-5.0.299-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.299/com.liferay.project.templates-5.0.299-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.299/com.liferay.project.templates-5.0.299.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.299/com.liferay.project.templates-5.0.299.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.299/com.liferay.project.templates-5.0.299.zip

modules/.releng/test/jenkins-results-parser/artifact.properties

@@ -1,3 +1,3 @@
-artifact.git.id=f5ac55df999da446239a1b39b3d80f28b2e94b47
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1439/com.liferay.jenkins.results.parser-1.0.1439-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1439/com.liferay.jenkins.results.parser-1.0.1439.jar
+artifact.git.id=13435bbf44043fa3b7366337a43672e412d7453b
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1441/com.liferay.jenkins.results.parser-1.0.1441-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1441/com.liferay.jenkins.results.parser-1.0.1441.jar

modules/.releng/util/source-formatter/artifact.properties

@@ -1,5 +1,5 @@
-artifact.git.id=34be8b4753aebf852e6948e7fd505d1386498204
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1428/com.liferay.source.formatter-1.0.1428-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1428/com.liferay.source.formatter-1.0.1428.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1428/com.liferay.source.formatter-1.0.1428.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1428/com.liferay.source.formatter-1.0.1428.zip
+artifact.git.id=80be8dcea72da1e87ce412f52ffb6fdfb144dce9
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1429/com.liferay.source.formatter-1.0.1429-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1429/com.liferay.source.formatter-1.0.1429.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1429/com.liferay.source.formatter-1.0.1429.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1429/com.liferay.source.formatter-1.0.1429.zip

modules/apps/analytics/analytics-batch-export-import-impl/src/main/java/com/liferay/analytics/batch/exportimport/internal/odata/entity/AccountEntryAnalyticsDXPEntityEntityModel.java

@@ -21,15 +21,15 @@ public class AccountEntryAnalyticsDXPEntityEntityModel implements EntityModel {
 
 	public AccountEntryAnalyticsDXPEntityEntityModel() {
 		_entityFieldsMap = EntityModel.toEntityFieldsMap(
-			new StringEntityField(
-				"accountGroupIds", locale -> "accountGroupIds"),
 			new DateTimeEntityField(
 				"modifiedDate",
 				locale -> Field.getSortableFieldName(Field.MODIFIED_DATE),
 				locale -> Field.MODIFIED_DATE),
 			new IntegerEntityField(
 				Field.getSortableFieldName(Field.MODIFIED_DATE),
-				locale -> Field.getSortableFieldName(Field.MODIFIED_DATE)));
+				locale -> Field.getSortableFieldName(Field.MODIFIED_DATE)),
+			new StringEntityField(
+				"accountGroupIds", locale -> "accountGroupIds"));
 	}
 
 	@Override

modules/apps/batch-engine/batch-engine-test/src/testIntegration/java/com/liferay/batch/engine/internal/test/BaseBatchEngineTaskExecutorTest.java

@@ -126,12 +126,12 @@ public static class BlogPostingEntityModel implements EntityModel {
 
 		public BlogPostingEntityModel() {
 			_entityFieldsMap = EntityModel.toEntityFieldsMap(
-				new CollectionEntityField(
-					new StringEntityField(
-						"keywords", locale -> "assetTagNames.lowercase")),
 				new CollectionEntityField(
 					new IntegerEntityField(
 						"taxonomyCategoryIds", locale -> "assetCategoryIds")),
+				new CollectionEntityField(
+					new StringEntityField(
+						"keywords", locale -> "assetTagNames.lowercase")),
 				new DateTimeEntityField(
 					"dateCreated",
 					locale -> Field.getSortableFieldName(Field.CREATE_DATE),

modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/upgrade/v4_2_1/CalendarBookingUpgradeProcess.java

@@ -35,14 +35,14 @@ protected void doUpgrade() throws Exception {
 				connection.prepareStatement(
 					SQLTransformer.transform(
 						StringBundler.concat(
-							"select calendarBookingId, companyId, userId, ",
-							"startTime, endTime from CalendarBooking where ",
-							"allDay = [$TRUE$]")));
+							"select ctCollectionId, calendarBookingId, ",
+							"companyId, userId, startTime, endTime from ",
+							"CalendarBooking where allDay = [$TRUE$]")));
 			PreparedStatement updatePreparedStatement =
 				AutoBatchPreparedStatementUtil.autoBatch(
 					connection,
 					"update CalendarBooking set startTime = ?, endTime = ? " +
-						"where calendarBookingId = ?");
+						"where ctCollectionId = ? and calendarBookingId = ?");
 			ResultSet resultSet = selectPreparedStatement.executeQuery()) {
 
 			while (resultSet.next()) {
@@ -93,7 +93,9 @@ protected void doUpgrade() throws Exception {
 					2, endTimeUTCJCalendar.getTimeInMillis());
 
 				updatePreparedStatement.setLong(
-					3, resultSet.getLong("calendarBookingId"));
+					3, resultSet.getLong("ctCollectionId"));
+				updatePreparedStatement.setLong(
+					4, resultSet.getLong("calendarBookingId"));
 
 				updatePreparedStatement.addBatch();
 			}

modules/apps/calendar/calendar-test-util/bnd.bnd

@@ -1,4 +1,4 @@
 Bundle-Name: Liferay Calendar Test Utilities
 Bundle-SymbolicName: com.liferay.calendar.test.util
-Bundle-Version: 6.0.4
+Bundle-Version: 6.1.0
 Export-Package: com.liferay.calendar.test.util

modules/apps/calendar/calendar-test-util/src/main/java/com/liferay/calendar/test/util/CalendarBookingTestUtil.java

@@ -15,10 +15,15 @@
 import com.liferay.calendar.service.CalendarBookingLocalServiceUtil;
 import com.liferay.calendar.util.CalendarResourceUtil;
 import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.model.Group;
 import com.liferay.portal.kernel.model.User;
 import com.liferay.portal.kernel.service.ServiceContext;
 import com.liferay.portal.kernel.service.UserLocalServiceUtil;
+import com.liferay.portal.kernel.test.util.GroupTestUtil;
 import com.liferay.portal.kernel.test.util.RandomTestUtil;
+import com.liferay.portal.kernel.test.util.ServiceContextTestUtil;
+import com.liferay.portal.kernel.test.util.UserTestUtil;
+import com.liferay.portal.kernel.util.CalendarFactoryUtil;
 import com.liferay.portal.kernel.util.Time;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
 import com.liferay.portal.kernel.workflow.WorkflowThreadLocal;
@@ -32,6 +37,25 @@
  */
 public class CalendarBookingTestUtil {
 
+	public static CalendarBooking addAllDayCalendarBooking(String timeZoneId)
+		throws Exception {
+
+		Group group = GroupTestUtil.addGroup();
+
+		User user = UserTestUtil.addUser(group.getGroupId());
+
+		user.setTimeZoneId(timeZoneId);
+
+		user = UserLocalServiceUtil.updateUser(user);
+
+		return addAllDayCalendarBooking(
+			user, CalendarTestUtil.addCalendar(group),
+			getCalendarTimeInMillis(1, 0, 0),
+			getCalendarTimeInMillis(1, 23, 59),
+			ServiceContextTestUtil.getServiceContext(
+				group.getGroupId(), user.getUserId()));
+	}
+
 	public static CalendarBooking addAllDayCalendarBooking(
 			User user, Calendar calendar, long startTime, long endTime,
 			ServiceContext serviceContext)
@@ -413,6 +437,13 @@ public static ServiceContext createServiceContext(User user) {
 		return serviceContext;
 	}
 
+	public static long getCalendarTimeInMillis(int day, int hour, int minute) {
+		java.util.Calendar jCalendar = CalendarFactoryUtil.getCalendar(
+			2022, java.util.Calendar.JANUARY, day, hour, minute);
+
+		return jCalendar.getTimeInMillis();
+	}
+
 	public static CalendarBooking getChildCalendarBooking(
 		CalendarBooking calendarBooking) {
 

modules/apps/calendar/calendar-test-util/src/main/resources/com/liferay/calendar/test/util/packageinfo

@@ -1 +1 @@
-version 4.0.0
+version 4.1.0