7.3.7 GA8 release

liferay · Jun 24, 2021 · 4381c10 · 4381c10
1 parent 3cc3500
commit 4381c10
Show file tree

Hide file tree

Showing 11,466 changed files with 349,903 additions and 124,568 deletions.
diff --git a/app.server.properties b/app.server.properties
@@ -83,7 +83,7 @@
 ## Tomcat
 ##
 
-    app.server.tomcat.version=9.0.40
+    app.server.tomcat.version=9.0.43
     app.server.tomcat.dir=${app.server.parent.dir}/tomcat-${app.server.tomcat.version}
     app.server.tomcat.bin.dir=${app.server.tomcat.dir}/bin
     app.server.tomcat.classes.global.dir=${app.server.tomcat.dir}/lib
@@ -200,7 +200,7 @@
 ##
 
     app.server.wildfly.version=14.0.0
-    app.server.wildfly.supported.versions=14.0.0,16.0.0,17.0.0
+    app.server.wildfly.supported.versions=14.0.0,16.0.0,17.0.0,22.0.0
     app.server.wildfly.dir=${app.server.parent.dir}/wildfly-${app.server.wildfly.version}
     app.server.wildfly.bin.dir=${app.server.wildfly.dir}/bin
     app.server.wildfly.classes.global.dir=${app.server.wildfly.dir}/modules/com/liferay/portal/main

diff --git a/build-common.xml b/build-common.xml
@@ -359,6 +359,7 @@ information.
 				<arg value="log" />
 				<arg value="--format=%s" />
 				<arg value="${latest.artifact.git.id}..HEAD" />
+				<arg value=":(exclude)test" />
 				<arg value="." />
 			</exec>
 

diff --git a/build-dist.xml b/build-dist.xml
@@ -186,7 +186,7 @@
 		</exec>
 
 		<echo file="${lp.plugins.dir}/hooks/liferay-language-${locale.current}-hook/docroot/WEB-INF/liferay-hook.xml"><![CDATA[<?xml version="1.0"?>
-<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.1.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_1_0.dtd">
+<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 7.3.0//EN" "http://www.liferay.com/dtd/liferay-hook_7_3_0.dtd">
 
 <hook>
 	<language-properties>content/Language-ext_${locale.current}.properties</language-properties>

diff --git a/build-test-analytics-cloud.xml b/build-test-analytics-cloud.xml
@@ -3,10 +3,12 @@
 <project basedir="." name="portal-test-analytics-cloud" xmlns:antelope="antlib:ise.antelope.tasks">
 	<import file="build-test.xml" />
 
-	<macrodef name="start-analytics-cloud">
+	<macrodef name="create-analytics-cloud-docker-compose">
 		<sequential>
 			<fail message="Please set the property ${env.DOCKER_ENABLED}." unless="env.DOCKER_ENABLED" />
 
+			<delete file="${analytics.cloud.asah.dir}/docker-compose.test.yml" />
+
 			<copy
 				file="${analytics.cloud.asah.dir}/docker-compose.yml"
 				tofile="${analytics.cloud.asah.dir}/docker-compose.test.yml"
@@ -34,8 +36,14 @@
 
 			<replaceregexp
 				file="${analytics.cloud.docker.test.yaml}"
-				match="\&quot;9090:9090\&quot;"
-				replace="&quot;${analytics.cloud.asah.prometheus.port}:9090&quot;"
+				match="http://\{service\}:8080"
+				replace="http://{service}:${analytics.cloud.faro.dxp.port}"
+			/>
+
+			<replaceregexp
+				file="${analytics.cloud.docker.test.yaml}"
+				match="\&quot;9090:8080\&quot;"
+				replace="&quot;${analytics.cloud.asah.trino.port}:8080&quot;"
 			/>
 
 			<replaceregexp
@@ -46,9 +54,14 @@
 
 			<replaceregexp
 				file="${analytics.cloud.docker.test.yaml}"
-				flags="g"
-				match="1536m"
-				replace="2048m"
+				match="http://wedeploy-elasticsearch:9200"
+				replace="http://wedeploy-elasticsearch:${analytics.cloud.asah.elasticsearch.port}"
+			/>
+
+			<replaceregexp
+				file="${analytics.cloud.docker.test.yaml}"
+				match="\&quot;9200:9200\&quot;"
+				replace="&quot;${analytics.cloud.asah.elasticsearch.port}:9200&quot;"
 			/>
 
 			<local name="short.hostname" />
@@ -71,6 +84,16 @@ networks:
             name: ${short.hostname}]]></echo>
 				</then>
 			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="start-analytics-cloud">
