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

Merge branch 'jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
olivier lamy 2021-02-18 09:52:07 +10:00
parent 5eb17a0a66 5857496ef2
commit e90ffbecba
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/CacheControlHeaderTest.java
View File

@ -1,19 +1,14 @@
// //
// ======================================================================== // ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others. // Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
// //
// The Eclipse Public License is available at // This program and the accompanying materials are made available under the
// http://www.eclipse.org/legal/epl-v10.html // terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
// //
// The Apache License v2.0 is available at // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// http://www.opensource.org/licenses/apache2.0.php // ========================================================================
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
// //
package org.eclipse.jetty.servlet; package org.eclipse.jetty.servlet;

1
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/GzipHandlerTest.java
View File

@ -26,7 +26,6 @@ import java.util.Enumeration;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
<<<<<<< HEAD
import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter; import jakarta.servlet.Filter;