Lpd 35723 optimization 11

build-test-batch.xml

@@ -3210,14 +3210,41 @@ ${poshi.runner.testsuite.testcase.name}</echo>
 					<prepare-test-environment />
 				</then>
 				<elseif>
-					<or>
+					<and>
 						<equals arg1="${test.batch.full.setup}" arg2="true" />
 						<isset property="env.JENKINS_HOME" />
-					</or>
+					</and>
 					<then>
 						<prepare-test-build />
 					</then>
 				</elseif>
+				<else>
+					<for list="${test.batch.names.standalone}" param="test.batch.name">
+						<sequential>
+							<if>
+								<contains string="${env.JOB_VARIANT}" substring="@{test.batch.name}" />
+								<then>
+									<property name="skip.portal.dist" value="true" />
+								</then>
+							</if>
+						</sequential>
+					</for>
+
+					<if>
+						<not>
+							<isset property="skip.portal.dist" />
+						</not>
+						<then>
+							<fail message="The portal environment is not available." />
+						</then>
+					</if>
+
+					<antcall inheritAll="false" target="setup-sdk" />
+
+					<antcall inheritAll="false" target="compile" />
+
+					<ant target="install-portal-snapshots" />
+				</else>
 			</if>
 		</sequential>
 	</macrodef>
@@ -6776,7 +6803,55 @@ information. Make sure to commit in all format-javadoc results.
 					<propertyresource name="modules.test.class.group" />
 				</loadresource>
 
-				<for list="${modules.compile.task.groups}" param="modules.compile.task.group" trim="true">
+				<beanshell>
+					<![CDATA[
+						import java.io.File;
+
+						import java.util.regex.Matcher;
+						import java.util.regex.Pattern;
+
+						String modulesCompileTaskGroupsString = project.getProperty("modules.compile.task.groups");
+
+						String[] modulesCompileTaskGroups = modulesCompileTaskGroupsString.split(" ");
+
+						StringBuilder sb = new StringBuilder();
+
+						Pattern pattern = Pattern.compile("(.*):.*");
+
+						for (String modulesCompileTaskGroup : modulesCompileTaskGroups) {
+
+							Matcher matcher = pattern.matcher(modulesCompileTaskGroup);
+
+							if (!matcher.find()) {
+								continue;
+							}
+
+							String modulesCompileTaskGroupPath = matcher.group(1);
+
+							modulesCompileTaskGroupDirPath = project.getProperty("project.dir") + "/modules" + modulesCompileTaskGroupPath.replace(":", "/");
+
+							File modulesCompileTaskGroupDir = new File(modulesCompileTaskGroupDirPath);
+
+							if (!modulesCompileTaskGroupDir.isDirectory()) {
+								continue;
+							}
+
+							File lfrBuildPortalFile = new File(modulesCompileTaskGroupDir, ".lfrbuild-portal");
+
+							if (lfrBuildPortalFile.exists()) {
+								continue;
+							}
+
+							sb.append(modulesCompileTaskGroup);
+
+							sb.append(" ");
+						}
+
+						project.setProperty("modules.compile.processed.task.groups", sb.toString());
+					]]>
+				</beanshell>
+
+				<for list="${modules.compile.processed.task.groups}" param="modules.compile.task.group" trim="true">
 					<sequential>
 						<echo>Executing Gradle tasks: @{modules.compile.task.group}.</echo>
 

build-test-semantic-search.xml

@@ -40,7 +40,7 @@ RUN python -c "from txtai.api import API; API('config.yml', False)"</echo>
 				<arg value="-c" />
 				<arg value="docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${container.prefix}_txtai" />
 			</exec>
