You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2012/04/22 14:42:26 UTC
svn commit: r1328867 - in /mina/vysper/trunk: examples/pom.xml
server/extensions/pom.xml
Author: ngn
Date: Sun Apr 22 12:42:25 2012
New Revision: 1328867
URL: http://svn.apache.org/viewvc?rev=1328867&view=rev
Log:
Add JDK 1.6 activated profiles for Jetty dependent modules
Jetty 8 requires Java 1.6 and we depend on it for some of our modules.
This commit adds profiles which are automatically activated on Java 1.6
which adds these modules
Modified:
mina/vysper/trunk/examples/pom.xml
mina/vysper/trunk/server/extensions/pom.xml
Modified: mina/vysper/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/examples/pom.xml?rev=1328867&r1=1328866&r2=1328867&view=diff
==============================================================================
--- mina/vysper/trunk/examples/pom.xml (original)
+++ mina/vysper/trunk/examples/pom.xml Sun Apr 22 12:42:25 2012
@@ -31,7 +31,21 @@
<packaging>pom</packaging>
<modules>
- <module>embedded-war</module>
<module>pubsub-client</module>
</modules>
+
+ <profiles>
+ <profile>
+ <!-- embedded war uses Jetty, which requires Java 1.6 -->
+ <activation>
+ <jdk>[1.6,)</jdk>
+ </activation>
+ <modules>
+ <module>embedded-war</module>
+ <module>pubsub-client</module>
+ </modules>
+ </profile>
+ </profiles>
+
+
</project>
Modified: mina/vysper/trunk/server/extensions/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/pom.xml?rev=1328867&r1=1328866&r2=1328867&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/pom.xml (original)
+++ mina/vysper/trunk/server/extensions/pom.xml Sun Apr 22 12:42:25 2012
@@ -34,20 +34,31 @@
<module>xep0060-pubsub</module>
<module>xep0045-muc</module>
<module>xep0065-socks</module>
- <module>xep0124-xep0206-bosh</module>
- <module>websockets</module>
</modules>
<profiles>
- <profile>
+ <profile>
+ <!-- bosh and websockets uses Jetty, which requires Java 1.6 -->
+ <activation>
+ <jdk>[1.6,)</jdk>
+ </activation>
+ <modules>
+ <module>xep0060-pubsub</module>
+ <module>xep0045-muc</module>
+ <module>xep0065-socks</module>
+ <module>xep0124-xep0206-bosh</module>
+ <module>websockets</module>
+ </modules>
+ </profile>
+ <profile>
<id>inttest</id>
<modules>
- <module>xep0060-pubsub</module>
- <module>xep0045-muc</module>
- <module>xep0045-muc-inttest</module>
- <module>xep0124-xep0206-bosh</module>
- <module>xep0065-socks</module>
- <module>websockets</module>
+ <module>xep0060-pubsub</module>
+ <module>xep0045-muc</module>
+ <module>xep0045-muc-inttest</module>
+ <module>xep0124-xep0206-bosh</module>
+ <module>xep0065-socks</module>
+ <module>websockets</module>
</modules>
</profile>
</profiles>