Skip to content

Commit

Permalink
Merge pull request #492 from JoyOfCodingPDX/issue-404/jetty-11
Browse files Browse the repository at this point in the history
Use Jetty 11 (and the jakarta.servlet APIs).
  • Loading branch information
DavidWhitlock authored Nov 29, 2024
2 parents 98f5c42 + 9ce2ae9 commit a2bde47
Show file tree
Hide file tree
Showing 67 changed files with 227 additions and 212 deletions.
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
<maven.compiler.target>17</maven.compiler.target>

<guava.version>33.3.1-jre</guava.version>
<guice.version>5.1.0</guice.version>
<guice.version>7.0.0</guice.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -74,7 +75,7 @@
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<jetty-maven-plugin.version>10.0.24</jetty-maven-plugin.version>
<jetty-maven-plugin.version>11.0.24</jetty-maven-plugin.version>
<spotbugs-maven-plugin.version>4.8.6.6</spotbugs-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>airline-web-archetype</artifactId>
<version>2.3.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>

<name>airline-web-archetype</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="airline-web"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 https://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="airline-web"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>

<properties>
<jetty.http.port>8080</jetty.http.port>
</properties>

<packaging>war</packaging>
<version>${version}</version>
<name>Airline Web/REST Project</name>
<url>http://maven.apache.org</url>
<dependencies>
Expand All @@ -36,9 +36,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import com.google.common.annotations.VisibleForTesting;
import edu.pdx.cs.joy.ParserException;
import edu.pdx.cs.joy.web.HttpRequestHelper;
import edu.pdx.cs.joy.web.HttpRequestHelper.Response;

import java.io.IOException;
import java.io.StringReader;
import java.util.Map;

import static edu.pdx.cs.joy.web.HttpRequestHelper.Response;
import static edu.pdx.cs.joy.web.HttpRequestHelper.RestException;
import static edu.pdx.cs.joy.web.HttpRequestHelper.*;
import static java.net.HttpURLConnection.HTTP_OK;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import com.google.common.annotations.VisibleForTesting;

import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<%@ page contentType="text/plain;charset=UTF-8" language="java" isErrorPage="true" %>
<%out.println( request.getAttribute("javax.servlet.error.message") );%>
<%out.println( request.getAttribute("jakarta.servlet.error.message") );%>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

