Jdk17 all in one

.classpath

@@ -32,7 +32,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/development/activation.jar"/>
 	<classpathentry kind="lib" path="lib/development/alloy-taglib.jar"/>
-	<classpathentry kind="lib" path="lib/development/annotations.jar"/>
 	<classpathentry kind="lib" path="lib/development/ant-apache-bsf.jar"/>
 	<classpathentry kind="lib" path="lib/development/ant-compress.jar"/>
 	<classpathentry kind="lib" path="lib/development/ant-contrib.jar"/>
@@ -74,14 +73,12 @@
 	<classpathentry kind="lib" path="lib/development/jacocoreport.jar"/>
 	<classpathentry kind="lib" path="lib/development/jalopy.jar"/>
 	<classpathentry kind="lib" path="lib/development/jargs.jar"/>
-	<classpathentry kind="lib" path="lib/development/jasper.jar"/>
 	<classpathentry kind="lib" path="lib/development/jaxb-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/jbi_rt.jar"/>
 	<classpathentry kind="lib" path="lib/development/jhighlight.jar"/>
 	<classpathentry kind="lib" path="lib/development/jndi.jar"/>
 	<classpathentry kind="lib" path="lib/development/jsch.jar"/>
 	<classpathentry kind="lib" path="lib/development/jsonassert.jar"/>
-	<classpathentry kind="lib" path="lib/development/jsp-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/jstl-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/jstl-impl.jar"/>
 	<classpathentry kind="lib" path="lib/development/junit.jar"/>
@@ -105,7 +102,6 @@
 	<classpathentry kind="lib" path="lib/development/reflections.jar"/>
 	<classpathentry kind="lib" path="lib/development/saxpath.jar"/>
 	<classpathentry kind="lib" path="lib/development/sdk-addon-api-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/development/servlet-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/slf4j-simple.jar"/>
 	<classpathentry kind="lib" path="lib/development/sling-commons-osgi.jar"/>
 	<classpathentry kind="lib" path="lib/development/sling-testing-osgi-mock-core.jar"/>
@@ -115,14 +111,21 @@
 	<classpathentry kind="lib" path="lib/development/spring-instrument-tomcat.jar"/>
 	<classpathentry kind="lib" path="lib/development/spring-test.jar"/>
 	<classpathentry kind="lib" path="lib/development/tlddoc.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-annotations-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/tomcat-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/tomcat-coyote.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-el-api.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-jasper-el.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-jasper.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-jsp-api.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-juli.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-servlet-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/tomcat-tribes.jar"/>
 	<classpathentry kind="lib" path="lib/development/tomcat-util-scan.jar"/>
 	<classpathentry kind="lib" path="lib/development/tomcat-util.jar"/>
+	<classpathentry kind="lib" path="lib/development/tomcat-websocket-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/velocity.jar"/>
 	<classpathentry kind="lib" path="lib/development/velocity-tools.jar"/>
-	<classpathentry kind="lib" path="lib/development/websocket-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/xmlresolver.jar"/>
 	<classpathentry kind="lib" path="lib/development/xmltask.jar"/>
 	<classpathentry kind="lib" path="lib/portal/commons-configuration.jar"/>
@@ -160,7 +163,6 @@
 	<classpathentry kind="lib" path="lib/portal/spring-web.jar"/>
 	<classpathentry kind="lib" path="lib/portal/stax-ex.jar"/>
 	<classpathentry kind="lib" path="lib/portal/transaction.jar"/>
-	<classpathentry kind="lib" path="lib/portal/wstx.jar"/>
 	<classpathentry kind="lib" path="lib/portal/xercesImpl.jar"/>
 	<classpathentry kind="lib" path="lib/portal/xml-apis.jar"/>
 	<classpathentry kind="output" path="bin"/>

build-common-java.xml

@@ -48,7 +48,9 @@
 			encoding="${javac.encoding}"
 			includeAntRuntime="false"
 			nowarn="${javac.nowarn}"
+			source="${ant.build.javac.source}"
 			srcdir="${javac.srcdir}"
