You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/03/27 03:05:11 UTC
svn commit: r522690 - in /geronimo/server/trunk: ./ pom.xml
Author: jdillon
Date: Mon Mar 26 18:05:06 2007
New Revision: 522690
URL: http://svn.apache.org/viewvc?view=rev&rev=522690
Log:
r16216@Bliss: jason | 2007-03-26 18:04:27 -0700
Use the maven-enforcer-plugin to require specific versions of Java and Maven
Modified:
geronimo/server/trunk/ (props changed)
geronimo/server/trunk/pom.xml
Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Mar 26 18:05:06 2007
@@ -1,3 +1,4 @@
13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851
13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:428882
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/server-trunk:16216
bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:12578
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=522690&r1=522689&r2=522690
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Mar 26 18:05:06 2007
@@ -1468,6 +1468,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0-alpha-3</version>
</plugin>
@@ -1681,24 +1687,39 @@
<plugins>
<plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
-
- <!-- Tools includes custom packagings, install as extension to pick them up -->
- <extensions>true</extensions>
-
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>validate-java-version</id>
<phase>validate</phase>
<goals>
- <goal>require-java-version</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <version>1.5*</version>
+ <rules>
+ <!-- Allow any Java >= 1.5, but not 1.6 or above -->
+ <requireJavaVersion>
+ <version>[1.5,1.6)</version>
+ </requireJavaVersion>
+
+ <!-- Allow any Maven >= 2.0.5 -->
+ <requireMavenVersion>
+ <version>[2.0.5,)</version>
+ </requireMavenVersion>
+ </rules>
</configuration>
</execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+
+ <executions>
<execution>
<id>install-legal-files</id>
<phase>generate-resources</phase>