Merge branch 'liferay:master' into master

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

@@ -1,4 +1,4 @@
-artifact.git.id=32e0f7e680262fbeccf99b7ea615069b1ea28e8e
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.24/com.liferay.gradle.plugins.defaults-10.0.24-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.24/com.liferay.gradle.plugins.defaults-10.0.24-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.24/com.liferay.gradle.plugins.defaults-10.0.24.jar
+artifact.git.id=ecd64b7813de4daf3bce014fe415bfa284c6da3a
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.25/com.liferay.gradle.plugins.defaults-10.0.25-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.25/com.liferay.gradle.plugins.defaults-10.0.25-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.25/com.liferay.gradle.plugins.defaults-10.0.25.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=03faaf7e500ba7adfa41796aeae008b255f58c95
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.poshi.runner/4.0.4/com.liferay.gradle.plugins.poshi.runner-4.0.4-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.poshi.runner/4.0.4/com.liferay.gradle.plugins.poshi.runner-4.0.4-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.poshi.runner/4.0.4/com.liferay.gradle.plugins.poshi.runner-4.0.4.jar
+artifact.git.id=ecc46746bc3bc4f75f2775ebf454f5d0aeabf1a4
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.poshi.runner/4.0.5/com.liferay.gradle.plugins.poshi.runner-4.0.5-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.poshi.runner/4.0.5/com.liferay.gradle.plugins.poshi.runner-4.0.5-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.poshi.runner/4.0.5/com.liferay.gradle.plugins.poshi.runner-4.0.5.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=bf71f4f29e92b5b271356aed2b364fbd062f3818
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.53/com.liferay.gradle.plugins.source.formatter-5.2.53-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.53/com.liferay.gradle.plugins.source.formatter-5.2.53-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.53/com.liferay.gradle.plugins.source.formatter-5.2.53.jar
+artifact.git.id=6cf377f4554d6376609e851d433b2df20dce78c9
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.54/com.liferay.gradle.plugins.source.formatter-5.2.54-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.54/com.liferay.gradle.plugins.source.formatter-5.2.54-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.54/com.liferay.gradle.plugins.source.formatter-5.2.54.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=0a5412f6a14f014149b396242662b4fb4f3bae50
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.0/com.liferay.gradle.plugins.workspace-9.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/9.0.0/com.liferay.gradle.plugins.workspace-9.0.0-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.0/com.liferay.gradle.plugins.workspace-9.0.0.jar
+artifact.git.id=f53380c23b09979bb3d9c1ef765ec9d907509b22
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.1/com.liferay.gradle.plugins.workspace-9.0.1-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.1/com.liferay.gradle.plugins.workspace-9.0.1-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.1/com.liferay.gradle.plugins.workspace-9.0.1.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=32e0f7e680262fbeccf99b7ea615069b1ea28e8e
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.179/com.liferay.gradle.plugins-14.0.179-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.179/com.liferay.gradle.plugins-14.0.179-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.179/com.liferay.gradle.plugins-14.0.179.jar
+artifact.git.id=ecd64b7813de4daf3bce014fe415bfa284c6da3a
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.180/com.liferay.gradle.plugins-14.0.180-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.180/com.liferay.gradle.plugins-14.0.180-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.180/com.liferay.gradle.plugins-14.0.180.jar

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

@@ -1,3 +1,3 @@
-artifact.git.id=34f0267e8987973b0413dfe57943e948eb9f9f68
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1254/com.liferay.jenkins.results.parser-1.0.1254-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1254/com.liferay.jenkins.results.parser-1.0.1254.jar
+artifact.git.id=6cf377f4554d6376609e851d433b2df20dce78c9
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1255/com.liferay.jenkins.results.parser-1.0.1255-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1255/com.liferay.jenkins.results.parser-1.0.1255.jar

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

@@ -1,5 +1,5 @@
-artifact.git.id=bf71f4f29e92b5b271356aed2b364fbd062f3818
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1339/com.liferay.source.formatter-1.0.1339-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1339/com.liferay.source.formatter-1.0.1339.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1339/com.liferay.source.formatter-1.0.1339.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1339/com.liferay.source.formatter-1.0.1339.zip
+artifact.git.id=6cf377f4554d6376609e851d433b2df20dce78c9
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1340/com.liferay.source.formatter-1.0.1340-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1340/com.liferay.source.formatter-1.0.1340.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1340/com.liferay.source.formatter-1.0.1340.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1340/com.liferay.source.formatter-1.0.1340.zip

modules/apps/fragment/fragment-web/src/test/java/com.liferay.fragment.web.internal/frontend.taglib.clay.servlet.taglib/BasicFragmentEntryVerticalCardTest.java

