LPD-19861 | master

app.server.properties

@@ -87,7 +87,7 @@
 ## Tomcat
 ##
 
-    app.server.tomcat.version=9.0.83
+    app.server.tomcat.version=9.0.87
     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

build-common.xml

@@ -229,22 +229,27 @@
 		</or>
 	</condition>
 
-	<fail message="Please use Java 1.8.">
+	<fail message="Please use Java 1.8 or 21.">
 		<condition>
 			<not>
 				<or>
 					<equals arg1="${java.specification.version}" arg2="1.8" />
+					<equals arg1="${java.specification.version}" arg2="21" />
 					<isset property="env.JENKINS_HOME" />
 				</or>
 			</not>
 		</condition>
 	</fail>
 
+	<condition else="1.10.14" property="java.ant.version" value="1.9.3">
+		<equals arg1="${java.specification.version}" arg2="1.8" />
+	</condition>
+
 	<condition property="correct.ant.version">
-		<antversion atleast="1.9.3" />
+		<antversion atleast="${java.ant.version}" />
 	</condition>
 
-	<fail message="Please use Ant 1.9.3 or above.">
+	<fail message="Please use Ant ${java.ant.version} or above.">
 		<condition>
 			<not>
 				<istrue value="${correct.ant.version}" />
@@ -1989,7 +1994,6 @@ rerun your task.
 					<propertyref name="baseline.jar.report.level" />
 					<propertyref name="baseline.jar.report.only.dirty.packages" />
 					<propertyref name="build.binaries.cache.dir" />
-					<propertyref if:set="build.java.override.version" name="build.java.override.version" unless:blank="${build.java.override.version}" />
 					<propertyref name="compile.jsp.include" />
 					<propertyref name="git.working.branch.name" />
 					<propertyref if:set="gradle.update.file.versions.excludes" name="gradle.update.file.versions.excludes" unless:blank="${gradle.update.file.versions.excludes}" />
@@ -2064,8 +2068,9 @@ rerun your task.
 				<entry key="database.jdbc.drivers.url" value="${test.jdbc.drivers.url}" />
 				<entry key="database.jdbc.oracle.driver" value="${jdbc.oracle.driver}" />
 				<entry key="database.oracle.version" value="${database.oracle.version}" />
+				<entry if:set="build.java.version.source.compatibility" key="java.version.source.compatibility" unless:blank="${build.java.version.source.compatibility}" value="${build.java.version.source.compatibility}" />
+				<entry if:set="build.java.version.target.compatibility" key="java.version.target.compatibility" unless:blank="${build.java.version.target.compatibility}" value="${build.java.version.target.compatibility}" />
 				<entry if:set="junit.jvm.override" key="org.gradle.java.installations.paths" unless:blank="${junit.jvm.override}" value="${junit.jvm.override}" />
-				<entry key="systemProp.build.bnd.print.builder.classpath" value="${build.bnd.print.builder.classpath}" />
 				<entry key="systemProp.build.bnd.print.enabled" value="${build.bnd.print.enabled}" />
 				<entry key="systemProp.build.performance.logger.enabled" value="${build.performance.logger.enabled}" />
 				<entry key="systemProp.maven.repo.local" unless:blank="${build.repository.local.dir}" value="${build.repository.local.dir}" />

build-dist.xml