+			target="${ant.build.javac.target}"
 		/>
 
 		<echo file="${javac.destdir}/.touch"></echo>

build-common.xml

@@ -82,7 +82,7 @@
 		<pathelement path="${classpath.full}" />
 		<fileset
 			dir="${project.dir}/lib/development"
-			includes="osgi-annotation-versioning.jar,osgi-core.jar,jsp-api.jar,mail.jar,servlet-api.jar"
+			includes="osgi-annotation-versioning.jar,osgi-core.jar,tomcat-jsp-api.jar,mail.jar,tomcat-servlet-api.jar"
 		/>
 		<fileset
 			dir="${project.dir}/lib/portal"
@@ -459,7 +459,9 @@ information.
 						encoding="${javac.encoding}"
 						includeAntRuntime="false"
 						nowarn="${javac.nowarn}"
+						source="${ant.build.javac.source}"
 						srcdir="test/@{test.type}"
+						target="${ant.build.javac.target}"
 					/>
 				</then>
 			</if>
@@ -1853,7 +1855,7 @@ artifact.url=${remote.repository.cdn.url}/com/liferay/portal/com.liferay.${proce
 				<path refid="lib.pre.classpath" />
 				<fileset
 					dir="${project.dir}/lib/development"
-					excludes="jalopy.jar,tomcat*.jar"
+					excludes="jalopy.jar"
 					includes="*.jar"
 				/>
 				<fileset
@@ -2162,6 +2164,8 @@ 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.override" key="java.version.override" unless:blank="${build.java.version.override}" value="${build.java.version.override}" />
+				<entry if:set="build.java.version.override.include.dirs" key="java.version.override.include.dirs" unless:blank="${build.java.version.override.include.dirs}" value="${build.java.version.override.include.dirs}" />
 				<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="${java.installation.paths.override}" />

build-test-solr.xml

@@ -43,19 +43,10 @@ CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.trustStore=${solr.dir}/serv
 "com.liferay.portal.search.elasticsearch.monitoring.web",\
 "com.liferay.portal.search.elasticsearch7.api",\
 "com.liferay.portal.search.elasticsearch7.impl",\
-"com.liferay.portal.search.tuning.rankings.api",\
-"com.liferay.portal.search.tuning.rankings.web",\
 "com.liferay.portal.search.tuning.synonyms.api",\
 "com.liferay.portal.search.tuning.synonyms.web",\
 "com.liferay.portal.search.tuning.web",\
-"com.liferay.portal.search.tuning.web.api",\
-"com.liferay.search.experiences.api",\
-"com.liferay.search.experiences.lang",\
-"com.liferay.search.experiences.rest.api",\
-"com.liferay.search.experiences.rest.client",\
-"com.liferay.search.experiences.rest.impl",\
-"com.liferay.search.experiences.service",\
-"com.liferay.search.experiences.web"\
+"com.liferay.portal.search.tuning.web.api"\
 ]</echo>
 				</else>
 			</if>
@@ -93,19 +84,6 @@ trustStorePath="${solr.dir}/server/etc/solr-ssl.keystore.jks"</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="configure-portal-properties">
-		<sequential>
-			<if>
-				<isset property="env.TEST_PORTAL_RELEASE_VERSION" />
-				<then>
-					<echo append="true" file="${app.server.classes.portal.dir}/portal-ext.properties">
-
-enterprise.product.enterprise.search.enabled=false</echo>
-				</then>
-			</if>
-		</sequential>
-	</macrodef>
-
 	<macrodef name="configure-solr-ssl-properties">
 		<sequential>
 			<if>
@@ -377,8 +355,6 @@ schema=schema.xml</echo>
 
 		<configure-liferay-solr-adapter-osgi-configs />
 
-		<configure-portal-properties />
-
 		<get-testcase-property property.name="solr.ssl.authentication.enabled" />
 
 		<if>

build-test.xml

