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

Reverting <modules> in parent pom in favor of spdy and osgi specifics

This commit is contained in:
Joakim Erdfelt 2014-03-26 14:06:23 -07:00
parent b835aab06f
commit 1444ffadb8
3 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-osgi/pom.xml
View File

@ -26,7 +26,19 @@
<module>test-jetty-osgi-webapp</module> <module>test-jetty-osgi-webapp</module>
<module>test-jetty-osgi-context</module> <module>test-jetty-osgi-context</module>
<module>test-jetty-osgi</module> <module>test-jetty-osgi</module>
<module>jetty-osgi-alpn</module>
</modules> </modules>
<profiles>
<profile>
<id>npn</id>
<activation>
<jdk>1.7</jdk>
</activation>
<modules>
<module>jetty-osgi-npn</module>
</modules>
</profile>
</profiles>
<build> <build>
<resources> <resources>
<resource> <resource>

13
jetty-spdy/pom.xml
View File

@ -21,8 +21,21 @@
<module>spdy-http-server</module> <module>spdy-http-server</module>
<module>spdy-http-client-transport</module> <module>spdy-http-client-transport</module>
<module>spdy-example-webapp</module> <module>spdy-example-webapp</module>
<module>spdy-alpn-tests</module>
</modules> </modules>
<profiles>
<profile>
<id>npn</id>
<activation>
<jdk>1.7</jdk>
</activation>
<modules>
<module>spdy-npn-tests</module>
</modules>
</profile>
</profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

30
pom.xml
View File

@ -830,14 +830,6 @@
<npn.version>1.1.6.v20130911</npn.version> <npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0</alpn.version> <alpn.version>7.0.0</alpn.version>
</properties> </properties>
<modules>
<!-- npn modules -->
<module>jetty-osgi/jetty-osgi-npn</module>
<module>jetty-spdy/spdy-npn-tests</module>
<!-- alpn modules -->
<module>jetty-osgi/jetty-osgi-alpn</module>
<module>jetty-spdy/spdy-alpn-tests</module>
</modules>
</profile> </profile>
<profile> <profile>
<id>7u45</id> <id>7u45</id>
@ -851,14 +843,6 @@
<npn.version>1.1.6.v20130911</npn.version> <npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0</alpn.version> <alpn.version>7.0.0</alpn.version>
</properties> </properties>
<modules>
<!-- npn modules -->
<module>jetty-osgi/jetty-osgi-npn</module>
<module>jetty-spdy/spdy-npn-tests</module>
<!-- alpn modules -->
<module>jetty-osgi/jetty-osgi-alpn</module>
<module>jetty-spdy/spdy-alpn-tests</module>
</modules>
</profile> </profile>
<profile> <profile>
<id>7u51</id> <id>7u51</id>
@ -872,14 +856,6 @@
<npn.version>1.1.6.v20130911</npn.version> <npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0</alpn.version> <alpn.version>7.0.0</alpn.version>
</properties> </properties>
<modules>
<!-- npn modules -->
<module>jetty-osgi/jetty-osgi-npn</module>
<module>jetty-spdy/spdy-npn-tests</module>
<!-- alpn modules -->
<module>jetty-osgi/jetty-osgi-alpn</module>
<module>jetty-spdy/spdy-alpn-tests</module>
</modules>
</profile> </profile>
<profile> <profile>
<id>8u00</id> <id>8u00</id>
@ -892,12 +868,6 @@
<properties> <properties>
<alpn.version>8.0.0</alpn.version> <alpn.version>8.0.0</alpn.version>
</properties> </properties>
<modules>
<!-- npn not supported on java 8 -->
<!-- alpn modules -->
<module>jetty-osgi/jetty-osgi-alpn</module>
<module>jetty-spdy/spdy-alpn-tests</module>
</modules>
</profile> </profile>
</profiles> </profiles>
</project> </project>