Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
Joakim Erdfelt 2020-11-10 12:12:39 -06:00
parent 80bb1bce90 3b5bb78eed
commit 9e22260377
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java
View File

@ -266,9 +266,9 @@ public class HpackEncoder
if (_maxHeaderListSize > 0 && _headerListSize > _maxHeaderListSize) if (_maxHeaderListSize > 0 && _headerListSize > _maxHeaderListSize)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.warn("Header list size too large {} > {} metadata={}", _headerListSize, _maxHeaderListSize, metadata); LOG.warn("Header list size too large {} > {} metadata={}", _headerListSize, _maxHeaderListSize, metadata);
else else
LOG.warn("Header list size too large {} > {}", _headerListSize, _maxHeaderListSize); LOG.warn("Header list size too large {} > {}", _headerListSize, _maxHeaderListSize);
} }
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())

2
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -1227,7 +1227,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Unavailable {}", req, _unavailableException); LOG.debug("Unavailable {}", req, _unavailableException);
if (_unavailableStart == null) if (_unavailableStart == null)
{ {
((HttpServletResponse)res).sendError(HttpServletResponse.SC_NOT_FOUND); ((HttpServletResponse)res).sendError(HttpServletResponse.SC_NOT_FOUND);

4
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
View File

@ -301,7 +301,7 @@ public class WebInfConfiguration extends AbstractConfiguration
if (webApp.isAlias()) if (webApp.isAlias())
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("{} anti-aliased to {}", webApp, webApp.getAlias()); LOG.debug("{} anti-aliased to {}", webApp, webApp.getAlias());
webApp = context.newResource(webApp.getAlias()); webApp = context.newResource(webApp.getAlias());
} }
@ -431,7 +431,7 @@ public class WebInfConfiguration extends AbstractConfiguration
webInfLibDir.mkdir(); webInfLibDir.mkdir();
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Copying WEB-INF/lib {} to {}", webInfLib, webInfLibDir); LOG.debug("Copying WEB-INF/lib {} to {}", webInfLib, webInfLibDir);
webInfLib.copyTo(webInfLibDir); webInfLib.copyTo(webInfLibDir);
} }

4
pom.xml
View File

@ -18,7 +18,7 @@
<jetty.url>https://www.eclipse.org/jetty/</jetty.url> <jetty.url>https://www.eclipse.org/jetty/</jetty.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-support.version>1.5</build-support.version> <build-support.version>1.5</build-support.version>
<checkstyle.version>8.36.2</checkstyle.version> <checkstyle.version>8.37</checkstyle.version>
<slf4j.version>2.0.0-alpha1</slf4j.version> <slf4j.version>2.0.0-alpha1</slf4j.version>
<log4j2.version>2.13.0</log4j2.version> <log4j2.version>2.13.0</log4j2.version>
<logback.version>1.3.0-alpha5</logback.version> <logback.version>1.3.0-alpha5</logback.version>
@ -75,7 +75,7 @@
<invoker.mergeUserSettings>false</invoker.mergeUserSettings> <invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.15.0</testcontainers.version> <testcontainers.version>1.15.0</testcontainers.version>
<derby.version>10.15.2.0</derby.version> <derby.version>10.14.2.0</derby.version>
</properties> </properties>
<licenses> <licenses>

4
tests/test-webapps/test-cdi-common-webapp/src/main/java/org/eclipse/jetty/test/InfoServlet.java
View File

@ -51,7 +51,9 @@ public class InfoServlet extends HttpServlet
{ {
out.printf("%16s => %s%n", bean.getName(), bean); out.printf("%16s => %s%n", bean.getName(), bean);
for (InjectionPoint ij : bean.getInjectionPoints()) for (InjectionPoint ij : bean.getInjectionPoints())
out.printf("%16s -> %s%n", "", ij); {
out.printf("%16s -> %s%n", "", ij);
}
} }
} }
} }

2
tests/test-webapps/test-owb-cdi-webapp/pom.xml
View File

@ -55,7 +55,7 @@
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId> <artifactId>geronimo-interceptor_1.2_spec</artifactId>
<version>1.1</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openwebbeans</groupId> <groupId>org.apache.openwebbeans</groupId>