-			<echo file="${liferay.home}/osgi/configs/com.liferay.search.experiences.configuration.SemanticSearchConfiguration.config">textEmbeddingCacheTimeout="604800"
+			<echo file="${liferay.home}/osgi/configs/com.liferay.portal.search.configuration.SemanticSearchConfiguration.config">textEmbeddingCacheTimeout="604800"
 textEmbeddingProviderConfigurationJSONs=["\{\"attributes\": \{\"hostAddress\": \"http://${txtai.container.ip}:8000\", \"maxCharacterCount\": 500\}, \"embeddingVectorDimensions\": 768, \"languageIds\": [\"en_US\"], \"modelClassNames\": [\"com.liferay.blogs.model.BlogsEntry\", \"com.liferay.journal.model.JournalArticle\", \"com.liferay.knowledge.base.model.KBArticle\", \"com.liferay.message.boards.model.MBMessage\", \"com.liferay.wiki.model.WikiPage\"], \"providerName\": \"txtai\"\}"]
 textEmbeddingsEnabled="true"</echo>
 		</sequential>

build-test.xml

@@ -1071,15 +1071,15 @@ jdbc.default.connectionProperties=oracle.jdbc.ReadTimeout=0;oracle.net.CONNECT_T
 			<propertyregex
 				input="${test.batch.name}"
 				property="java.jdk.bundle.type"
-				regexp="-jdk[0-9]+_(\w+)"
+				regexp="-jdk[0-9]+_([^_]+)_?"
 				select="\1"
 			/>
 
 			<condition property="java.jdk.bundle.type" value="oracle">
 				<matches pattern="-jdk[0-9]+$" string="${test.batch.name}" />
 			</condition>
 
-			<property name="java.jdk.bundle.type" value="oracle" />
+			<property name="java.jdk.bundle.type" value="none" />
 		</sequential>
 	</macrodef>
 
@@ -1102,14 +1102,14 @@ jdbc.default.connectionProperties=oracle.jdbc.ReadTimeout=0;oracle.net.CONNECT_T
 				select="\1"
 			/>
 
-			<property name="java.jdk.bundle.version" value="${ant.java.version}" />
+			<property name="java.jdk.bundle.version" value="none" />
 		</sequential>
 	</macrodef>
 
 	<macrodef name="get-java-jdk-home">
 		<attribute default="${java.jdk.architecture}" name="architecture" />
-		<attribute default="oracle" name="type" />
-		<attribute default="${ant.java.version}" name="version" />
+		<attribute default="none" name="type" />
+		<attribute default="none" name="version" />
 
 		<sequential>
 			<var name="java.jdk.home" unset="true" />
@@ -1120,9 +1120,44 @@ jdbc.default.connectionProperties=oracle.jdbc.ReadTimeout=0;oracle.net.CONNECT_T
 					<property name="java.jdk.home" value="${local.java.jdk.home}" />
 				</then>
 				<else>
-					<propertycopy from="java.jdk.home[@{version}][@{architecture}][@{type}]" property="java.jdk.home" silent="true" />
+					<if>
+						<and>
+							<equals arg1="@{type}" arg2="none" />
+							<equals arg1="@{version}" arg2="none" />
+						</and>
+						<then>
+							<propertycopy from="java.jdk.default.runtime" property="java.jdk.home" silent="true" />
+						</then>
+						<elseif>
+							<or>
+								<equals arg1="@{type}" arg2="none" />
+								<equals arg1="@{type}" arg2="stable" />
+							</or>
+							<then>
+								<propertycopy from="java.jdk[@{version}]" property="java.jdk.home.property.name" silent="true" />
+
+								<propertycopy from="${java.jdk.home.property.name}" property="java.jdk.home" silent="true" />
+							</then>
+						</elseif>
+						<elseif>
+							<equals arg1="@{version}" arg2="none" />
+							<then>
+								<propertycopy from="java.jdk.default.runtime" property="java.jdk.home" silent="true" />
+							</then>
+						</elseif>
+						<else>
+							<propertycopy from="java.jdk.home[@{version}][@{architecture}][@{type}]" property="java.jdk.home" silent="true" />
+						</else>
+					</if>
 
-					<property name="java.jdk.home" value="${java.home}" />
+					<if>
+						<not>
+							<isset property="java.jdk.home" />
+						</not>
+						<then>
+							<fail>Unable to get the property "java.jdk.home" for jdk version @{version} and type @{type}.</fail>
+						</then>
+					</if>
 
 					<if>
 						<not>
@@ -12521,27 +12556,14 @@ portal.proxy.path=/${portal.proxy.path}</echo>
 			<equals arg1="${rewrite.batch.statements}" arg2="true" />
 			<then>
 				<if>
