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 /jetty-osgi
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
Diffstat (limited to 'jetty-osgi')
-rw-r--r--jetty-osgi/pom.xml12
1 files changed, 12 insertions, 0 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>

Back to the top