Merge branch 'liferay:master' into master

build-common.xml

@@ -758,6 +758,7 @@ information.
 		<attribute default="true" name="setupbinariescache" />
 		<attribute default="true" name="stacktrace" />
 		<attribute name="task" />
+		<attribute default="" name="test.name" />
 		<element implicit="true" name="args" optional="true" />
 
 		<sequential>
@@ -920,6 +921,13 @@ information.
 
 					<local name="${redirector.error.property}" />
 					<local name="${redirector.output.property}" />
+					<local name="test.name" />
+
+					<condition property="test.name" value="@{test.name}">
+						<not>
+							<equals arg1="@{test.name}" arg2="" />
+						</not>
+					</condition>
 
 					<trycatch>
 						<try>
@@ -950,6 +958,8 @@ information.
 								<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.dirs=${build.patcher.hotfix.dirs}" />
 								<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.qualifier=${build.patcher.hotfix.qualifier}" />
 								<arg line="@{task}" />
+								<arg if:set="test.name" value="--tests" />
+								<arg if:set="test.name" value="${test.name}" />
 								<redirector errorproperty="${redirector.error.property}" outputproperty="${redirector.output.property}" unless:blank="${redirector.output.property}" />
 							</exec>
 						</try>
@@ -986,6 +996,8 @@ information.
 									<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.dirs=${build.patcher.hotfix.dirs}" />
 									<arg if:set="env.FIX_PACKS_RELEASE_ENVIRONMENT" value="-Dpatcher.hotfix.qualifier=${build.patcher.hotfix.qualifier}" />
 									<arg line="@{task}" />
+									<arg if:set="test.name" value="--tests" />
+									<arg if:set="test.name" value="${test.name}" />
 									<redirector errorproperty="${redirector.error.property}" outputproperty="${redirector.output.property}" unless:blank="${redirector.output.property}" />
 								</exec>
 							</echoxml>

build-test-batch.xml

@@ -725,6 +725,103 @@ mariadb.executable=${mariadb.executable}]]></echo>
 		</sequential>
 	</macrodef>
 
+	<macrodef name="get-test-project-information">
+		<attribute default="" name="test.class" />
+
+		<sequential>
+			<var name="test.name" unset="true" />
+			<var name="test.project.name" unset="true" />
+
+			<local name="test.class.file" />
+			<local name="test.class.file.path" />
+			<local name="test.class.java" />
+
+			<propertyregex
+				casesensitive="false"
+				input="@{test.class}"
+				property="test.class.java"
+				regexp=".class"
+				replace=".java"
+			/>
+
+			<first id="test.class.file">
+				<fileset
+					dir="modules"
+					includes="**/${test.class.java}"
+				/>
+			</first>
+
+			<property name="test.class.file.path" value="${toString:test.class.file}" />
+
+			<beanshell>
+				<![CDATA[
+					import com.liferay.jenkins.results.parser.JenkinsResultsParserUtil;
+
+					import java.util.Properties;
+					import java.util.regex.Matcher;
+					import java.util.regex.Pattern;
+
+					public static File getBndFile(File file) {
+						if (file == null) {
+							return null;
+						}
+
+						File canonicalFile = JenkinsResultsParserUtil.getCanonicalFile(file);
+
+						File parentFile = canonicalFile.getParentFile();
+
+						if ((parentFile == null) || !parentFile.exists()) {
+							return file;
+						}
+
+						if (!canonicalFile.isDirectory()) {
+							return getBndFile(parentFile);
+						}
+
+						File bndFile = new File(canonicalFile, "bnd.bnd");
+
+						if (!bndFile.exists()) {
+							return getBndFile(parentFile);
+						}
+
+						return bndFile;
+					}
+
+					public static String getTestName(String testClassFilePath) {
+						Pattern pattern = Pattern.compile("/([^/]+)\\.java");
+
+						Matcher matcher = pattern.matcher(testClassFilePath);
+
+						if (matcher.find()) {
+							return matcher.group(1);
+						}
+
+						return null;
+					}
+
+					public static String getTestProjectName(File bndFile) {
+						Properties bndFileProperties = JenkinsResultsParserUtil.getProperties(new File[] {bndFile});
+
+						String bundleSymbolicName = bndFileProperties.getProperty("Bundle-SymbolicName");
+
+						File modulesPropertiesFile = new File(project.getProperty("project.dir") + "/modules/modules.properties");
+
+						Properties modulesProperties = JenkinsResultsParserUtil.getProperties(new File[] {modulesPropertiesFile});
+
+						return modulesProperties.getProperty("project.name[" + bundleSymbolicName + "]");
+					}
+
+					String testClassFilePath = project.getProperty("test.class.file.path");
+
+					File bndFile = getBndFile(new File(testClassFilePath));
+
+					project.setProperty("test.name", getTestName(testClassFilePath));
+					project.setProperty("test.project.name", getTestProjectName(bndFile));
+				]]>
+			</beanshell>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="merge-test-results">
 		<sequential>
 			<antcall target="merge-test-results" />