+		<sequential>
+			<fail message="Please set the property ${env.DOCKER_ENABLED}." unless="env.DOCKER_ENABLED" />
+
+			<create-analytics-cloud-docker-compose />
+
+			<property location="${analytics.cloud.asah.dir}/docker-compose.test.yml" name="analytics.cloud.docker.test.yaml" />
 
 			<replaceregexp
 				file="${analytics.cloud.faro.dir}/build-ext.gradle"
@@ -97,7 +120,8 @@ networks:
 			/>
 
 			<echo file="${analytics.cloud.asah.dir}/local.env">OSB_ASAH_BACKEND_URL=${analytics.cloud.asah.backend.url}
-OSB_ASAH_PUBLISHER_URL=${analytics.cloud.asah.publisher.url}</echo>
+OSB_ASAH_PUBLISHER_URL=${analytics.cloud.asah.publisher.url}
+OSB_FARO_FRONTEND_URL=${analytics.cloud.faro.frontend.url}</echo>
 
 			<if>
 				<equals arg1="${analytics.cloud.asah.build}" arg2="true" />
@@ -165,6 +189,8 @@ OSB_ASAH_PUBLISHER_URL=${analytics.cloud.asah.publisher.url}</echo>
 		<sequential>
 			<fail message="Please set the property ${env.DOCKER_ENABLED}." unless="env.DOCKER_ENABLED" />
 
+			<create-analytics-cloud-docker-compose />
+
 			<property location="${analytics.cloud.asah.dir}/docker-compose.test.yml" name="analytics.cloud.docker.test.yaml" />
 
 			<execute dir="${analytics.cloud.asah.dir}">
@@ -180,6 +206,8 @@ OSB_ASAH_PUBLISHER_URL=${analytics.cloud.asah.publisher.url}</echo>
 	</macrodef>
 
 	<target name="start-analytics-cloud">
+		<stop-analytics-cloud />
+
 		<start-analytics-cloud />
 	</target>
 

diff --git a/build-test-authentication.xml b/build-test-authentication.xml
@@ -32,6 +32,12 @@
 
 			<delete dir="${app.server.deploy.dir}/cas-web.war" />
 
+			<echo file="${app.server.deploy.dir}/cas-web/META-INF/context.xml"><![CDATA[<Context>
+	<JarScanner>
+		<JarScanFilter className="com.liferay.support.tomcat.util.scan.LiferayJarScanFilter" pluggabilityScan="*" pluggabilitySkip="" tldScan="*" tldSkip="" />
+	</JarScanner>
+</Context>]]></echo>
+
 			<replace
 				file="${app.server.deploy.dir}/cas-web/WEB-INF/deployerConfigContext.xml"
 			>

diff --git a/build-test-batch.xml b/build-test-batch.xml
@@ -408,6 +408,17 @@ mariadb.executable=${mariadb.executable}]]></echo>
 								</then>
 							</if>
 
+							<get-browser-property property.name="browser.docker.image" />
+
+							<if>
+								<isset property="browser.docker.image" />
+								<then>
+									<stop-docker-browser />
+
+									<start-docker-browser />
+								</then>
+							</if>
+
 							<antcall inheritall="false" target="copy-optional-jars">
 								<param name="database.type" value="@{database.type}" />
 								<param name="todir" value="lib/development" />
@@ -437,6 +448,15 @@ mariadb.executable=${mariadb.executable}]]></echo>
 								</then>
 							</if>
 
+							<get-browser-property property.name="browser.docker.image" />
+
+							<if>
+								<isset property="browser.docker.image" />
+								<then>
+									<stop-docker-browser />
+								</then>
+							</if>
+
 							<get-operating-system-property property.name="operating.system.docker.image" />
 
 							<if>
@@ -549,7 +569,6 @@ mariadb.executable=${mariadb.executable}]]></echo>
 			<beanshell>
 				<![CDATA[
 					import org.apache.commons.io.FileUtils;
-
 					import org.apache.commons.lang.StringUtils;
 
 					String projectDir = project.getProperty("project.dir");
@@ -942,17 +961,29 @@ mariadb.executable=${mariadb.executable}]]></echo>
 	</macrodef>
 
 	<macrodef name="prepare-suite-search-engine">
