Merge branch 'liferay:master' into master

liferay-frontend · Aug 16, 2023 · aa7506c · aa7506c
2 parents 491000e + f43ab18
commit aa7506c
Show file tree

Hide file tree

Showing 264 changed files with 3,575 additions and 711 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -931,14 +931,29 @@ information.
 
 					<trycatch>
 						<try>
-							<if>
-								<not>
-									<equals arg1="${gradle.executable.task}" arg2="" />
-								</not>
-								<then>
-									<echo>Executing Gradle task: ${gradle.executable.task}</echo>
-								</then>
-							</if>
+							<beanshell>
+								<![CDATA[
+									StringBuilder sb = new StringBuilder();
+
+									String gradleExecutableTask = project.getProperty("gradle.executable.task");
+
+									if ((gradleExecutableTask != null) && !gradleExecutableTask.isEmpty()) {
+										sb.append("Executing Gradle task: ");
+										sb.append(gradleExecutableTask);
+									}
+
+									String testName = project.getProperty("test.name");
+
+									if ((testName != null) && !testName.isEmpty()) {
+										sb.append(" --tests ");
+										sb.append(testName);
+									}
+
+									if (sb.length() > 0) {
+										System.out.println(sb.toString());
+									}
+								]]>
+							</beanshell>
 
 							<exec dir="@{dir}" executable="${project.dir}/gradlew${gradlew.suffix}" failonerror="@{failonerror}">
 								<args />

diff --git a/build-test-batch.xml b/build-test-batch.xml
@@ -731,6 +731,7 @@ mariadb.executable=${mariadb.executable}]]></echo>
 		<sequential>
 			<var name="test.name" unset="true" />
 			<var name="test.project.name" unset="true" />
+			<var name="test.project.results.dir" unset="true" />
 
 			<local name="test.class.file" />
 			<local name="test.class.file.path" />
@@ -811,12 +812,21 @@ mariadb.executable=${mariadb.executable}]]></echo>
 						return modulesProperties.getProperty("project.name[" + bundleSymbolicName + "]");
 					}
 
+					public static String getTestProjectResultsDir(File bndFile) {
+						String testProjectName = getTestProjectName(bndFile);
+
+						File testProjectResultsDir = new File(project.getProperty("project.dir") + "/modules/" + testProjectName.replaceAll(":", "/") + "/test-results/");
+
+						return JenkinsResultsParserUtil.getCanonicalPath(testProjectResultsDir);
+					}
+
 					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));
+					project.setProperty("test.project.results.dir", getTestProjectResultsDir(bndFile));
 				]]>
 			</beanshell>
 		</sequential>
@@ -2508,13 +2518,29 @@ log.sanitizer.enabled=false</echo>
 
 							<for list="${test.class.group}" param="test.class">
 								<sequential>
-									<get-test-project-information test.class="@{test.class}" />
+									<trycatch property="test.failure.message">
+										<try>
+											<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>
+											<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>
+
+											<move
+												todir="modules/test-results"
+											>
+												<fileset
+													dir="${test.project.results.dir}"
+													includes="**/TEST-*.xml"
+												/>
+											</move>
+										</try>
+										<catch>
+											<echo>${test.failure.message}</echo>
+										</catch>
+									</trycatch>
 								</sequential>
 							</for>
 
@@ -3417,7 +3443,7 @@ information. Make sure to commit in all build-lib-versions results.
 			<test-set-up>
 				<setup-test-environment />
 
-				<prepare-database-upgrade-configuration />
+				<prepare-database-upgrade-properties />
 			</test-set-up>
 		</run-batch-test>
 	</target>
@@ -6947,16 +6973,32 @@ information. Make sure to commit in all format-javadoc results.
 
 				<for list="${test.class.group}" param="test.class">
 					<sequential>
-						<get-test-project-information test.class="@{test.class}" />
+						<trycatch property="test.failure.message">
+							<try>
+								<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>
 