/**
* A unit test for the REST client that demonstrates using mocks and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Sat Dec 05 20:02:17 PST 2015
#Fri Nov 29 09:22:12 PST 2024
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
version=0.1-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>apptbook-web-archetype</artifactId>
<version>2.3.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>

<name>apptbook-web-archetype</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="apptbook-web"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 https://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="apptbook-web"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>

<properties>
<jetty.http.port>8080</jetty.http.port>
</properties>

<packaging>war</packaging>
<version>${version}</version>
<name>Appointment Book Web/REST Project</name>
<url>http://maven.apache.org</url>
<dependencies>
Expand All @@ -36,9 +36,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ void test4EmptyWordThrowsException() {
AppointmentBookRestClient client = newAppointmentBookRestClient();
String emptyString = "";

RestException ex =
assertThrows(RestException.class, () -> client.addDictionaryEntry(emptyString, emptyString));
RestException ex = assertThrows(RestException.class, () -> client.addDictionaryEntry(emptyString, emptyString));
assertThat(ex.getHttpStatusCode(), equalTo(HttpURLConnection.HTTP_PRECON_FAILED));
assertThat(ex.getMessage(), containsString(Messages.missingRequiredParameter(AppointmentBookServlet.WORD_PARAMETER))); }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
package ${package};

import com.google.common.annotations.VisibleForTesting;
import edu.pdx.cs.joy.ParserException;
import edu.pdx.cs.joy.web.HttpRequestHelper;
import edu.pdx.cs.joy.ParserException;
import edu.pdx.cs.joy.web.HttpRequestHelper.Response;
import edu.pdx.cs.joy.web.HttpRequestHelper.RestException;

import java.io.IOException;
import java.io.StringReader;
import java.util.Map;

import static edu.pdx.cs.joy.web.HttpRequestHelper.Response;
import static edu.pdx.cs.joy.web.HttpRequestHelper.RestException;
import static java.net.HttpURLConnection.HTTP_OK;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import com.google.common.annotations.VisibleForTesting;

import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<%@ page contentType="text/plain;charset=UTF-8" language="java" isErrorPage="true" %>
<%out.println( request.getAttribute("javax.servlet.error.message") );%>
<%out.println( request.getAttribute("jakarta.servlet.error.message") );%>
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Mon Nov 22 19:43:39 PST 2021
#Fri Nov 29 10:10:43 PST 2024
package=it.pkg
groupId=archetype.it
artifactId=basic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>phonebill-web-archetype</artifactId>
<version>2.3.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>

<name>phonebill-web-archetype</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="phonebill-web"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 https://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="phonebill-web"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>joy</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
Expand All @@ -8,15 +8,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>

<properties>
<jetty.http.port>8080</jetty.http.port>
</properties>

<packaging>war</packaging>
<version>${version}</version>
<name>Phone Bill Web/REST Project</name>
<url>http://maven.apache.org</url>
<url>https://maven.apache.org</url>

<dependencies>
<dependency>
Expand All @@ -37,9 +37,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ void test4EmptyWordThrowsException() {
PhoneBillRestClient client = newPhoneBillRestClient();
String emptyString = "";

RestException ex =
assertThrows(RestException.class, () -> client.addDictionaryEntry(emptyString, emptyString));
RestException ex = assertThrows(RestException.class, () -> client.addDictionaryEntry(emptyString, emptyString));
assertThat(ex.getHttpStatusCode(), equalTo(HttpURLConnection.HTTP_PRECON_FAILED));
assertThat(ex.getMessage(), containsString(Messages.missingRequiredParameter(PhoneBillServlet.WORD_PARAMETER)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import com.google.common.annotations.VisibleForTesting;
import edu.pdx.cs.joy.ParserException;
import edu.pdx.cs.joy.web.HttpRequestHelper;
import edu.pdx.cs.joy.web.HttpRequestHelper.Response;
import edu.pdx.cs.joy.web.HttpRequestHelper.RestException;

import java.io.IOException;
import java.io.StringReader;
import java.util.Map;

import static edu.pdx.cs.joy.web.HttpRequestHelper.Response;
import static edu.pdx.cs.joy.web.HttpRequestHelper.RestException;
import static java.net.HttpURLConnection.HTTP_OK;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import com.google.common.annotations.VisibleForTesting;

import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package ${package};

import edu.pdx.cs.joy.ParserException;
import edu.pdx.cs.joy.web.HttpRequestHelper;

import java.io.IOException;
import java.io.PrintStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<%@ page contentType="text/plain;charset=UTF-8" language="java" isErrorPage="true" %>
<%out.println( request.getAttribute("javax.servlet.error.message") );%>
<%out.println( request.getAttribute("jakarta.servlet.error.message") );%>
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import edu.pdx.cs.joy.ParserException;
import edu.pdx.cs.joy.web.HttpRequestHelper;
import edu.pdx.cs.joy.web.HttpRequestHelper.Response;
import org.junit.jupiter.api.Test;

import java.io.IOException;
Expand All @@ -31,10 +32,10 @@ void getAllDictionaryEntriesPerformsHttpGetWithNoParameters() throws ParserExcep
assertThat(client.getAllDictionaryEntries(), equalTo(dictionary));
}

private HttpRequestHelper.Response dictionaryAsText(Map<String, String> dictionary) {
private Response dictionaryAsText(Map<String, String> dictionary) {
StringWriter writer = new StringWriter();
new TextDumper(writer).dump(dictionary);

return new HttpRequestHelper.Response(writer.toString());
return new Response(writer.toString());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Fri Nov 27 15:58:35 PST 2015
#Fri Nov 29 10:23:40 PST 2024
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
version=0.1-SNAPSHOT
Loading

0 comments on commit a2bde47

Please sign in to comment.