Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Jetty from 9.4.48.v20220622 to 10.0.11 #305

Merged
merged 1 commit into from Jun 30, 2022
Merged

Bump Jetty from 9.4.48.v20220622 to 10.0.11 #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/dependabot.yml
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@ updates:
# it would be good to update it at some point, but requires significant testing
- dependency-name: "org.codehaus.groovy:groovy-all"
versions: [">=2.5.0"]
# Must remain within Jetty 9.x until Java 8 support is removed; ignore Jetty 10.x and Jetty 11.x updates
# Must remain within Jetty 10.x until the Jakarta migration is complete; ignore Jetty 11.x updates
- dependency-name: "org.eclipse.jetty:*"
versions: [">=10.0.0"]
versions: [">=11.0.0"]
# Provided by the Web container, so aligned with Jetty.
- dependency-name: "javax.servlet:javax.servlet-api"
- dependency-name: "jakarta.servlet:jakarta.servlet-api"
6 changes: 3 additions & 3 deletions core/pom.xml
View file
Open in desktop
Expand Up @@ -106,9 +106,9 @@
<version>9.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

<scope>provided</scope>
</dependency>
<dependency>
Expand Down
42 changes: 37 additions & 5 deletions core/src/test/java/org/kohsuke/stapler/MockServletContext.java
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ public String getMimeType(String file) {
}

@Override
public Set getResourcePaths(String s) {
public Set<String> getResourcePaths(String s) {
return null;
}

Expand Down Expand Up @@ -76,12 +76,12 @@ public Servlet getServlet(String name) throws ServletException {
}

@Override
public Enumeration getServlets() {
public Enumeration<Servlet> getServlets() {
return null;
}

@Override
public Enumeration getServletNames() {
public Enumeration<String> getServletNames() {
return null;
}

Expand Down Expand Up @@ -113,7 +113,7 @@ public String getInitParameter(String name) {
}

@Override
public Enumeration getInitParameterNames() {
public Enumeration<String> getInitParameterNames() {
return null;
}

Expand All @@ -123,7 +123,7 @@ public Object getAttribute(String name) {
}

@Override
public Enumeration getAttributeNames() {
public Enumeration<String> getAttributeNames() {
return null;
}

Expand Down Expand Up @@ -175,6 +175,11 @@ public Dynamic addServlet(String servletName, Class<? extends Servlet> servletCl
return null;
}

@Override
public Dynamic addJspFile(String servletName, String jspFile) {
return null;
}

@Override
public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
return null;
Expand Down Expand Up @@ -275,4 +280,31 @@ public void declareRoles(String... roleNames) {
public String getVirtualServerName() {
return null;
}

@Override
public int getSessionTimeout() {
return 0;
}

@Override
public void setSessionTimeout(int sessionTimeout) {
}

@Override
public String getRequestCharacterEncoding() {
return null;
}

@Override
public void setRequestCharacterEncoding(String encoding) {
}

@Override
public String getResponseCharacterEncoding() {
return null;
}

@Override
public void setResponseCharacterEncoding(String encoding) {
}
}
5 changes: 5 additions & 0 deletions core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
View file
Open in desktop
Expand Up @@ -2,6 +2,9 @@

import com.gargoylesoftware.htmlunit.WebClient;
import junit.framework.TestCase;
import org.eclipse.jetty.http.UriCompliance;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
Expand Down Expand Up @@ -44,6 +47,8 @@ protected void setUp() throws Exception {
server.setHandler(context);

ServerConnector connector = new ServerConnector(server);
HttpConfiguration hc = connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration();
hc.setUriCompliance(UriCompliance.LEGACY);
Comment on lines +50 to +51
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/jenkinsci/winstone/blob/9149a903679805e97e46eaf100c89735354d2599/src/main/java/winstone/ServerConnectorBuilder.java#L107=. Needed to avoid some sort of test failure if I recall.

server.addConnector(connector);
server.start();

Expand Down
6 changes: 3 additions & 3 deletions groovy/pom.xml
View file
Open in desktop
Expand Up @@ -28,9 +28,9 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

<scope>provided</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions jelly/pom.xml
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.1-jenkins-20220625</version>
<version>1.1-jenkins-20220630</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jenkinsci/jelly#34

<exclusions>
<exclusion>
<groupId>dom4j</groupId>
Expand All @@ -47,9 +47,9 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

<scope>provided</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions jrebel/pom.xml
View file
Open in desktop
Expand Up @@ -23,9 +23,9 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

<scope>provided</scope>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions jsp/pom.xml
View file
Open in desktop
Expand Up @@ -23,15 +23,15 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L65.

<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>2.3.3</version>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>2.3.6</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/eclipse/jetty.project/blob/d988aa016e0bb2de6fba84c1659049c72eae3e32/pom.xml#L66=.

<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@
<changelist>999999-SNAPSHOT</changelist>
<scmTag>HEAD</scmTag>
<spotbugs.excludeFilterFile>${project.basedir}/../src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
<jetty.version>9.4.48.v20220622</jetty.version>
<jetty.version>10.0.11</jetty.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with https://github.com/jenkinsci/winstone/blob/9149a903679805e97e46eaf100c89735354d2599/pom.xml#L22=.

<gitHubRepo>jenkinsci/stapler</gitHubRepo>
</properties>

Expand Down