-					<or>
-						<equals arg1="${database.type}" arg2="mariadb" />
-						<equals arg1="${database.type}" arg2="mysql" />
-					</or>
+					<equals arg1="${database.type}" arg2="postgresql" />
 					<then>
 						<replace
 							file="portal-impl/src/portal-ext.properties"
 							token="${database.url}"
-							value="${database.url}&amp;rewriteBatchedStatements=true&amp;cachePrepStmts=true&amp;prepStmtCacheSize=1000&amp;prepStmtCacheSqlLimit=2048"
+							value="${database.url}?reWriteBatchedInserts=true"
 						/>
 					</then>
-					<elseif>
-						<equals arg1="${database.type}" arg2="postgresql" />
-						<then>
-							<replace
-								file="portal-impl/src/portal-ext.properties"
-								token="${database.url}"
-								value="${database.url}?reWriteBatchedInserts=true"
-							/>
-						</then>
-					</elseif>
 					<elseif>
 						<equals arg1="${database.type}" arg2="sqlserver" />
 						<then>

ci.properties

@@ -44,7 +44,6 @@ ci.test.available.suites=\
     backend-hypersonic,\
     blade,\
     blogs,\
-    bulk-editing,\
     bundle,\
     bundles,\
     calendar,\
@@ -62,13 +61,7 @@ ci.test.available.suites=\
     commerce-upgrade,\
     configuration-framework,\
     content-management,\
-    content-management-acceptance,\
-    content-management-analytics-cloud,\
-    content-management-db-partition,\
-    content-management-headless,\
-    content-management-lxc,\
     content-management-playwright,\
-    content-management-upgrade,\
     content-page-review,\
     continuous-integration,\
     cookies,\
@@ -137,7 +130,6 @@ ci.test.available.suites=\
     object-lxc,\
     oidc,\
     onedrive,\
-    online-editing,\
     page-management,\
     page-management-playwright,\
     password-policies,\
@@ -185,7 +177,6 @@ ci.test.available.suites=\
     service-builder,\
     setup-wizard,\
     sf,\
-    sharepoint,\
     sharing,\
     site-management,\
     site-template,\
@@ -258,7 +249,6 @@ ci.test.suite.description[backend]=Test backend tests.
 ci.test.suite.description[backend-hypersonic]=Test backend tests on Hypersonic.
 ci.test.suite.description[blade]=Test Blade samples tests.
 ci.test.suite.description[blogs]=Test Blogs tests.
-ci.test.suite.description[bulk-editing]=Test Bulk Editing tests.
 ci.test.suite.description[bundle]=Saves a compiled tomcat bundle.
 ci.test.suite.description[calendar]=Test Calendar tests.
 ci.test.suite.description[clay]=Test Clay component tests.
@@ -274,12 +264,7 @@ ci.test.suite.description[commerce-integration]=Test only Commerce integration t
 ci.test.suite.description[commerce-opensearch2]=Test only Commerce tests with the latest compatible OpenSearch 2 version.
 ci.test.suite.description[configuration-framework]=Test Configuration Framework component tests.
 ci.test.suite.description[content-management]=Test Content Management tests.
-ci.test.suite.description[content-management-acceptance]=Test Content Management acceptance tests.
-ci.test.suite.description[content-management-db-partition]=Test Content Management functional tests with Database Partitioning.
-ci.test.suite.description[content-management-headless]=Test Content Management headless tests.
-ci.test.suite.description[content-management-lxc]=Content Management functional tests with Liferay Experience Cloud configurations.
 ci.test.suite.description[content-management-playwright]=Test Content Management playwright tests.
-ci.test.suite.description[content-management-upgrade]=Test Content Management upgrade tests.
 ci.test.suite.description[content-page-review]=Test Content Page Review (comments) tests.
 ci.test.suite.description[continuous-integration]=Test Continuous Integration tests.
 ci.test.suite.description[core-functional]=Test Core Infra Functional tests

learn-resources/data/frontend-data-set-admin-web.json

