mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-07-27 18:42:43 +00:00
Code Issues Releases Wiki Activity

Upgrade to Jakarta EE 10 Servlet (#2362)

Browse Source 
Upgrade to using Jakarta EE 10 from Java EE 8 by mostly following the upgrade instructions. Only the servlet package is upgrade. Other Jakarta EE components (like the persistence package that Hibernate depends on) need to be upgraded separately.

TESTED=deployed and successfully communicated with the pubapi endpoint for web WHOIS.

Note that this currently requires packaing the App Engine runtime per instructions here due to GoogleCloudPlatform/appengine-java-standard#98. This PR will only be merged until the fix is deployed to production (https://rapid.corp.google.com/#/release/serverless_runtimes_run_java/java21_20240310_21_0).
This commit is contained in:
Lai Jiang
2024-03-18 18:00:55 +00:00
committed by GitHub
parent ff211fb4f9
commit e7bf74d91d
200 changed files with 389 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jetty/src/main/jetty-base/start.d/ee8-deploy.ini → jetty/src/main/jetty-base/start.d/ee10-deploy.ini
+4 -4
View File
@@ -1,14 +1,14 @@
# ---------------------------------------
# Module: ee8-deploy
# Module: ee10-deploy
# This module enables webapp deployment from the `$JETTY_BASE/webapps` directory.
# ---------------------------------------
--modules=ee8-deploy
--modules=ee10-deploy
## Monitored directory name (relative to $jetty.base)
# jetty.deploy.monitoredDir=webapps
## Defaults Descriptor for all deployed webapps
# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee8.xml
# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee10.xml
## Monitored directory scan period (seconds)
jetty.deploy.scanInterval=1
@@ -23,7 +23,7 @@ jetty.deploy.scanInterval=1
# jetty.deploy.configurationClasses=
## Pattern to select jars from the container classloader to be scanned (or null to scan no jars)
# jetty.deploy.containerScanJarPattern=.*/jetty-servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$
# jetty.deploy.containerScanJarPattern=.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$
## Pattern to select jars from the container classloader to be scanned (or null to scan all jars).
# jetty.deploy.webInfScanJarPattern=
jetty/src/main/jetty-base/webapps/nomulus.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
<Configure id="wac" class="org.eclipse.jetty.ee8.webapp.WebAppContext">
<Configure id="wac" class="org.eclipse.jetty.ee10.webapp.WebAppContext">
<Set name="contextPath">/</Set>
<Set name="war">./webapps/nomulus.war</Set>
</Configure>
jetty/src/main/webapp/WEB-INF/web.xml
+3 -4
View File
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<!-- Servlets -->
<!-- Servlet for injected frontend actions -->