-		<attribute name="suite.name" />
-
 		<sequential>
-			<propertycopy from="search.engine[@{suite.name}]" name="suite.search.engine" silent="true" />
+			<propertycopy from="search.engine[${env.CI_TEST_SUITE}]" name="suite.search.engine" silent="true" />
+
+			<if>
+				<contains string="${suite.search.engine}" substring="remote-elasticsearch7" />
+				<then>
+					<ant antfile="build-test-elasticsearch7.xml" target="start-elasticsearch" />
+				</then>
+			</if>
 
 			<if>
 				<equals arg1="${suite.search.engine}" arg2="solr" />
 				<then>
-					<property name="com.liferay.portal.search.solr8.test.unit.started" value="true" />
+					<ant antfile="build-test-solr.xml" target="start-solr" />
 
-					<ant antfile="build-test-solr.xml" target="set-up-solr" />
+					<property name="test.batch.name" unless:set="test.batch.name" value="${env.TEST_BATCH_NAME}" />
+
+					<if>
+						<contains string="${test.batch.name}" substring="unit" />
+						<then>
+							<property name="run.solr.unit.tests" value="true" />
+						</then>
+					</if>
 				</then>
 			</if>
 		</sequential>
@@ -1414,10 +1445,10 @@ app.server.type=@{app.server.type}]]></echo>
 
 					<lstopwatch action="total" name="run.batch.test.tear.down" />
 
-					<print-gc-logs
-						tomcat.gc.log="@{tomcat.gc.log}"
-						tsant.gc.log="@{tsant.gc.log}"
-					/>
+					<antcall target="print-gc-logs">
+						<param name="tomcat.gc.log" value="@{tomcat.gc.log}" />
+						<param name="tsant.gc.log" value="@{tsant.gc.log}" />
+					</antcall>
 				</finally>
 			</trycatch>
 
@@ -1687,6 +1718,12 @@ app.server.type=@{app.server.type}]]></echo>
 
 								<ant dir="portal-kernel" inheritAll="false" target="install-portal-snapshot" />
 
+								<gradle-execute dir="${project.dir}/modules/apps/petra" task="deploy">
+									<arg value="--parallel" />
+									<arg value="-Dportal.build=true" />
+									<arg value="-Pforced.deploy.dir=${project.dir}/tmp/lib-pre" />
+								</gradle-execute>
+
 								<ant dir="portal-test" inheritAll="false" target="jar" />
 
 								<local name="artifact.version" />
@@ -2805,7 +2842,11 @@ log.sanitizer.enabled=false</echo>
 
 							<setup-test-batch-testable-tomcat test.portal.bundle.version="@{test.portal.bundle.version}" />
 
-							<antcall inheritAll="false" target="start-app-server-preserve-liferay-home" />
+							<get-test-batch-app-server-start-executable-arg-line />
+
+							<antcall inheritAll="false" target="start-app-server-preserve-liferay-home">
+								<param name="app.server.start.executable.arg.line" value="${test.batch.app.server.start.executable.arg.line}" />
+							</antcall>
 
 							<deploy-release-dependency-modules-post-startup />
 
@@ -2955,12 +2996,7 @@ log.sanitizer.enabled=false</echo>
 						</else>
 					</if>
 
-					<if>
-						<isset property="env.CI_TEST_SUITE" />
-						<then>
-							<prepare-suite-search-engine suite.name="${env.CI_TEST_SUITE}" />
-						</then>
-					</if>
+					<prepare-suite-search-engine />
 
 					<antcall inheritAll="false" target="record-test-class-file-names">
 						<param name="test.class.groups.size" value="${test.batch.size}" />
@@ -3439,6 +3475,13 @@ log.sanitizer.enabled=false</echo>
 
 	<macrodef name="stop-suite-search-engine">
 		<sequential>
+			<if>
+				<contains string="${suite.search.engine}" substring="remote-elasticsearch7" />
+				<then>
+					<ant antfile="build-test-elasticsearch7.xml" target="stop-elasticsearch" />
+				</then>
+			</if>
+
 			<if>
 				<equals arg1="${suite.search.engine}" arg2="solr" />
 				<then>
@@ -4282,6 +4325,18 @@ log.sanitizer.enabled=false</echo>
 		/>
 	</target>
 
