Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-03-26 21:06:23 +0000
committerJoakim Erdfelt2014-03-26 21:06:23 +0000
commit1444ffadb8fee932d17667ac9b9d71dca830e645 (patch)
treef977c295a2cbfcde518d20db7b2e6a4b1e0079d8
parentb835aab06f7cfb869eb76090202784a75a1450b7 (diff)
downloadorg.eclipse.jetty.project-1444ffadb8fee932d17667ac9b9d71dca830e645.tar.gz
org.eclipse.jetty.project-1444ffadb8fee932d17667ac9b9d71dca830e645.tar.xz
org.eclipse.jetty.project-1444ffadb8fee932d17667ac9b9d71dca830e645.zip
Reverting <modules> in parent pom in favor of spdy and osgi specifics
-rw-r--r--jetty-osgi/pom.xml12
-rw-r--r--jetty-spdy/pom.xml13
-rw-r--r--pom.xml30
3 files changed, 25 insertions, 30 deletions
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 394c3c5fb7..77cea6700f 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -26,7 +26,19 @@
<module>test-jetty-osgi-webapp</module>
<module>test-jetty-osgi-context</module>
<module>test-jetty-osgi</module>
+ <module>jetty-osgi-alpn</module>
</modules>
+ <profiles>
+ <profile>
+ <id>npn</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <modules>
+ <module>jetty-osgi-npn</module>
+ </modules>
+ </profile>
+ </profiles>
<build>
<resources>
<resource>
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index a8f0abd62f..961fb9f1da 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -21,8 +21,21 @@
<module>spdy-http-server</module>
<module>spdy-http-client-transport</module>
<module>spdy-example-webapp</module>
+ <module>spdy-alpn-tests</module>
</modules>
+ <profiles>
+ <profile>
+ <id>npn</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <modules>
+ <module>spdy-npn-tests</module>
+ </modules>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
diff --git a/pom.xml b/pom.xml
index 16ca33b055..71be2e5514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -830,14 +830,6 @@
<npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0</alpn.version>
</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>
<id>7u45</id>
@@ -851,14 +843,6 @@
<npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0</alpn.version>
</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>
<id>7u51</id>
@@ -872,14 +856,6 @@
<npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0</alpn.version>
</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>
<id>8u00</id>
@@ -892,12 +868,6 @@
<properties>
<alpn.version>8.0.0</alpn.version>
</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>
</profiles>
</project>

Back to the top