@@ -569,19 +569,34 @@ module.framework.properties.osgi.console=11312</echo>
 						<![CDATA[
 							#!/bin/bash
 
-							mysqldump \
-								--compact \
-								--no-data \
-								--order-by-primary \
-								--password=${database.mysql.password} \
-								--skip-comments \
-								--skip-extended-insert \
-								--user=${database.mysql.username} \
-								--default-character-set=utf8 \
-								--databases ${database.schema.name} > \
-								${docker.src.file.path}
-
-							sed -i "s/Warning: Using a password on the command line interface can be insecure.//g" ${docker.src.file.path}
+							function get_modifiable_system_object_definition_table_names() {
+								mysql --execute="SHOW TABLES" --password=${database.mysql.password} --user=${database.mysql.username} ${database.schema.name} | grep -E '^L_[0-9]+_'
+							}
+
+							function main {
+								local ignore_table_argument="";
+
+								while IFS= read -r table; do
+									ignore_table_argument+=" --ignore-table=${database.schema.name}.$table"
+								done < <(get_modifiable_system_object_definition_table_names)
+
+								mysqldump \
+									--compact \
+									--databases ${database.schema.name} \
+									--default-character-set=utf8 \
+									${ignore_table_argument} \
+									--no-data \
+									--order-by-primary \
+									--password=${database.mysql.password} \
+									--skip-comments \
+									--skip-extended-insert \
+									--user=${database.mysql.username} \
+									> ${docker.src.file.path}
+
+								sed -i "s/Warning: Using a password on the command line interface can be insecure.//g" ${docker.src.file.path}
+							}
+
+							main
 						]]>
 					</echo>
 

build.properties

@@ -319,12 +319,15 @@
     #    util/portal-tools-db-schema-importer,\
     #    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=17
-    #build.java.version.target.compatibility=17
-    #build.java.version.source.compatibility=21
-    #build.java.version.target.compatibility=21
+    #
+    # Set the the module directories to include that will use the override Java
+    # version to generate classes.
+    #
+    #build.java.version.override=1.8
+    #build.java.version.override.include.dirs=
+
+    build.java.version.source.compatibility=17
+    build.java.version.target.compatibility=17
     build.marketplace.apps.enabled=true
     build.patcher.hotfix.dirs=
     build.patcher.hotfix.qualifier=
@@ -343,8 +346,8 @@
 ## Compiler
 ##
 
-    ant.build.javac.source=1.8
-    ant.build.javac.target=1.8
+    ant.build.javac.source=17
+    ant.build.javac.target=17
 
     #javac.compiler=com.google.errorprone.ErrorProneAntCompilerAdapter
     javac.compiler=modern

ci.properties

@@ -12,7 +12,6 @@ ci.test.auto.recipients=\
     liferay-frontend[sf],\
     liferay-headless[sf],\
     liferay-objects[sf],\
-    liferay-page-management[sf],\
     liferay-site-management[sf],\
     liferay-staging[sf],\
     liferay-uniform[sf],\
@@ -140,8 +139,6 @@ ci.test.available.suites=\
     onedrive,\
     online-editing,\
     page-management,\
-    page-management-acceptance,\
-    page-management-db-partition,\
     page-management-playwright,\
     password-policies,\
     platform-experience,\
@@ -193,8 +190,6 @@ ci.test.available.suites=\
     site-management,\
     site-template,\
     smoke,\
-    solutions-acceptance,\
-    solutions-upgrade,\
     stable,\
     startup,\
     sybase,\
@@ -237,14 +232,12 @@ ci.test.available.suites[test-portal-release]=\
     portal-release-functional,\
     portal-release-headless-acceptance,\
     portal-release-object,\
-    portal-release-page-management-acceptance,\
     portal-release-playwright,\
     portal-release-publications,\
     portal-release-search,\
     portal-release-security,\
     portal-release-site-management,\
     portal-release-smoke,\
-    portal-release-solutions-acceptance,\
     portal-release-tomcat,\
     portal-release-workflow
 
@@ -351,8 +344,6 @@ ci.test.suite.description[oidc]=Test OpenID Connect tests.
 ci.test.suite.description[onedrive]=Test OneDrive tests.
 ci.test.suite.description[online-editing]=Test Online Editing tests.
 ci.test.suite.description[page-management]=Test all Page Management team tests.
