From efa60de2138c0cad1172d3d3ed70a7d8cccba269 Mon Sep 17 00:00:00 2001 From: Wilson Kurniawan Date: Mon, 1 Apr 2024 00:33:05 +0800 Subject: [PATCH] Update Jetty to 12 --- build.gradle | 14 +++-- src/main/java/teammates/main/Application.java | 4 +- .../architecture/ArchitectureTest.java | 1 - .../test/MockHttpServletRequest.java | 52 ++++++------------- .../test/MockHttpServletResponse.java | 15 ------ 5 files changed, 28 insertions(+), 58 deletions(-) diff --git a/build.gradle b/build.gradle index 402122b4bfc5..6188ec3be770 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,7 @@ repositories { def objectify = "com.googlecode.objectify:objectify:6.0.7" def testng = "org.testng:testng:7.10.0" +def jettyVersion = "12.0.8" dependencies { staticAnalysis("com.puppycrawl.tools:checkstyle:${checkstyleVersion}") @@ -75,12 +76,17 @@ dependencies { implementation("com.sun.jersey:jersey-client:1.19.4") implementation("com.sun.jersey:jersey-core:1.19.4") implementation("com.sun.jersey.contribs:jersey-multipart:1.19.4") - implementation("org.apache.solr:solr-solrj:8.11.3") - implementation(platform("org.eclipse.jetty:jetty-bom:11.0.20")) + implementation("org.apache.solr:solr-solrj:8.11.3") { + exclude group: "org.eclipse.jetty.http2", module: "http2-client" + exclude group: "org.eclipse.jetty.http2", module: "http2-common" + exclude group: "org.eclipse.jetty.http2", module: "http2-hpack" + exclude group: "org.eclipse.jetty.http2", module: "http2-http-client-transport" + } + implementation(platform("org.eclipse.jetty:jetty-bom:${jettyVersion}")) implementation("org.eclipse.jetty:jetty-slf4j-impl") implementation("org.eclipse.jetty:jetty-server") - implementation("org.eclipse.jetty:jetty-webapp") - implementation("org.eclipse.jetty:jetty-annotations") + implementation("org.eclipse.jetty.ee10:jetty-ee10-webapp:${jettyVersion}") + implementation("org.eclipse.jetty.ee10:jetty-ee10-annotations:${jettyVersion}") implementation("org.jsoup:jsoup:1.17.2") implementation("org.hibernate.orm:hibernate-core:6.4.4.Final") implementation("org.postgresql:postgresql:42.7.3") diff --git a/src/main/java/teammates/main/Application.java b/src/main/java/teammates/main/Application.java index ebca9447363b..de06e5bc5443 100644 --- a/src/main/java/teammates/main/Application.java +++ b/src/main/java/teammates/main/Application.java @@ -3,10 +3,10 @@ import java.io.File; import java.time.zone.ZoneRulesProvider; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.webapp.WebAppContext; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.webapp.WebAppContext; import teammates.common.util.Config; import teammates.common.util.Logger; diff --git a/src/test/java/teammates/architecture/ArchitectureTest.java b/src/test/java/teammates/architecture/ArchitectureTest.java index 8900ea078d5a..b8bb1c3be0a3 100644 --- a/src/test/java/teammates/architecture/ArchitectureTest.java +++ b/src/test/java/teammates/architecture/ArchitectureTest.java @@ -527,7 +527,6 @@ public void testArchitecture_externalApi_objectifyApiCanOnlyBeAccessedBySomePack .and().resideOutsideOfPackage(includeSubpackages(CLIENT_SCRIPTS_PACKAGE)) .and().doNotHaveSimpleName("BaseTestCaseWithSqlDatabaseAccess") .and().doNotHaveSimpleName("BaseTestCaseWithLocalDatabaseAccess") - .and().doNotHaveSimpleName("ObjectifyFilter") .should().accessClassesThat().resideInAPackage("com.googlecode.objectify..") .check(ALL_CLASSES); } diff --git a/src/test/java/teammates/test/MockHttpServletRequest.java b/src/test/java/teammates/test/MockHttpServletRequest.java index e66396d1c5d8..6419c95ff888 100644 --- a/src/test/java/teammates/test/MockHttpServletRequest.java +++ b/src/test/java/teammates/test/MockHttpServletRequest.java @@ -16,6 +16,7 @@ import jakarta.servlet.AsyncContext; import jakarta.servlet.DispatcherType; import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletInputStream; import jakarta.servlet.ServletRequest; @@ -24,7 +25,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; -import jakarta.servlet.http.HttpSessionContext; import jakarta.servlet.http.HttpUpgradeHandler; import jakarta.servlet.http.Part; @@ -209,51 +209,26 @@ public int getMaxInactiveInterval() { return 0; } - @Override - public HttpSessionContext getSessionContext() { - return null; - } - @Override public Object getAttribute(String name) { return null; } - @Override - public Object getValue(String name) { - return null; - } - @Override public Enumeration getAttributeNames() { return null; } - @Override - public String[] getValueNames() { - return new String[0]; - } - @Override public void setAttribute(String name, Object value) { // not used } - @Override - public void putValue(String name, Object value) { - // not used - } - @Override public void removeAttribute(String name) { // not used } - @Override - public void removeValue(String name) { - // not used - } - @Override public void invalidate() { // not used @@ -286,11 +261,6 @@ public boolean isRequestedSessionIdFromURL() { return false; } - @Override - public boolean isRequestedSessionIdFromUrl() { - return false; - } - @Override public boolean authenticate(HttpServletResponse httpServletResponse) { return false; @@ -478,11 +448,6 @@ public void include(ServletRequest request, ServletResponse response) { }; } - @Override - public String getRealPath(String s) { - return null; - } - @Override public int getRemotePort() { return 0; @@ -538,4 +503,19 @@ public DispatcherType getDispatcherType() { return null; } + @Override + public String getRequestId() { + return null; + } + + @Override + public String getProtocolRequestId() { + return null; + } + + @Override + public ServletConnection getServletConnection() { + return null; + } + } diff --git a/src/test/java/teammates/test/MockHttpServletResponse.java b/src/test/java/teammates/test/MockHttpServletResponse.java index 508d584e4070..789728555556 100644 --- a/src/test/java/teammates/test/MockHttpServletResponse.java +++ b/src/test/java/teammates/test/MockHttpServletResponse.java @@ -46,16 +46,6 @@ public String encodeRedirectURL(String url) { return null; } - @Override - public String encodeUrl(String url) { - return null; - } - - @Override - public String encodeRedirectUrl(String url) { - return null; - } - @Override public void sendError(int sc, String msg) { // not used @@ -110,11 +100,6 @@ public void setStatus(int sc) { this.statusCode = sc; } - @Override - public void setStatus(int sc, String sm) { - this.statusCode = sc; - } - @Override public int getStatus() { return this.statusCode;