@@ -0,0 +1,166 @@
+/**
+ * SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
+ */
+
+package com.liferay.fragment.web.internal.frontend.taglib.clay.servlet.taglib;
+
+import com.liferay.fragment.model.FragmentEntry;
+import com.liferay.fragment.processor.FragmentEntryProcessorRegistry;
+import com.liferay.fragment.validator.FragmentEntryValidator;
+import com.liferay.frontend.taglib.clay.servlet.taglib.util.LabelItem;
+import com.liferay.portal.kernel.dao.search.RowChecker;
+import com.liferay.portal.kernel.language.Language;
+import com.liferay.portal.kernel.language.LanguageUtil;
+import com.liferay.portal.kernel.util.Portal;
+import com.liferay.portal.kernel.util.PortalUtil;
+import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import com.liferay.portal.test.rule.LiferayUnitTestRule;
+
+import java.util.List;
+
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.mockito.Mockito;
+
+/**
+ * @author Diego Hu
+ */
+public class BasicFragmentEntryVerticalCardTest {
+
+	@ClassRule
+	@Rule
+	public static final LiferayUnitTestRule liferayUnitTestRule =
+		LiferayUnitTestRule.INSTANCE;
+
+	@Before
+	public void setUp() {
+		_setUpLanguageUtil();
+		_setUpPortalUtil();
+	}
+
+	@Test
+	public void testGetLabelsForApprovedFragmentEntry() {
+		Mockito.when(
+			_fragmentEntry.isApproved()
+		).thenReturn(
+			true
+		);
+
+		Mockito.when(
+			_fragmentEntry.fetchDraftFragmentEntry()
+		).thenReturn(
+			Mockito.mock(FragmentEntry.class)
+		);
+
+		Assert.assertEquals(2, _getLabelsSize());
+
+		Mockito.when(
+			_fragmentEntry.isCacheable()
+		).thenReturn(
+			true
+		);
+
+		Assert.assertEquals(3, _getLabelsSize());
+	}
+
+	@Test
+	public void testGetLabelsWithoutWarnings() {
+		Mockito.when(
+			_fragmentEntry.getStatus()
+		).thenReturn(
+			WorkflowConstants.STATUS_DRAFT
+		);
+
+		Mockito.when(
+			_httpServletRequest.getAttribute(
+				FragmentEntryProcessorRegistry.class.getName())
+		).thenReturn(
+			Mockito.mock(FragmentEntryProcessorRegistry.class)
+		);
+
+		Mockito.when(
+			_httpServletRequest.getAttribute(
+				FragmentEntryValidator.class.getName())
+		).thenReturn(
+			Mockito.mock(FragmentEntryValidator.class)
+		);
+
+		Assert.assertEquals(1, _getLabelsSize());
+
+		Mockito.when(
+			_fragmentEntry.isCacheable()
+		).thenReturn(
+			true
+		);
+
+		Assert.assertEquals(2, _getLabelsSize());
+	}
+
+	@Test
+	public void testGetLabelsWithWarnings() {
+		Mockito.when(
+			_fragmentEntry.getStatus()
+		).thenReturn(
+			WorkflowConstants.STATUS_DRAFT
+		);
+
+		Assert.assertEquals(2, _getLabelsSize());
+
+		Mockito.when(
+			_fragmentEntry.isCacheable()
+		).thenReturn(
+			true
+		);
+
+		Assert.assertEquals(3, _getLabelsSize());
+	}
+
+	private int _getLabelsSize() {
+		RenderRequest renderRequest = Mockito.mock(RenderRequest.class);
+
+		Mockito.when(
+			PortalUtil.getHttpServletRequest(renderRequest)
+		).thenReturn(
+			_httpServletRequest
+		);
+
+		BasicFragmentEntryVerticalCard basicFragmentEntryVerticalCard =
+			new BasicFragmentEntryVerticalCard(
+				_fragmentEntry, renderRequest,
+				Mockito.mock(RenderResponse.class),
+				Mockito.mock(RowChecker.class));
+
+		List<LabelItem> labels = basicFragmentEntryVerticalCard.getLabels();
+
+		return labels.size();
+	}
+
+	private void _setUpLanguageUtil() {
+		LanguageUtil languageUtil = new LanguageUtil();
+
+		languageUtil.setLanguage(Mockito.mock(Language.class));
+	}
+
+	private void _setUpPortalUtil() {
+		PortalUtil portalUtil = new PortalUtil();
+
+		portalUtil.setPortal(_portal);
+	}
+
+	private final FragmentEntry _fragmentEntry = Mockito.mock(
+		FragmentEntry.class);
+	private final HttpServletRequest _httpServletRequest = Mockito.mock(
+		HttpServletRequest.class);
+	private final Portal _portal = Mockito.mock(Portal.class);
+
+}

modules/apps/oauth2-provider/oauth2-provider-service/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay OAuth2 Provider Service
 Bundle-SymbolicName: com.liferay.oauth2.provider.service
-Bundle-Version: 4.0.72
+Bundle-Version: 4.0.73
 Liferay-Require-SchemaVersion: 4.2.3
 Liferay-Service: true
 -dsannotations-options: inherit

modules/apps/object/object-test/build.gradle

@@ -1,4 +1,6 @@
 dependencies {
+	testCompileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
+
 	testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
 	testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
 	testIntegrationImplementation group: "org.apache.commons", name: "commons-lang3", version: "3.11"