[jboss-cvs] JBossAS SVN: r105121 - trunk.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2010-05-22 08:47:15 -0400 (Sat, 22 May 2010)
New Revision: 105121

Modified:
   trunk/pom.xml
Log:
Use enforcer configuration from jboss-parent.  Remove duplicate antrun-plugin definition.

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-05-22 12:46:08 UTC (rev 105120)
+++ trunk/pom.xml	2010-05-22 12:47:15 UTC (rev 105121)
@@ -26,6 +26,9 @@
     <version.buildnumber.maven.plugin>1.0-beta-3</version.buildnumber.maven.plugin>
     <version.build.helper.maven.plugin>1.4</version.build.helper.maven.plugin>
     <version.jboss.packaging.maven.plugin>2.1</version.jboss.packaging.maven.plugin>
+    
+    <!-- Used by the enforcer plugin inherited from jboss-parent -->
+    <jdk.min.version>1.6</jdk.min.version>
   </properties>
   
   <build>
@@ -170,11 +173,6 @@
           </dependencies>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.3</version>
-        </plugin>       
-        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>jboss-packaging-maven-plugin</artifactId>
           <version>${version.jboss.packaging.maven.plugin}</version>
@@ -547,61 +545,6 @@
       </modules>
     </profile>
     
-    <profile>
-      <id>enforce</id>
-      <activation>
-        <property>
-          <name>!skip-enforce</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>1.0-beta-1</version>
-            <executions>
-              <execution>
-                <id>enforce-java-maven-versions</id>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requireMavenVersion>
-                      <version>2.0.9</version>
-                    </requireMavenVersion>
-                    <requireJavaVersion>
-                      <version>1.6</version>
-                    </requireJavaVersion>           
-                  </rules>
-                </configuration>
-              </execution>
-              <execution>
-                <id>enforce-plugin-versions</id>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requirePluginVersions>
-                       <message>Best practice is to always define plugin versions!</message>
-                       <banLatest>true</banLatest>
-                       <banRelease>true</banRelease>
-                       <banSnapshots>true</banSnapshots>
-                       <phases>clean,deploy,site</phases>
-                    </requirePluginVersions>
-                  </rules>
-                  <fail>false</fail>  
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-        
-      </build>
-    </profile>
-    
   </profiles>
   
 </project>