-ci.test.suite.description[page-management-acceptance]=Test Page Management team acceptance tests.
-ci.test.suite.description[page-management-db-partition]=Test Page Management team acceptance tests with Database Partitioning.
 ci.test.suite.description[page-management-playwright]=Test Page Management team playwright tests.
 ci.test.suite.description[password-policies]=Test Password Policies tests.
 ci.test.suite.description[platform-experience]=Test Platform Experience team tests.
@@ -398,7 +389,6 @@ ci.test.suite.description[sharing]=Test Asset Sharing tests.
 ci.test.suite.description[site-management]=Test Site Management tests.
 ci.test.suite.description[site-template]=Test Site Template tests.
 ci.test.suite.description[smoke]=Run smoke test with all available configurations in PortalSmoke.testcase
-ci.test.suite.description[solutions-acceptance]=Test Solutions acceptance tests.
 ci.test.suite.description[startup]=Test Portal startup.
 ci.test.suite.description[sybase]=Test functional and integration tests on Sybase database.
 ci.test.suite.description[system]=Test functional and integration tests for System Management (Virtual Instances, System Settings, Instance Settings)

common.bnd

@@ -13,6 +13,9 @@ Liferay-Portal-Release-Info: ${release.info.release.info}
 Liferay-Portal-Server-Info: ${release.info.server.info}
 Liferay-Portal-Version: ${release.info.version}
 Liferay-Portal-Version-Display-Name: ${release.info.version.display.name}
+Require-Capability:\
+	osgi.ee;\
+		filter:="(&(osgi.ee=JavaSE)(version=${ant.build.javac.target}))"
 -donotcopy: (\.touch)
 -fixupmessages.deprecated=annotations are deprecated
 -sources: false

lib/.gitignore

@@ -1,6 +1,5 @@
 /development/activation.jar
 /development/alloy-taglib.jar
-/development/annotations.jar
 /development/ant-apache-bsf.jar
 /development/ant-compress.jar
 /development/asm-commons.jar
@@ -40,14 +39,12 @@
 /development/jacocoreport.jar
 /development/jalopy.jar
 /development/jargs.jar
-/development/jasper.jar
 /development/jaxb-api.jar
 /development/jbi_rt.jar
 /development/jhighlight.jar
 /development/jndi.jar
 /development/jsch.jar
 /development/jsonassert.jar
-/development/jsp-api.jar
 /development/jstl-api.jar
 /development/jstl-impl.jar
 /development/junit.jar
@@ -74,7 +71,6 @@
 /development/reflections.jar
 /development/saxpath.jar
 /development/sdk-addon-api-0.2.jar
-/development/servlet-api.jar
 /development/slf4j-simple.jar
 /development/sling-commons-osgi.jar
 /development/sling-testing-osgi-mock-core.jar
@@ -84,14 +80,21 @@
 /development/spring-instrument.jar
 /development/spring-test.jar
 /development/tlddoc.jar
+/development/tomcat-annotations-api.jar
 /development/tomcat-api.jar
 /development/tomcat-coyote.jar
+/development/tomcat-el-api.jar
+/development/tomcat-jasper-el.jar
+/development/tomcat-jasper.jar
+/development/tomcat-jsp-api.jar
+/development/tomcat-juli.jar
+/development/tomcat-servlet-api.jar
 /development/tomcat-tribes.jar
 /development/tomcat-util-scan.jar
 /development/tomcat-util.jar
+/development/tomcat-websocket-api.jar
 /development/velocity-tools.jar
 /development/velocity.jar
-/development/websocket-api.jar
 /development/xmlresolver.jar
 /portal/activation.jar
 /portal/commons-configuration.jar
@@ -132,6 +135,5 @@
 /portal/spring-web.jar
 /portal/stax-ex.jar
 /portal/transaction.jar
-/portal/wstx.jar
 /portal/xercesImpl.jar
 /portal/xml-apis.jar