Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Greg Wilkins 2012-03-06 10:58:30 +11:00
commit 01ffa7cc48
1 changed files with 32 additions and 0 deletions

32
pom.xml
View File

@ -523,6 +523,38 @@
<module>jetty-spdy</module>
</modules>
</profile>
<profile>
<id>eclipse-release</id>
<activation>
<jdk>[1.7,)</jdk>
</activation>
<modules>
<module>jetty-spdy</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>1.7.0</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!--
Moves the jetty-aggregate build tree to a profile called 'aggregates'.