Skip to content

Commit 38628a4

Browse files
RoselaineMarquesMonteroRoselaineMarquesMontero
authored
Merge branch 'liferay:master' into LPD-55983
2 parents d2a1576 + d03a721 commit 38628a4

File tree

9,369 files changed

+300093
-131259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,369 files changed

+300093
-131259
lines changed

‎.github/CODEOWNERS‎

Lines changed: 85 additions & 81 deletions
Large diffs are not rendered by default.

‎app.server.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
## Tomcat
5858
##
5959

60-
app.server.tomcat.version=10.1.40
60+
app.server.tomcat.version=10.1.43
6161
app.server.tomcat.dir=${app.server.parent.dir}/tomcat-${app.server.tomcat.version}
6262
app.server.tomcat.bin.dir=${app.server.tomcat.dir}/bin
6363
app.server.tomcat.classes.global.dir=${app.server.tomcat.dir}/lib

‎build-dist.xml‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -925,28 +925,6 @@ this task.
925925
</replace-elements>
926926
</replace-multilines>
927927

928-
<replace
929-
file="${app.server.jboss.bin.dir}/standalone.conf"
930-
>
931-
<replacetoken><![CDATA[JAVA_OPTS="-Xms1303m -Xmx1303m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m ]]></replacetoken>
932-
<replacevalue><![CDATA[JAVA_OPTS="]]></replacevalue>
933-
</replace>
934-
935-
<replace
936-
file="${app.server.jboss.instance.dir}/configuration/standalone.xml"
937-
>
938-
<replacetoken><![CDATA[<subsystem xmlns="urn:jboss:domain:security:2.0">
939-
<security-domains>]]></replacetoken>
940-
<replacevalue><![CDATA[<subsystem xmlns="urn:jboss:domain:security:2.0">
941-
<security-domains>
942-
<security-domain name="PortalRealm">
943-
<authentication>
944-
<login-module code="com.liferay.portal.security.jaas.PortalLoginModule" flag="required" />
945-
</authentication>
946-
</security-domain>]]>
947-
</replacevalue>
948-
</replace>
949-
950928
<replace
951929
file="${app.server.jboss.dir}/standalone/configuration/standalone.xml"
952930
>
@@ -961,29 +939,13 @@ this task.
961939
<replacevalue><![CDATA[<!--<file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>-->]]></replacevalue>
962940
</replace>
963941

964-
<replace
965-
file="${app.server.jboss.dir}/standalone/configuration/standalone.xml"
966-
>
967-
<replacetoken><![CDATA[<jsp-config />]]></replacetoken>
968-
<replacevalue>
969-
<![CDATA[<jsp-config development="true" source-vm="1.8" target-vm="1.8" />]]>
970-
</replacevalue>
971-
</replace>
972-
973942
<echo append="true" file="${app.server.jboss.bin.dir}/standalone.conf">
974943
<![CDATA[${line.separator}JAVA_OPTS="$JAVA_OPTS ${app.server.jboss.jvm.args} ${app.server.jboss.jvm.mem}"
975944
976945
JDK_JAVA_OPTIONS="${JDK_JAVA_OPTIONS} ${app.server.jboss.jdk.java.options}"
977946
export JDK_JAVA_OPTIONS]]>
978947
</echo>
979948

980-
<replace
981-
file="${app.server.jboss.bin.dir}/standalone.conf.bat"
982-
>
983-
<replacetoken><![CDATA[set "JAVA_OPTS=-Xms1G -Xmx1G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m"]]></replacetoken>
984-
<replacevalue></replacevalue>
985-
</replace>
986-
987949
<replace
988950
file="${app.server.jboss.bin.dir}/standalone.conf.bat"
989951
>
@@ -1073,20 +1035,6 @@ org.apache.catalina.startup.VersionLoggerListener.level=WARNING
10731035
org.apache.level=WARNING]]>
10741036
</echo>
10751037

1076-
<replace
1077-
file="${app.server.tomcat.dir}/conf/server.xml"
1078-
>
1079-
<replacetoken><![CDATA[redirectPort="8443" />]]></replacetoken>
1080-
<replacevalue><![CDATA[redirectPort="8443" URIEncoding="UTF-8" />]]></replacevalue>
1081-
</replace>
1082-
1083-
<replace
1084-
file="${app.server.tomcat.dir}/conf/server.xml"
1085-
>
1086-
<replacetoken><![CDATA[<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" URIEncoding="UTF-8" />]]></replacetoken>
1087-
<replacevalue><![CDATA[<!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" URIEncoding="UTF-8" /> -->]]></replacevalue>
1088-
</replace>
1089-
10901038
<replace
10911039
file="${app.server.tomcat.dir}/conf/server.xml"
10921040
>
@@ -1944,27 +1892,13 @@ this task.
19441892
</replace-elements>
19451893
</replace-multilines>
19461894

1947-
<replace
1948-
file="${app.server.wildfly.bin.dir}/standalone.conf"
1949-
>
1950-
<replacetoken><![CDATA[JAVA_OPTS="-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m ]]></replacetoken>
1951-
<replacevalue><![CDATA[JAVA_OPTS="]]></replacevalue>
1952-
</replace>
1953-
19541895
<echo append="true" file="${app.server.wildfly.bin.dir}/standalone.conf">
19551896
<![CDATA[${line.separator}JAVA_OPTS="$JAVA_OPTS ${app.server.wildfly.jvm.args} ${app.server.wildfly.jvm.mem}"
19561897
19571898
JDK_JAVA_OPTIONS="${JDK_JAVA_OPTIONS} ${app.server.wildfly.jdk.java.options}"
19581899
export JDK_JAVA_OPTIONS]]>
19591900
</echo>
19601901

1961-
<replace
1962-
file="${app.server.wildfly.bin.dir}/standalone.conf.bat"
1963-
>
1964-
<replacetoken><![CDATA[set "JAVA_OPTS=-Xms64M ]]></replacetoken>
1965-
<replacevalue><![CDATA[rem set "JAVA_OPTS=-Xms64M ]]></replacevalue>
1966-
</replace>
1967-
19681902
<replace
19691903
file="${app.server.wildfly.bin.dir}/standalone.conf.bat"
19701904
>
@@ -1976,15 +1910,6 @@ set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% ${app.server.wildfly.jdk.java.options}"
19761910
</replacevalue>
19771911
</replace>
19781912

1979-
<replace
1980-
file="${app.server.wildfly.instance.dir}/configuration/standalone.xml"
1981-
>
1982-
<replacetoken><![CDATA[<jsp-config />]]></replacetoken>
1983-
<replacevalue>
1984-
<![CDATA[<jsp-config development="true" source-vm="1.8" target-vm="1.8" />]]>
1985-
</replacevalue>
1986-
</replace>
1987-
19881913
<chmod
19891914
perm="a+x"
19901915
>

‎build-test-batch.xml‎

Lines changed: 101 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,12 @@ mariadb.executable=${mariadb.executable}]]></echo>
543543
544544
Set releaseDependentModules = new TreeSet();
545545
546+
String testReleaseAdditionalDependencyModules = project.getProperty("test.release.additional.dependency.modules");
547+
548+
if (testReleaseAdditionalDependencyModules != null) {
549+
releaseDependentModules.addAll(new ArrayList(Arrays.asList(testReleaseAdditionalDependencyModules.split(","))));
550+
}
551+
546552
releaseDependentModules.addAll(getTestUtilModules());
547553
548554
String deprecatedModuleGroups = project.getProperty("test.batch.deprecated.module.groups");
@@ -1456,6 +1462,73 @@ app.server.type=@{app.server.type}]]></echo>
14561462
</sequential>
14571463
</macrodef>
14581464

1465+
<macrodef name="run-db-migration-container-test">
1466+
<attribute name="database.type" />
1467+
<attribute name="database.version" />
1468+
1469+
<sequential>
1470+
<run-batch-test tomcat.gc.log="true">
1471+
<test-action>
1472+
<database-test-run-test database.type="@{database.type}" stop.app.server="true">
1473+
<test-action>
1474+
<antcall inheritAll="false" target="prepare-log4j-ext-xml">
1475+
<param name="database.type" value="@{database.type}" />
1476+
</antcall>
1477+
1478+
<antcall if:set="env.JENKINS_HOME" inheritAll="false" target="prepare-portal-ext-properties">
1479+
<param name="database.type" value="@{database.type}" />
1480+
</antcall>
1481+
1482+
<echo file="${app.server.classes.portal.dir}/system-ext.properties">log.sanitizer.enabled=false</echo>
1483+
1484+
<trycatch>
1485+
<try>
1486+
<antcall inheritall="false" target="start-docker-database">
1487+
<param name="database.type" value="postgresql" />
1488+
</antcall>
1489+
1490+
<antcall inheritall="false" target="rebuild-database">
1491+
<param name="database.type" value="postgresql" />
1492+
<param name="skip.delete.liferay.home" value="true" />
1493+
<param name="sql.dir" value="sql/create-bare/" />
1494+
<param name="sql.file" value="create-bare-postgresql.sql" />
1495+
</antcall>
1496+
1497+
<echo file="${app.server.classes.portal.dir}/system-ext.properties">
1498+
database.postgresql.driver=${database.postgresql.driver}
1499+
database.postgresql.password=${database.postgresql.password}
1500+
database.postgresql.url=${database.postgresql.url}
1501+
database.postgresql.username=${database.postgresql.username}
1502+
</echo>
1503+
1504+
<antcall inheritall="false" target="start-app-server-preserve-liferay-home" />
1505+
1506+
<gradle-execute dir="modules/util/portal-tools-db-migration-importer-test" task="testIntegration">
1507+
<arg value="testIntegration" />
1508+
</gradle-execute>
1509+
</try>
1510+
1511+
<finally>
1512+
<antcall inheritall="false" target="stop-docker-database">
1513+
<param name="database.type" value="postgresql" />
1514+
</antcall>
1515+
1516+
<ant dir="portal-kernel" inheritAll="false" target="test-class">
1517+
<property name="test.class" value="PortalLogAssertorTest" />
1518+
</ant>
1519+
</finally>
1520+
</trycatch>
1521+
</test-action>
1522+
</database-test-run-test>
1523+
</test-action>
1524+
1525+
<test-set-up>
1526+
<setup-test-environment />
1527+
</test-set-up>
1528+
</run-batch-test>
1529+
</sequential>
1530+
</macrodef>
1531+
14591532
<macrodef name="run-empty-osgi-core-dir-test">
14601533
<attribute name="database.type" />
14611534

@@ -3707,6 +3780,30 @@ information. Make sure to commit in all build-lib-versions results.
37073780
</run-batch-test>
37083781
</target>
37093782

3783+
<target name="db-migration-container-db2111">
3784+
<run-db-migration-container-test database.type="db2" database.version="11.1.3" />
3785+
</target>
3786+
3787+
<target name="db-migration-container-mariadb102">
3788+
<run-db-migration-container-test database.type="mariadb" database.version="10.2" />
3789+
</target>
3790+
3791+
<target name="db-migration-container-mysql57">
3792+
<run-db-migration-container-test database.type="mysql" database.version="5.7" />
3793+
</target>
3794+
3795+
<target name="db-migration-container-mysql80">
3796+
<run-db-migration-container-test database.type="mysql" database.version="8.0" />
3797+
</target>
3798+
3799+
<target name="db-migration-container-oracle193">
3800+
<run-db-migration-container-test database.type="oracle" database.version="19.3.0.0.0" />
3801+
</target>
3802+
3803+
<target name="db-migration-container-sqlserver2019">
3804+
<run-db-migration-container-test database.type="sqlserver" database.version="2019" />
3805+
</target>
3806+
37103807
<target name="dist-jdk7">
37113808
<parallel threadCount="1" timeout="7200000">
37123809
<prepare-test-build-dist
@@ -9379,6 +9476,10 @@ ${output.content}</echo>
93799476
</exec>
93809477
</target>
93819478

9479+
<target name="prepare-test-environment">
9480+
<prepare-test-environment />
9481+
</target>
9482+
93829483
<target name="release-functional-smoke-tomcat-mysql57">
93839484
<antcall target="functional-tomcat-mysql57" />
93849485
</target>
@@ -9514,49 +9615,6 @@ information. Make sure to commit in all build REST results.
95149615
</run-batch-test>
95159616
</target>
95169617

9517-
<target name="ruby-sass-compiler">
9518-
<antcall if:set="env.JENKINS_HOME" inheritAll="false" target="clean-up-java-processes" />
9519-
9520-
<setup-test-environment />
9521-
9522-
<echo file="build.${user.name}.properties">sass.compiler.class.name=ruby</echo>
9523-
9524-
<antcall inheritAll="false" target="setup-sdk" />
9525-
9526-
<antcall inheritAll="false" target="setup-yarn" />
9527-
9528-
<record action="start" name="${project.dir}/sass-compiler-log" />
9529-
9530-
<gradle-execute dir="modules" task="buildCSS">
9531-
<arg value="-Dbuild.exclude.ant.plugin=true" />
9532-
</gradle-execute>
9533-
9534-
<record action="stop" name="${project.dir}/sass-compiler-log" />
9535-
9536-
<fail message="The Sass compiler is not using Ruby.">
9537-
<condition>
9538-
<and>
9539-
<not>
9540-
<resourcecontains
9541-
resource="${project.dir}/sass-compiler-log"
9542-
substring="Using Ruby Sass compiler"
9543-
/>
9544-
</not>
9545-
<or>
9546-
<resourcecontains
9547-
resource="${project.dir}/sass-compiler-log"
9548-
substring="Unable to load Ruby compiler, falling back to native"
9549-
/>
9550-
<resourcecontains
9551-
resource="${project.dir}/sass-compiler-log"
9552-
substring="Using native Sass compiler"
9553-
/>
9554-
</or>
9555-
</and>
9556-
</condition>
9557-
</fail>
9558-
</target>
9559-
95609618
<target name="semantic-versioning">
95619619
<run-batch-test>
95629620
<test-action>

‎build-test-local.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ local.bundles.backup.file=${liferay.home.parent.dir}/bundles-master-${git.commit
338338
<replaceregexp
339339
file="${project.dir}/test.properties"
340340
flags="g"
341-
match="(test\.batch\.names\[portal-release-acceptance\]=)\\(\n*.*?)*release-osgi-state-lpkg-test-mysql57"
341+
match="(test\.batch\.names\[portal-release-acceptance\]=)\\(\n*.*?)*release-osgi-state-lpkg-test-postgresql155"
342342
replace="\1{test.batch.names[portal-release-acceptance]}"
343343
/>
344344

@@ -352,7 +352,7 @@ local.bundles.backup.file=${liferay.home.parent.dir}/bundles-master-${git.commit
352352
<replacevalue><![CDATA[\
353353
functional-tomcat-postgresql163-jdk21_zulu,\
354354
modules-integration-postgresql163,\
355-
playwright-js-tomcat90-postgresql163]]></replacevalue>
355+
playwright-js-tomcat101-postgresql163]]></replacevalue>
356356
</replace>
357357
</then>
358358
<else>
@@ -362,7 +362,7 @@ local.bundles.backup.file=${liferay.home.parent.dir}/bundles-master-${git.commit
362362
<replacetoken><![CDATA[{test.batch.names[portal-release-acceptance]}]]></replacetoken>
363363
<replacevalue><![CDATA[\
364364
functional-tomcat-postgresql163-jdk21_zulu,\
365-
playwright-js-tomcat90-postgresql163]]></replacevalue>
365+
playwright-js-tomcat101-postgresql163]]></replacevalue>
366366
</replace>
367367
</else>
368368
</if>
@@ -397,7 +397,7 @@ local.bundles.backup.file=${liferay.home.parent.dir}/bundles-master-${git.commit
397397
file="${project.dir}/test.properties"
398398
>
399399
<replacetoken><![CDATA[test.batch.run.property.query[functional-tomcat*][portal-release-acceptance]=\]]></replacetoken>
400-
<replacevalue><![CDATA[playwright.projects.includes[playwright-js-tomcat90-postgresql163][portal-release-acceptance]=\
400+
<replacevalue><![CDATA[playwright.projects.includes[playwright-js-tomcat101-postgresql163][portal-release-acceptance]=\
401401
402402
test.batch.run.property.query[functional-tomcat-postgresql163-jdk21_zulu][portal-release-acceptance]=\]]></replacevalue>
403403
</replace>
@@ -505,7 +505,7 @@ local.bundles.backup.file=${liferay.home.parent.dir}/bundles-master-${git.commit
505505
<replaceregexp
506506
file="${project.dir}/test.properties"
507507
flags="g"
508-
match="(playwright\.projects\.includes\[playwright-js-tomcat90-postgresql163\]\[portal-release-acceptance\]=\\\n)"
508+
match="(playwright\.projects\.includes\[playwright-js-tomcat101-postgresql163\]\[portal-release-acceptance\]=\\\n)"
509509
replace="\1 ${testcase.file.name}.main,\\\\${line.separator}"
510510
/>
511511
</then>
@@ -715,7 +715,7 @@ database.db2.docker.image=${database.db2.docker.image}
715715
database.db2.host=localhost_db2
716716
database.db2.password=${database.db2.password}
717717
database.db2.schema=lportal
718-
database.db2.url=jdbc:db2://localhost:25010/lportal:deferPrepares=false;fullyMaterializeInputStreams=true;fullyMaterializeLobData=true;progresssiveLocators=2;progressiveStreaming=2;
718+
database.db2.url=jdbc:db2://localhost:25010/lportal:deferPrepares=false;fullyMaterializeInputStreams=true;fullyMaterializeLobData=true;progressiveLocators=2;progressiveStreaming=2;
719719
database.db2.username=${database.db2.username}
720720
database.db2.version=${database.version}
721721
database.type=db2

‎build-test-opensearch2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<project basedir="." name="portal-test-opensearch2" xmlns:antelope="antlib:ise.antelope.tasks" xmlns:if="ant:if" xmlns:unless="ant:unless">
44
<import file="build-test.xml" />
55

6-
<property name="opensearch.version" value="2.16.0" />
6+
<property name="opensearch.version" value="2.19.2" />
77
<property name="opensearch.analysis-icu.zip.url" value="https://artifacts.opensearch.org/releases/plugins/analysis-icu/${opensearch.version}/analysis-icu-${opensearch.version}.zip" />
88
<property name="opensearch.analysis-kuromoji.zip.url" value="https://artifacts.opensearch.org/releases/plugins/analysis-kuromoji/${opensearch.version}/analysis-kuromoji-${opensearch.version}.zip" />
99
<property name="opensearch.analysis-smartcn.zip.url" value="https://artifacts.opensearch.org/releases/plugins/analysis-smartcn/${opensearch.version}/analysis-smartcn-${opensearch.version}.zip" />

0 commit comments

Comments
 (0)