+	<target name="functional-smoke-bundle-tomcat-db2111-jdk8">
+		<antcall target="functional-bundle-tomcat-db2111-jdk8" />
+	</target>
+
+	<target name="functional-smoke-bundle-tomcat-hypersonic20-jdk8">
+		<antcall target="functional-bundle-tomcat-hypersonic20-jdk8" />
+	</target>
+
+	<target name="functional-smoke-bundle-tomcat-mariadb102-jdk8">
+		<antcall target="functional-bundle-tomcat-mariadb102-jdk8" />
+	</target>
+
 	<target name="functional-smoke-bundle-tomcat-mysql56-jdk8">
 		<antcall target="functional-bundle-tomcat-mysql56-jdk8" />
 	</target>
@@ -4294,6 +4349,14 @@ log.sanitizer.enabled=false</echo>
 		<antcall target="functional-bundle-tomcat-mysql57-jdk11_open" />
 	</target>
 
+	<target name="functional-smoke-bundle-tomcat-oracle193-jdk8">
+		<antcall target="functional-bundle-tomcat-oracle193-jdk8" />
+	</target>
+
+	<target name="functional-smoke-bundle-tomcat-postgresql11-jdk8">
+		<antcall target="functional-bundle-tomcat-postgresql11-jdk8" />
+	</target>
+
 	<target name="functional-smoke-bundle-weblogic-mysql57-jdk8">
 		<run-functional-test
 			app.server.type="weblogic"
@@ -4538,6 +4601,18 @@ log.sanitizer.enabled=false</echo>
 		<run-functional-test app.server.type="wildfly" app.server.version="17.0.0" database.type="mariadb" test.portal.log.assert="true" />
 	</target>
 
+	<target name="functional-smoke-wildfly220-mariadb104-jdk8">
+		<set-app-server-version-number app.server.type="wildfly" app.server.version="22.0.0" />
+
+		<run-functional-test app.server.type="wildfly" app.server.version="22.0.0" database.type="mariadb" test.portal.log.assert="true" />
+	</target>
+
+	<target name="functional-smoke-wildfly220-mariadb104-jdk11_open">
+		<set-app-server-version-number app.server.type="wildfly" app.server.version="22.0.0" />
+
+		<run-functional-test app.server.type="wildfly" app.server.version="22.0.0" database.type="mariadb" test.portal.log.assert="true" />
+	</target>
+
 	<target name="functional-suse15-tomcat90-mysql57-jdk8">
 		<run-functional-test app.server.type="tomcat" database.type="mysql" database.version="5.7" test.portal.log.assert="true" />
 	</target>
@@ -4670,6 +4745,10 @@ log.sanitizer.enabled=false</echo>
 		<run-functional-test app.server.type="tomcat" database.type="mysql" database.version="5.7" test.portal.log.assert="true" />
 	</target>
 
+	<target name="functional-ubuntu20-tomcat90-mysql57-jdk8">
+		<run-functional-test app.server.type="tomcat" database.type="mysql" database.version="5.7" test.portal.log.assert="true" />
+	</target>
+
 	<target name="functional-upgrade-jboss72-mysql57-jdk8">
 		<run-functional-test app.server.type="jboss" database.type="mysql" database.version="5.7" />
 	</target>
@@ -5713,7 +5792,7 @@ log.sanitizer.enabled=false</echo>
 				<gradle-execute dir="modules" task="test">
 					<arg value="--continue" />
 					<arg value="-Dbuild.exclude.ant.plugin=true" />
-					<arg if:set="com.liferay.portal.search.solr8.test.unit.started" value="-Dcom.liferay.portal.search.solr8.test.unit.started=${com.liferay.portal.search.solr8.test.unit.started}" />
+					<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}" />
@@ -5723,16 +5802,11 @@ log.sanitizer.enabled=false</echo>
 			<test-set-up>
 				<setup-test-environment />
 
+				<prepare-suite-search-engine />
+
 				<antcall inheritAll="false" target="record-test-class-file-names">
 					<param name="test.class.groups.size" value="${test.batch.size}" />
 				</antcall>
-
-				<if>
-					<isset property="env.CI_TEST_SUITE" />
-					<then>
-						<prepare-suite-search-engine suite.name="${env.CI_TEST_SUITE}" />
-					</then>
-				</if>
 			</test-set-up>
 
 			<test-tear-down>