Skip to content
Browse files

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

git-svn-id: https://svn.apache.org/repos/asf/mina/vysper/trunk@1328867 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 9e9a990 commit aabb4d3f577e8ecb3121c54039f0d06ace927ab8 Niklas Gustavsson committed
Showing with 35 additions and 10 deletions.
  1. +15 −1 examples/pom.xml
  2. +20 −9 server/extensions/pom.xml
View
16 examples/pom.xml
@@ -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>
View
29 server/extensions/pom.xml
@@ -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>

0 comments on commit aabb4d3

Please sign in to comment.
Something went wrong with that request. Please try again.