-						<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>
+								<move
+									todir="modules/test-results"
+								>
+									<fileset
+										dir="${test.project.results.dir}"
+										includes="**/TEST-*.xml"
+									/>
+								</move>
+							</try>
+							<catch>
+								<echo>${test.failure.message}</echo>
+							</catch>
+						</trycatch>
 					</sequential>
 				</for>
 

diff --git a/build-test.xml b/build-test.xml
@@ -2781,7 +2781,7 @@ sendPasswordCaptchaEnabled=&quot;false&quot;</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="prepare-database-upgrade-configuration">
+	<macrodef name="prepare-database-upgrade-properties">
 		<sequential>
 			<delete file="${liferay.home}/tools/portal-tools-db-upgrade-client/logs/upgrade.log" />
 
@@ -11173,8 +11173,8 @@ ${update.properties}</echo>
 		<prepare-azure-store-configuration />
 	</target>
 
-	<target name="prepare-database-upgrade-configuration">
-		<prepare-database-upgrade-configuration />
+	<target name="prepare-database-upgrade-properties">
+		<prepare-database-upgrade-properties />
 	</target>
 
 	<target name="prepare-encryption-PCKS12-certificate">
@@ -11619,6 +11619,17 @@ cluster.link.channel.properties.transport.0=${project.dir}/portal-web/test/funct
 			</then>
 		</if>
 
+		<get-testcase-property property.name="database.auto.upgrade.enabled" />
+
+		<if>
+			<equals arg1="${database.auto.upgrade.enabled}" arg2="true" />
+			<then>
+				<echo append="true" file="portal-impl/src/portal-ext.properties">
+
+upgrade.database.auto.run=true</echo>
+			</then>
+		</if>
+
 		<get-testcase-property property.name="custom.properties" />
 
 		<if>
@@ -16079,6 +16090,15 @@ mail.send.blacklist=</echo>
 			</then>
 		</if>
 
+		<get-testcase-property property.name="database.upgrade.enabled" />
+
+		<if>
+			<equals arg1="${database.upgrade.enabled}" arg2="true" />
+			<then>
+				<prepare-database-upgrade-properties />
+			</then>
+		</if>
+
 		<get-testcase-property property.name="analytics.cloud.enabled" />
 
 		<if>
@@ -16610,7 +16630,7 @@ mail.send.blacklist=</echo>
 	</target>
 
 	<target name="upgrade-legacy-database">
-		<prepare-database-upgrade-configuration />
+		<prepare-database-upgrade-properties />
 
 		<get-java-jdk-bundle-version test.batch.name="${test.batch.name}" />
 

diff --git a/copyright.txt b/copyright.txt
@@ -1,4 +1,4 @@
 /**
- * SPDX-FileCopyrightText: (c) {$year} Liferay, Inc. https://liferay.com
+ * 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
  */
