Merge branch 'jetty-9.4.x'
This commit is contained in:
commit
9c5beaad4f
|
@ -459,7 +459,7 @@ public class MultiPartInputStreamParser
|
|||
/**
|
||||
* Throws an exception if one has been latched.
|
||||
*
|
||||
* @throws IOException
|
||||
* @throws IOException the exception (if present)
|
||||
*/
|
||||
protected void throwIfError ()
|
||||
throws IOException
|
||||
|
|
|
@ -596,7 +596,7 @@ public class Scanner extends AbstractLifeCycle
|
|||
|
||||
/**
|
||||
* Report a file addition to the registered FileAddedListeners
|
||||
* @param filename
|
||||
* @param filename the filename
|
||||
*/
|
||||
private void reportAddition (String filename)
|
||||
{
|
||||
|
@ -623,7 +623,7 @@ public class Scanner extends AbstractLifeCycle
|
|||
|
||||
/**
|
||||
* Report a file removal to the FileRemovedListeners
|
||||
* @param filename
|
||||
* @param filename the filename
|
||||
*/
|
||||
private void reportRemoval (String filename)
|
||||
{
|
||||
|
@ -650,7 +650,7 @@ public class Scanner extends AbstractLifeCycle
|
|||
|
||||
/**
|
||||
* Report a file change to the FileChangedListeners
|
||||
* @param filename
|
||||
* @param filename the filename
|
||||
*/
|
||||
private void reportChange (String filename)
|
||||
{
|
||||
|
|
|
@ -155,7 +155,6 @@ public abstract class Resource implements ResourceFactory, Closeable
|
|||
* @param useCaches controls URLConnection caching
|
||||
* @return A Resource object.
|
||||
* @throws MalformedURLException Problem accessing URI
|
||||
* @throws IOException Problem handling resource as file.
|
||||
*/
|
||||
public static Resource newResource(String resource, boolean useCaches)
|
||||
throws MalformedURLException, IOException
|
||||
|
|
|
@ -101,6 +101,8 @@ public interface ExecutionStrategy
|
|||
{
|
||||
return DefaultExecutionStrategyFactory.INSTANCE;
|
||||
}
|
||||
* @param producer the execution strategy producer
|
||||
* @param executor the execution strategy executor
|
||||
}
|
||||
|
||||
public static class DefaultExecutionStrategyFactory implements Factory
|
||||
|
|
|
@ -122,7 +122,7 @@ public class MultiMapTest
|
|||
}
|
||||
|
||||
/**
|
||||
* Tests {@link MultiMap#putValues(String, String...)}
|
||||
* Tests {@link MultiMap#putValues(String, Object[])}
|
||||
*/
|
||||
@Test
|
||||
public void testPutValues_StringArray()
|
||||
|
@ -138,7 +138,7 @@ public class MultiMapTest
|
|||
}
|
||||
|
||||
/**
|
||||
* Tests {@link MultiMap#putValues(String, String...)}
|
||||
* Tests {@link MultiMap#putValues(String, List)}
|
||||
*/
|
||||
@Test
|
||||
public void testPutValues_VarArgs()
|
||||
|
|
7
pom.xml
7
pom.xml
|
@ -559,6 +559,7 @@
|
|||
<module>jetty-http-spi</module>
|
||||
<module>jetty-osgi</module>
|
||||
<module>jetty-alpn</module>
|
||||
<module>jetty-documentation</module>
|
||||
|
||||
<!-- modules that need fixed and added back, or simply dropped and not maintained
|
||||
<module>jetty-rhttp</module>
|
||||
|
@ -769,12 +770,6 @@
|
|||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>documentation</id>
|
||||
<modules>
|
||||
<module>jetty-documentation</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>ci</id>
|
||||
<modules>
|
||||
|
|
Loading…
Reference in New Issue