Skip to content

Commit ccaa165

Browse files
committed
feat: upgrade Jetty to v12
1 parent 691b673 commit ccaa165

File tree

5 files changed

+44
-13
lines changed

5 files changed

+44
-13
lines changed

pom.xml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<maven.dependency.log4j.version>2.25.2</maven.dependency.log4j.version>
2525
<maven.dependency.sentry.version>8.26.0</maven.dependency.sentry.version>
2626
<maven.dependency.mockito.version>5.20.0</maven.dependency.mockito.version>
27+
<maven.dependency.jetty.version>12.1.4</maven.dependency.jetty.version>
2728

2829
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2930
<maven.assembly.mainClass>de.l3s.maintenance.resources.ReindexResources</maven.assembly.mainClass>
@@ -465,16 +466,27 @@
465466
</plugin>
466467
<!-- Can be used to run the application without Tomcat server -->
467468
<plugin>
468-
<groupId>org.eclipse.jetty</groupId>
469-
<artifactId>jetty-maven-plugin</artifactId>
470-
<version>11.0.26</version>
469+
<groupId>org.eclipse.jetty.ee11</groupId>
470+
<artifactId>jetty-ee11-maven-plugin</artifactId>
471+
<version>${maven.dependency.jetty.version}</version>
472+
<dependencies>
473+
<dependency>
474+
<groupId>org.eclipse.jetty.ee11</groupId>
475+
<artifactId>jetty-ee11-cdi</artifactId>
476+
<version>${maven.dependency.jetty.version}</version>
477+
</dependency>
478+
</dependencies>
471479
<configuration>
472-
<!-- see https://www.eclipse.org/jetty/documentation/jetty-11/programming-guide/index.html#pg-configuration-6 -->
480+
<!-- see https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#jetty-run-goal -->
473481
<webApp>
474482
<contextPath>/</contextPath>
475-
<jettyEnvXml>src/main/conf/jetty-env.xml</jettyEnvXml>
483+
<overrideDescriptor>src/main/conf/jetty-override-web.xml</overrideDescriptor>
476484
</webApp>
477-
<scan>5</scan>
485+
<scan>3</scan>
486+
<httpConnector>
487+
<port>7050</port>
488+
<idleTimeout>60000</idleTimeout>
489+
</httpConnector>
478490
</configuration>
479491
</plugin>
480492
<!-- Can be used to create JAR archive and set specific class as entry point -->

src/main/conf/jetty-env.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="https://jakarta.ee/xml/ns/jakartaee"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"
5+
version="6.1">
6+
7+
<context-param>
8+
<param-name>jakarta.faces.PROJECT_STAGE</param-name>
9+
<param-value>Development</param-value>
10+
</context-param>
11+
12+
<context-param>
13+
<param-name>org.omnifaces.VERSIONED_RESOURCE_HANDLER_VERSION</param-name>
14+
<param-value>dev</param-value>
15+
</context-param>
16+
17+
<context-param>
18+
<param-name>org.eclipse.jetty.servlet.Default.welcomeServlets</param-name>
19+
<param-value>true</param-value>
20+
</context-param>
21+
22+
</web-app>

src/main/java/de/l3s/learnweb/web/RequestFilter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ protected void doFilter(final HttpServletRequest request, final HttpServletRespo
5353

5454
// validate ip address
5555
String ipAddr = Servlets.getRemoteAddr(request);
56+
ipAddr = ipAddr.startsWith("[") && ipAddr.endsWith("]") ? ipAddr.substring(1, ipAddr.length() - 1) : ipAddr;
5657
if (!InetAddresses.isInetAddress(ipAddr)) {
5758
/*
5859
* This rule should ban threats like:

src/main/webapp/WEB-INF/templates/layout/parts/footer.xhtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
<footer class="layout-footer bg-body-secondary text-body-secondary">
77
<div class="container p-3">
8-
<a href="#{request.contextPath}/lw/imprint.jsf">#{msg['imprint.title']}</a> -
9-
<a href="#{request.contextPath}/lw/privacy_statement.jsf">#{msg['privacy_statement']}</a> -
10-
<a href="#{request.contextPath}/lw/contact.jsf">#{msg['contact']}</a> -
8+
<h:link outcome="/lw/imprint" value="#{msg['imprint.title']}"/> -
9+
<h:link outcome="/lw/privacy_statement" value="#{msg['privacy_statement']}"/> -
10+
<h:link outcome="/lw/contact" value="#{msg['contact']}"/> -
1111
<h:outputFormat value="#{msg.index_footer_text}"><f:param value="#{config.appName}"/></h:outputFormat>
1212
</div>
1313
</footer>

0 commit comments

Comments
 (0)