@@ -2409,11 +2506,17 @@ log.sanitizer.enabled=false</echo>
 
 							<lstopwatch action="start" name="test.execution.duration" />
 
-							<gradle-execute dir="modules" refreshdependencies="@{refreshdependencies}" task="testIntegration">
-								<arg value="--continue" />
-								<arg value="-Dbuild.exclude.ant.plugin=true" />
-								<arg value="-Dtest.class.group.index=${axis.variable}" />
-							</gradle-execute>
+							<for list="${test.class.group}" param="test.class">
+								<sequential>
+									<get-test-project-information test.class="@{test.class}" />
+
+									<gradle-execute dir="modules" refreshdependencies="@{refreshdependencies}" task="${test.project.name}:testIntegration" test.name="${test.name}">
+										<arg value="--continue" />
+										<arg value="-Dbuild.exclude.ant.plugin=true" />
+										<arg value="-Dtest.class.group.index=${axis.variable}" />
+									</gradle-execute>
+								</sequential>
+							</for>
 
 							<lstopwatch action="total" name="test.execution.duration" />
 
@@ -6842,14 +6945,20 @@ information. Make sure to commit in all format-javadoc results.
 					</then>
 				</if>
 
-				<gradle-execute dir="modules" task="test">
-					<arg value="--continue" />
-					<arg value="-Dbuild.exclude.ant.plugin=true" />
-					<arg if:true="${run.solr.unit.tests}" value="-Dcom.liferay.portal.search.solr8.test.unit.started=true" />
-					<arg value="-Djunit.code.coverage=${test.batch.code.coverage}" />
-					<arg if:set="project.templates.test.builds" value="-Dproject.templates.test.builds=${project.templates.test.builds}" />
-					<arg value="-Dtest.class.group.index=${axis.variable}" />
-				</gradle-execute>
+				<for list="${test.class.group}" param="test.class">
+					<sequential>
+						<get-test-project-information test.class="@{test.class}" />
+
+						<gradle-execute dir="modules" task="${test.project.name}:test" test.name="${test.name}">
+							<arg value="--continue" />
+							<arg value="-Dbuild.exclude.ant.plugin=true" />
+							<arg if:true="${run.solr.unit.tests}" value="-Dcom.liferay.portal.search.solr8.test.unit.started=true" />
+							<arg value="-Djunit.code.coverage=${test.batch.code.coverage}" />
+							<arg if:set="project.templates.test.builds" value="-Dproject.templates.test.builds=${project.templates.test.builds}" />
+							<arg value="-Dtest.class.group.index=${axis.variable}" />
+						</gradle-execute>
+					</sequential>
+				</for>
 
 				<lstopwatch action="total" name="test.execution.duration" />
 			</test-action>