@@ -0,0 +1,7 @@
+{
+	"rest-parameters": {
+		"en_US": {
+			"message": "Learn more about REST parameters."
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-artifact.git.id=7652f0033d90ff8d96f51b7688de18eec8481bd0
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.169/com.liferay.gradle.plugins.defaults-10.1.169-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.169/com.liferay.gradle.plugins.defaults-10.1.169-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.169/com.liferay.gradle.plugins.defaults-10.1.169.jar
+artifact.git.id=cfb889dc29df3b6020ac8c7180040cf0971ad46a
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.172/com.liferay.gradle.plugins.defaults-10.1.172-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.172/com.liferay.gradle.plugins.defaults-10.1.172-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.1.172/com.liferay.gradle.plugins.defaults-10.1.172.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=cbd775ccae67e3403e8881bbfc2fb35c1f6b7646
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.243/com.liferay.gradle.plugins.rest.builder-1.1.243-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.243/com.liferay.gradle.plugins.rest.builder-1.1.243-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.243/com.liferay.gradle.plugins.rest.builder-1.1.243.jar
+artifact.git.id=99ae0485e0b159d73161e7c53b8fea1bbd192cd8
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.244/com.liferay.gradle.plugins.rest.builder-1.1.244-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.244/com.liferay.gradle.plugins.rest.builder-1.1.244-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.244/com.liferay.gradle.plugins.rest.builder-1.1.244.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=ee26b222f1b664e141ac85efe02ab3ec1cd918f8
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.153/com.liferay.gradle.plugins.source.formatter-5.2.153-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.153/com.liferay.gradle.plugins.source.formatter-5.2.153-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.153/com.liferay.gradle.plugins.source.formatter-5.2.153.jar
+artifact.git.id=40d07e5508231fb449828f5c59771a6698b8bbb0
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.155/com.liferay.gradle.plugins.source.formatter-5.2.155-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.155/com.liferay.gradle.plugins.source.formatter-5.2.155-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.155/com.liferay.gradle.plugins.source.formatter-5.2.155.jar

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

@@ -1,4 +1,4 @@
-artifact.git.id=7652f0033d90ff8d96f51b7688de18eec8481bd0
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.82/com.liferay.gradle.plugins-15.0.82-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.82/com.liferay.gradle.plugins-15.0.82-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.82/com.liferay.gradle.plugins-15.0.82.jar
+artifact.git.id=cfb889dc29df3b6020ac8c7180040cf0971ad46a
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.85/com.liferay.gradle.plugins-15.0.85-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.85/com.liferay.gradle.plugins-15.0.85-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/15.0.85/com.liferay.gradle.plugins-15.0.85.jar

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

@@ -1,3 +1,3 @@
-artifact.git.id=189f74524ac40989dbd158f309939589e2194dcd
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1450/com.liferay.jenkins.results.parser-1.0.1450-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1450/com.liferay.jenkins.results.parser-1.0.1450.jar
+artifact.git.id=fc46ff8b4e77cd7b46483b7f645a8d36d185a7fe
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1456/com.liferay.jenkins.results.parser-1.0.1456-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.jenkins.results.parser/1.0.1456/com.liferay.jenkins.results.parser-1.0.1456.jar

modules/.releng/test/poshi/poshi-core/artifact.properties

@@ -1,3 +1,3 @@
-artifact.git.id=680c712b50e803741782761972fca1eecd4cb3b2
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.158/com.liferay.poshi.core-1.0.158-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.158/com.liferay.poshi.core-1.0.158.jar
+artifact.git.id=405ca471fc649acbdf917769b455b377ee836cf2
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.159/com.liferay.poshi.core-1.0.159-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.159/com.liferay.poshi.core-1.0.159.jar

modules/.releng/test/poshi/poshi-runner/artifact.properties

@@ -1,3 +1,3 @@
-artifact.git.id=19785be62f8af4b85995859b5abdc55f09527966
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.491/com.liferay.poshi.runner-1.0.491-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.491/com.liferay.poshi.runner-1.0.491.jar
+artifact.git.id=405ca471fc649acbdf917769b455b377ee836cf2
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.492/com.liferay.poshi.runner-1.0.492-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.492/com.liferay.poshi.runner-1.0.492.jar