LPS-129972 Simplify DSLQuery CustomSQL interactions

build-test.xml

@@ -467,18 +467,29 @@ jdbc.counter.connectionProperties=oracle.jdbc.ReadTimeout=0;oracle.net.CONNECT_T
 
 			<var name="dxp.license.product.name" unset="true" />
 
-			<loadfile
-				property="dxp.license.content"
-				srcfile="${liferay.home}/osgi/modules/${dxp.license.file}"
-			/>
+			<if>
+				<or>
+					<equals arg1="${dxp.license.file}" arg2="dxp-license-dummy.xml" />
+					<equals arg1="${dxp.license.file}" arg2="dxp-binary-license-developer.li" />
+				</or>
+				<then>
+					<property name="dxp.license.product.name" value="Portal Development" />
+				</then>
+				<else>
+					<loadfile
+						property="dxp.license.content"
+						srcfile="${liferay.home}/osgi/modules/${dxp.license.file}"
+					/>
 
-			<propertyregex
-				casesensitive="false"
-				input="${dxp.license.content}"
-				property="dxp.license.product.name"
-				regexp="&lt;product-name&gt;(.*?)&lt;/product-name&gt;"
-				select="\1"
-			/>
+					<propertyregex
+						casesensitive="false"
+						input="${dxp.license.content}"
+						property="dxp.license.product.name"
+						regexp="&lt;product-name&gt;(.*?)&lt;/product-name&gt;"
+						select="\1"
+					/>
+				</else>
+			</if>
 		</sequential>
 	</macrodef>
 
@@ -2609,12 +2620,7 @@ include-and-override=portal-liferay-online-limit.properties</echo>
 			<if>
 				<isset property="dxp.license.file" />
 				<then>
-					<delete failonerror="false" file="${liferay.home}/deploy/license.xml" verbose="true" />
-
-					<copy
-						file="${project.dir}/portal-web/test/functional/com/liferay/portalweb/dependencies/license/${dxp.license.file}"
-						todir="${liferay.home}/deploy"
-					/>
+					<swap-dxp-license dxp.license.file="${dxp.license.file}" />
 				</then>
 			</if>
 
@@ -5542,6 +5548,71 @@ org.apache.catalina.startup.ClassLoaderFactory.level=INFO]]>
 		</sequential>
 	</macrodef>
 
+	<macrodef name="swap-dxp-license">
+		<attribute name="dxp.license.file" />
+
+		<sequential>
+			<delete failonerror="false" file="${liferay.home}/deploy/license.xml" verbose="true" />
+
+			<copy
+				file="${project.dir}/portal-web/test/functional/com/liferay/portalweb/dependencies/license/@{dxp.license.file}"
+				todir="${liferay.home}/deploy"
+			/>
+
+			<if>
+				<equals arg1="@{dxp.license.file}" arg2="dxp-binary-license-developer.li" />
+				<then>
+					<copy
+						file="${project.dir}/portal-web/test/functional/com/liferay/portalweb/dependencies/license/@{dxp.license.file}"
+						todir="${liferay.home}/data/license"
+					/>
+				</then>
+			</if>
+
+			<var name="expiration.leeway" value="2" />
+
+			<if>
+				<equals arg1="@{dxp.license.file}" arg2="portal-dxp-license-custom-expiration-48-hours.xml" />
+				<then>
+					<beanshell>
+						<![CDATA[
+							import java.time.format.DateTimeFormatter;
+							import java.time.ZonedDateTime;
+							import java.time.ZoneId;
+
+							DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("EEEE, MMMM dd, yyyy hh:mm:ss a zz");
+
+							ZoneId GMT = ZoneId.of("GMT");
+
+							ZonedDateTime now = ZonedDateTime.now(GMT);
+
+							//License expiration leeway
+							ZonedDateTime expiration = now.minusDays(2);
+
+							//License expiration delay
+							expiration = expiration.plusMinutes(5);
+
+							System.out.println(dateTimeFormatter.format(expiration));
+							project.setProperty("expiration.date", dateTimeFormatter.format(expiration));
+						]]>
+					</beanshell>
+				</then>
+			</if>
+
+			<replace
+				file="${liferay.home}/deploy/@{dxp.license.file}"
+				token="${host.name}"
+				value="${env.HOSTNAME}"
+			/>
+
+			<replace
+				file="${liferay.home}/deploy/@{dxp.license.file}"
+				token="${expirationdate}"
+				value="${expiration.date}"
+			/>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="uninstall-patches">
 		<attribute default="${app.server.parent.dir}/patching-tool" name="patching.tool.dir" />
 
@@ -5961,17 +6032,27 @@ war.path=${app.server.portal.dir}/</echo>
 
 	<macrodef name="wait-for-license-activation">
 		<sequential>
-			<get-commerce-license-product-name />
-
-			<wait-for-app-server-log-message log.message="${commerce.license.product.name} license validation passed" />
+			<get-poshi-method-name />
 
-			<wait-for-app-server-log-message log.message="License registered for ${commerce.license.product.name}" />
+			<get-commerce-license-product-name />
 
 			<get-dxp-license-product-name />
 
+			<wait-for-app-server-log-message log.message="${commerce.license.product.name} license validation passed" />
+
 			<wait-for-app-server-log-message log.message="${dxp.license.product.name} license validation passed" />
 
-			<wait-for-app-server-log-message log.message="License registered for ${dxp.license.product.name}" />
+			<if>
+				<equals arg1="${poshi.method.name}" arg2="DeployCommerceLicenseBinaryFile" />
+				<then>
+					<echo>Using license binary, not waiting for license registration</echo>
+				</then>
+				<else>
+					<wait-for-app-server-log-message log.message="License registered for ${commerce.license.product.name}" />
+
+					<wait-for-app-server-log-message log.message="License registered for ${dxp.license.product.name}" />
+				</else>
+			</if>
 		</sequential>
 	</macrodef>
 

git-commit-portal-private

@@ -1 +1 @@
-6ff8df327a773c10a5569ae9cd781e75e694698b
+6072c0fc3f2cc6e103b36719746390f945fea6c4

lib/development/dependencies.properties

@@ -38,7 +38,7 @@ jsp-api=javax.servlet.jsp:jsp-api:2.1
 jta=javax.transaction:jta:1.1
 junit=junit:junit:4.13.1
 jutf7=com.beetstra.jutf7:jutf7:1.0.0
-mail=com.sun.mail:javax.mail:1.6.2
+mail=com.sun.mail:jakarta.mail:1.6.6
 mariadb=org.mariadb.jdbc:mariadb-java-client:1.1.9
 maven-ant-tasks=org.apache.maven:maven-ant-tasks:2.1.3
 mockito=org.mockito:mockito-all:1.9.5