lib/development/dependencies.properties

@@ -27,7 +27,7 @@ dtdparser=com.liferay:com.wutka.dtd:1.20
 dumbster=com.liferay:com.dumbster.smtp:02856255a6cc7f
 error-prone-ant=com.google.errorprone:error_prone_ant:1.0.8
 freemarker=com.liferay:org.freemarker:2.3.29.LIFERAY-PATCHED-4
-guava=com.google.guava:guava:30.1.1-jre
+guava=com.google.guava:guava:32.0.1-jre
 hamcrest-core=org.hamcrest:hamcrest-core:1.3
 hamcrest-library=org.hamcrest:hamcrest-library:1.3
 hsql=org.hsqldb:hsqldb:2.7.1:jdk8

lib/versions-ext.xml

@@ -332,7 +332,7 @@
 			</library>
 			<library>
 				<file-name>lib/development/guava.jar</file-name>
-				<version>30.1.1-jre</version>
+				<version>32.0.1-jre</version>
 				<project-name>Guava</project-name>
 				<project-url>https://opensource.google.com/projects/guava</project-url>
 				<licenses>

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

@@ -1,4 +1,4 @@
-artifact.git.id=f2df47d1aaaf0dd40e1bf58db5f110f84fdf599d
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.9/com.liferay.gradle.plugins.defaults-10.0.9-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.9/com.liferay.gradle.plugins.defaults-10.0.9-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.9/com.liferay.gradle.plugins.defaults-10.0.9.jar
+artifact.git.id=8754c883c32e6a8bb9db249236b708f0dd106194
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.10/com.liferay.gradle.plugins.defaults-10.0.10-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.10/com.liferay.gradle.plugins.defaults-10.0.10-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.10/com.liferay.gradle.plugins.defaults-10.0.10.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=ca79d686f4079e6c7b2f1cb9b9ec2b8f1b4da67a
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.0/com.liferay.gradle.plugins.workspace-8.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/8.0.0/com.liferay.gradle.plugins.workspace-8.0.0-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.0/com.liferay.gradle.plugins.workspace-8.0.0.jar
+artifact.git.id=1e61faedf0215c6a5620a08b90540ea02e66d6f4
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.1/com.liferay.gradle.plugins.workspace-8.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/8.0.1/com.liferay.gradle.plugins.workspace-8.0.1-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.1/com.liferay.gradle.plugins.workspace-8.0.1.jar

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

@@ -1,6 +1,6 @@
-artifact.git.id=fe87c4efade03443e1164c4596c45974de14e154
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252.zip
+artifact.git.id=8ba20570a44cc4964f037c3c8deb81aa8ccce6c6
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.253/com.liferay.project.templates-5.0.253-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.253/com.liferay.project.templates-5.0.253-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.253/com.liferay.project.templates-5.0.253.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.253/com.liferay.project.templates-5.0.253.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.253/com.liferay.project.templates-5.0.253.zip

modules/.releng/util/css-builder/artifact.properties

@@ -1,7 +1,6 @@
-artifact.git.id=aa2e3ce36e47313ec5803eea8b5c4efd848e6002
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.2/com.liferay.css.builder-3.1.2-javadoc.jar
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.2/com.liferay.css.builder-3.1.2-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.2/com.liferay.css.builder-3.1.2-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.2/com.liferay.css.builder-3.1.2.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.2/com.liferay.css.builder-3.1.2.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.2/com.liferay.css.builder-3.1.2.zip
+artifact.git.id=8ba20570a44cc4964f037c3c8deb81aa8ccce6c6
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.3/com.liferay.css.builder-3.1.3-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.3/com.liferay.css.builder-3.1.3-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.3/com.liferay.css.builder-3.1.3.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.3/com.liferay.css.builder-3.1.3.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.css.builder/3.1.3/com.liferay.css.builder-3.1.3.zip