diff --git a/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties b/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties
@@ -1,4 +1,4 @@
-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
+artifact.git.id=10e33c48d8e0fb7b41fa57cda0b95f9366da84aa
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.2/com.liferay.gradle.plugins.workspace-8.0.2-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.2/com.liferay.gradle.plugins.workspace-8.0.2-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.2/com.liferay.gradle.plugins.workspace-8.0.2.jar
diff --git a/modules/.releng/test/poshi/poshi-core/artifact.properties b/modules/.releng/test/poshi/poshi-core/artifact.properties
@@ -1,3 +1,3 @@
-artifact.git.id=ad479acab6c48b4c9f533566f6fe1204b06f8e2d
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.135/com.liferay.poshi.core-1.0.135-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.135/com.liferay.poshi.core-1.0.135.jar
+artifact.git.id=e07466535b9086e3092cb1beb120297710143548
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.136/com.liferay.poshi.core-1.0.136-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.136/com.liferay.poshi.core-1.0.136.jar
diff --git a/modules/.releng/test/poshi/poshi-runner/artifact.properties b/modules/.releng/test/poshi/poshi-runner/artifact.properties
@@ -1,3 +1,3 @@
-artifact.git.id=ad479acab6c48b4c9f533566f6fe1204b06f8e2d
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.457/com.liferay.poshi.runner-1.0.457-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.457/com.liferay.poshi.runner-1.0.457.jar
+artifact.git.id=e07466535b9086e3092cb1beb120297710143548
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.458/com.liferay.poshi.runner-1.0.458-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.458/com.liferay.poshi.runner-1.0.458.jar
diff --git a/modules/apps/account/account-test/src/testFunctional/tests/AccountUpgrade.testcase b/modules/apps/account/account-test/src/testFunctional/tests/AccountUpgrade.testcase
@@ -4,6 +4,7 @@ definition {
 	property database.types = "db2,mariadb,mysql,oracle,postgresql,sqlserver,sybase";
 	property portal.release = "true";
 	property portal.upstream = "true";
+	property test.liferay.virtual.instance = "false";
 	property testray.component.names = "Account";
 	property testray.main.component.name = "Upgrades User and System Management";
 
@@ -23,7 +24,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "mariadb,mysql,postgresql";
 		property portal.version = "6.2.5";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -54,7 +54,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "mariadb,mysql,postgresql";
 		property portal.version = "7.0.4";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -85,7 +84,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "mariadb,mysql,postgresql";
 		property portal.version = "7.1.3";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -116,7 +114,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "mariadb,mysql,postgresql";
 		property portal.version = "7.2.0";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -147,7 +144,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "mariadb,mysql,postgresql";
 		property portal.version = "7.3.0";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -177,7 +173,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "mariadb,mysql,postgresql";
 		property portal.version = "7.4.0";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -208,7 +203,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "7.1.10";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -239,7 +233,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "7.2.10";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -270,7 +263,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "7.3.10";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -300,7 +292,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "7.4.13";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -331,7 +322,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "7.0.10.6";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -362,7 +352,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "7.1.10.3";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -393,7 +382,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "6.2.10.15";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(
@@ -424,7 +412,6 @@ definition {
 		property data.archive.type = "data-archive-portal";
 		property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 		property portal.version = "6.2.10.21";
-		property test.liferay.virtual.instance = "false";
 
 		task ("Add and view a business account after upgrade") {
 			ValidateUsersUpgrade.addAndViewBusinessAccount(

diff --git a/modules/apps/calendar/calendar-web-test/src/testFunctional/tests/CalendarUpgrade.testcase b/modules/apps/calendar/calendar-web-test/src/testFunctional/tests/CalendarUpgrade.testcase
@@ -3,6 +3,7 @@ definition {
 
 	property database.types = "db2,mariadb,mysql,oracle,postgresql,sybase";
 	property portal.release = "true";
+	property test.liferay.virtual.instance = "false";
 	property testray.component.names = "Calendar";
 	property testray.main.component.name = "Upgrades Calendar";
 

diff --git a/modules/apps/commerce/commerce-product-api/bnd.bnd b/modules/apps/commerce/commerce-product-api/bnd.bnd
@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Commerce Product API
 Bundle-SymbolicName: com.liferay.commerce.product.api
-Bundle-Version: 72.1.1
+Bundle-Version: 72.2.0
 Export-Package:\
 	com.liferay.commerce.product.availability,\
 	com.liferay.commerce.product.catalog,\

diff --git a/...mmerce-product-api/src/main/java/com/liferay/commerce/product/model/CPDefinitionLink.java b/...mmerce-product-api/src/main/java/com/liferay/commerce/product/model/CPDefinitionLink.java
@@ -55,4 +55,6 @@ public Class<CPDefinitionLink> getTypeClass() {
 
 	public CProduct getCProduct();
 
+	public String getCProductName();
+
 }