Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.

This commit is contained in:
Simone Bordet 2017-01-13 22:56:23 +01:00
commit 08c52461ec
1 changed files with 1 additions and 3 deletions

View File

@ -90,6 +90,7 @@
<module>jetty-osgi</module>
<module>jetty-alpn</module>
<module>jetty-home</module>
<module>jetty-documentation</module>
<!-- modules that need fixed and added back, or simply dropped and not maintained -->
<!-- <module>jetty-rhttp</module> -->
<!-- <module>jetty-overlay-deployer</module> -->
@ -993,9 +994,6 @@
<activation>
<jdk>[1.8,1.9)</jdk>
</activation>
<modules>
<module>jetty-documentation</module>
</modules>
<build>
<pluginManagement>
<plugins>