modules/.releng/util/portal-tools-bundle-support/artifact.properties

@@ -1,7 +1,6 @@
-artifact.git.id=e8576d0e2c24e550b2ecfa47e57537fb6851c1e1
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.3/com.liferay.portal.tools.bundle.support-3.7.3-javadoc.jar
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.3/com.liferay.portal.tools.bundle.support-3.7.3-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.3/com.liferay.portal.tools.bundle.support-3.7.3-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.3/com.liferay.portal.tools.bundle.support-3.7.3.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.3/com.liferay.portal.tools.bundle.support-3.7.3.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.3/com.liferay.portal.tools.bundle.support-3.7.3.zip
+artifact.git.id=8ba20570a44cc4964f037c3c8deb81aa8ccce6c6
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.4/com.liferay.portal.tools.bundle.support-3.7.4-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.4/com.liferay.portal.tools.bundle.support-3.7.4-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.4/com.liferay.portal.tools.bundle.support-3.7.4.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.4/com.liferay.portal.tools.bundle.support-3.7.4.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.bundle.support/3.7.4/com.liferay.portal.tools.bundle.support-3.7.4.zip

modules/apps/accessibility/accessibility-test/src/testFunctional/macros/AccessibilityMenu.macro

@@ -64,7 +64,7 @@ definition {
 			value1 = "\TAB");
 
 		KeyPress(
-			key_link = "Accessibility Menu",
+			key_link = "Open Accessibility Menu",
 			locator1 = "AccessibilityMenu#QUICK_LINK",
 			value1 = "\ENTER");
 	}

modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/layout/list/retriever/AssetEntryListLayoutListRetriever.java

@@ -116,28 +116,6 @@ public InfoPage<?> getInfoPage(
 				_getKeywords(layoutListRetrieverContext), StringPool.BLANK));
 	}
 
-	@Override
-	public List<Object> getList(
-		ClassedModelListObjectReference classedModelListObjectReference,
-		LayoutListRetrieverContext layoutListRetrieverContext) {
-
-		InfoPage<?> infoPage = getInfoPage(
-			classedModelListObjectReference, layoutListRetrieverContext);
-
-		return (List<Object>)infoPage.getPageItems();
-	}
-
-	@Override
-	public int getListCount(
-		ClassedModelListObjectReference classedModelListObjectReference,
-		LayoutListRetrieverContext layoutListRetrieverContext) {
-
-		InfoPage<?> infoPage = getInfoPage(
-			classedModelListObjectReference, layoutListRetrieverContext);
-
-		return infoPage.getTotalCount();
-	}
-
 	@Override
 	public List<InfoFilter> getSupportedInfoFilters(
 		ClassedModelListObjectReference classedModelListObjectReference) {

modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/KeywordResourceImpl.java

@@ -18,9 +18,9 @@
 import com.liferay.bulk.selection.BulkSelectionRunner;
 import com.liferay.portal.kernel.change.tracking.CTAware;
 import com.liferay.portal.kernel.security.permission.ActionKeys;
-import com.liferay.portal.kernel.security.permission.BaseModelPermissionCheckerUtil;
 import com.liferay.portal.kernel.security.permission.PermissionChecker;
 import com.liferay.portal.kernel.security.permission.PermissionCheckerFactoryUtil;
+import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermissionUtil;
 import com.liferay.portal.kernel.util.HashMapBuilder;
 import com.liferay.portal.vulcan.pagination.Page;
 
@@ -90,7 +90,7 @@ private Set<String> _getAssetTagNames(
 
 		assetEntryBulkSelection.forEach(
 			assetEntry -> {
-				if (BaseModelPermissionCheckerUtil.containsBaseModelPermission(
+				if (ModelResourcePermissionUtil.contains(
 						permissionChecker, assetEntry.getGroupId(),
 						assetEntry.getClassName(), assetEntry.getClassPK(),
 						ActionKeys.UPDATE)) {