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

This commit is contained in:
Simone Bordet 2017-01-13 22:57:00 +01:00
commit 5607b2a57a
1 changed files with 1 additions and 3 deletions

View File

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