@@ -1186,6 +1186,13 @@ org.apache.level=WARNING]]>
 			<replacevalue><![CDATA[<!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" URIEncoding="UTF-8" /> -->]]></replacevalue>
 		</replace>
 
+		<replace
+			file="${app.server.tomcat.dir}/conf/server.xml"
+		>
+			<replacetoken><![CDATA[<Connector port="8080" protocol="HTTP/1.1"]]></replacetoken>
+			<replacevalue><![CDATA[<Connector maxThreads="75" port="8080" protocol="HTTP/1.1"]]></replacevalue>
+		</replace>
+
 		<replace
 			file="${app.server.tomcat.dir}/conf/server.xml"
 		>

build-test-batch.xml

@@ -8894,28 +8894,92 @@ junit.jvm.override.version=21</echo>
 	<target name="workspaces-compile-jdk8">
 		<run-batch-test>
 			<test-action>
-				<for list="${workspaces.names[workspaces-compile-jdk8]}" param="workspace.name">
+				<local name="workspace.names" />
+
+				<propertycopy from="workspaces.names[workspaces-compile-jdk8][${env.CI_TEST_SUITE}]" name="workspace.names" silent="true" />
+
+				<property name="workspace.names" value="${workspaces.names[workspaces-compile-jdk8]}" />
+
+				<for list="${workspace.names}" param="workspace.name">
 					<sequential>
-						<local name="workspace.dir" />
+						<trycatch property="workspace.exception">
+							<try>
+								<local name="workspace.dir" />
 
-						<property name="workspace.dir" value="${project.dir}/workspaces/@{workspace.name}" />
+								<property name="workspace.dir" value="${project.dir}/workspaces/@{workspace.name}" />
 
-						<if>
-							<available file="${workspace.dir}" />
-							<then>
-								<echo></echo>
-								<echo>##</echo>
-								<echo>## @{workspace.name}</echo>
-								<echo>##</echo>
-								<echo></echo>
-
-								<execute dir="${workspace.dir}">
-									./gradlew build
-								</execute>
-							</then>
-						</if>
+								<if>
+									<available file="${workspace.dir}" />
+									<then>
+										<echo></echo>
+										<echo>##</echo>
+										<echo>## @{workspace.name}</echo>
+										<echo>##</echo>
+										<echo></echo>
+
+										<execute dir="${workspace.dir}">
+											./gradlew build
+										</execute>
+									</then>
+								</if>
+							</try>
+							<catch>
+								<echo>${workspace.exception}</echo>
+
+								<echo append="true" file="workspaces-failure">@{workspace.name},</echo>
+							</catch>
+						</trycatch>
 					</sequential>
 				</for>
+
+				<if>
+					<available file="workspaces-failure" />
+					<then>
+						<loadfile
+							property="failed.workspaces"
+							srcFile="workspaces-failure"
+						/>
+
+						<beanshell>
+							<![CDATA[
+								StringBuilder sb = new StringBuilder();
+
+								sb.append("\n");
+
+								String failedWorkspacesString = project.getProperty("failed.workspaces");
+
+								String[] failedWorkspaces = failedWorkspacesString.split(",");
+
+								sb.append(failedWorkspaces.length);
+
+								sb.append(" of ");
+
+								String workspaceNamesString = project.getProperty("workspace.names");
+
+								String[] workspaceNames = workspaceNamesString.split(",");
+
+								sb.append(workspaceNames.length);
+
+								sb.append(" workspace");
+
+								if (workspaceNames.length != 1) {
+									sb.append("s");
+								}
+
+								sb.append(" failed to compile:\n");
+
+								for (String failedWorkspace : failedWorkspaces) {
+									sb.append(failedWorkspace);
+									sb.append("\n");
+								}
+
+								project.setProperty("workspaces.failure.message", sb.toString());
+							]]>
+						</beanshell>
+
+						<fail message="${workspaces.failure.message}" />
+					</then>
+				</if>
 			</test-action>
 		</run-batch-test>
 	</target>

build-test.xml

@@ -2116,10 +2116,20 @@ war.path=${app.server.portal.dir}/</echo>
 						</else>
 					</if>
 
-					<mirrors-get
-						dest="@{patching.tool.dir}/patches"
-						src="http://files.liferay.com/private/ee/fix-packs/${patch.portal.version}/dxp/liferay-fix-pack-${fixpack.build.name}.zip"
-					/>
+					<if>
+						<and>
+							<isset property="patch.portal.version" />
+							<not>
+								<matches pattern="\d{4}.q[1234].\d+" string="${patch.portal.version}" />
+							</not>
+						</and>
+						<then>
+							<mirrors-get
+								dest="@{patching.tool.dir}/patches"
+								src="http://files.liferay.com/private/ee/fix-packs/${patch.portal.version}/dxp/liferay-fix-pack-${fixpack.build.name}.zip"
+							/>
+						</then>
+					</if>
 				</then>
 			</if>
 		</sequential>
@@ -6894,7 +6904,7 @@ go</echo>
 					</then>
 				</elseif>
 				<else>
-					<var name="app.server.tomcat.version" value="9.0.83" />
+					<var name="app.server.tomcat.version" value="9.0.87" />
 				</else>
 			</if>
 
@@ -7600,6 +7610,8 @@ ${docker.start.error}</fail>
 				<try>
 					<retry retrycount="2">
 						<sequential>
+							<stop-docker-database />
+
 							<start-docker-database-cmd />
 						</sequential>
 					</retry>
@@ -12551,6 +12563,9 @@ auto.deploy.dest.dir=C:/WINDOWS/system32/config/systemprofile/liferay/websphere-
 			</then>
 		</if>
 
+		<echo append="true" file="portal-impl/src/portal-ext.properties">
+captcha.enforce.disabled=true</echo>
+
 		<apply-portal-ext-properties />
 	</target>
 
@@ -15427,7 +15442,10 @@ if (ppstate.equals("normal")) {
 			</else>
 		</if>
 
-		<poshi-execute task="writePoshiProperties" />
+		<gradle-execute dir="portal-web" task="generatePoshiReport">
+			<arg value="--build-file=build-test.gradle" />
+			<arg value="-Dreport.type=test-properties" />
+		</gradle-execute>
 
 		<local name="report.csv.file" />
 		<local name="report.csv.file.name" />

build.properties

@@ -63,9 +63,7 @@
     build.binaries.cache.url=https://github.com/liferay/${build.binaries.cache.repository.name}.git
     build.binaries.gradle.file=gradle-8.5.LIFERAY-PATCHED-1-bin.zip
     build.binaries.gradle.url=https://releases-cdn.liferay.com/tools/gradle/${build.binaries.gradle.file}
-    build.bnd.print.builder.classpath=false
     build.bnd.print.enabled=false
-    #build.java.override.version=21
 
     #
     # Set the default version for "com.liferay.portal" dependencies at compile
@@ -322,6 +320,10 @@
     #    dxp/apps/sharepoint-soap,\
     #    util/portal-tools-db-upgrade-client
 
+    build.java.version.source.compatibility=1.8
+    build.java.version.target.compatibility=1.8
+    #build.java.version.source.compatibility=21
+    #build.java.version.target.compatibility=21
     build.marketplace.apps.enabled=true
     build.patcher.hotfix.dirs=
     build.patcher.hotfix.qualifier=
@@ -370,6 +372,22 @@
 ## Database Builder
 ##
 
+    db.build.java.add.opens[21]=\
+        --add-opens java.base/java.io=ALL-UNNAMED \
+        --add-opens java.base/java.lang=ALL-UNNAMED \
+        --add-opens java.base/java.lang.invoke=ALL-UNNAMED \
+        --add-opens java.base/java.lang.ref=ALL-UNNAMED \
+        --add-opens java.base/java.lang.reflect=ALL-UNNAMED \
+        --add-opens java.base/java.net=ALL-UNNAMED \
+        --add-opens java.base/java.nio=ALL-UNNAMED \
+        --add-opens java.base/java.nio.charset=ALL-UNNAMED \
+        --add-opens java.base/java.text=ALL-UNNAMED \
+        --add-opens java.base/java.util=ALL-UNNAMED \
+        --add-opens java.base/java.util.concurrent=ALL-UNNAMED \
+        --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED \
+        --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
+        --add-opens java.base/sun.nio.cs=ALL-UNNAMED \
+        --add-opens java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED
     db.build.java.mx=1024m
     db.build.java.maxpermsize=256m
 

build.xml

@@ -1027,9 +1027,19 @@ This target has been renamed to "snapshot-bundle". Please call "snapshot-bundle"
 			todir="."
 		/>
 
-		<setup-profile-dxp
-			to.branch.name="${git.working.branch.name}-private"
-		/>
+		<if>
+			<matches pattern="release-\d{4}\.[q][1234]" string="${git.working.branch.name}" />
+			<then>
+				<setup-profile-dxp
+					to.branch.name="release-private"
+				/>
+			</then>
+			<else>
+				<setup-profile-dxp
+					to.branch.name="${git.working.branch.name}-private"
+				/>
+			</else>
+		</if>
 
 		<delete dir="git-clone-profile-dxp" />
 		<delete file="working.dir.properties" />