[jboss-cvs] JBossAS SVN: r87585 - in trunk: component-matrix and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 20 12:12:11 EDT 2009
Author: pgier
Date: 2009-04-20 12:12:11 -0400 (Mon, 20 Apr 2009)
New Revision: 87585
Modified:
trunk/README.txt
trunk/component-matrix/pom.xml
trunk/pom.xml
Log:
[JBBUILD-525] Move enforcer plugin to a profile.
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2009-04-20 15:56:47 UTC (rev 87584)
+++ trunk/README.txt 2009-04-20 16:12:11 UTC (rev 87585)
@@ -17,6 +17,9 @@
Run the build script "./build.sh" or "build.bat"
Or call maven directly "mvn install"
+For faster builds, the maven enforcer can be skipped.
+./build.sh -P-enforce
+
Running the Testsuite
--------------------
Change the the testsuite directory "cd testsuite"
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-04-20 15:56:47 UTC (rev 87584)
+++ trunk/component-matrix/pom.xml 2009-04-20 16:12:11 UTC (rev 87585)
@@ -101,55 +101,7 @@
</properties>
<!-- Build Configuration -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <id>ban-bad-dependencies</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <searchTransitive>true</searchTransitive>
- <rules>
- <bannedDependencies>
- <excludes>
- <exclude>jboss:jboss-common</exclude>
- <exclude>javax.el:el-api</exclude>
- <exclude>bsh:bsh</exclude>
- <exclude>javax.xml.stream:stax-api</exclude>
- <exclude>com.sun.xml.bind:jaxb-impl</exclude>
- <exclude>javax.xml.bind:jaxb-api</exclude>
- <exclude>com.sun.xml.ws:jaxws-tools</exclude>
- <exclude>apache-xerces:xercesImpl</exclude>
- <exclude>ant:ant</exclude>
- <exclude>apache-log4j:log4j</exclude>
- <exclude>jboss:jboss-test</exclude>
- <exclude>apache-logging:commons-logging</exclude>
- <exclude>sun-jaf:activation</exclude>
- <exclude>sun-javamail:mail</exclude>
- <exclude>javax.servlet.jsp:jsp-api</exclude>
- <exclude>javax.servlet:servlet-api</exclude>
- <exclude>xml-apis:xml-apis</exclude>
- <exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
- <exclude>sun-jaxws:FastInfoset</exclude>
- <exclude>org.jboss.jbossas:jboss-as-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap JBAS-6171 -->
- </excludes>
- </bannedDependencies>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
<!-- Dependency Management -->
<dependencyManagement>
<dependencies>
@@ -2166,4 +2118,62 @@
</dependencyManagement>
+ <profiles>
+ <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-alpha-4</version>
+ <executions>
+ <execution>
+ <id>ban-bad-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <searchTransitive>true</searchTransitive>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>jboss:jboss-common</exclude>
+ <exclude>javax.el:el-api</exclude>
+ <exclude>bsh:bsh</exclude>
+ <exclude>javax.xml.stream:stax-api</exclude>
+ <exclude>com.sun.xml.bind:jaxb-impl</exclude>
+ <exclude>javax.xml.bind:jaxb-api</exclude>
+ <exclude>com.sun.xml.ws:jaxws-tools</exclude>
+ <exclude>apache-xerces:xercesImpl</exclude>
+ <exclude>ant:ant</exclude>
+ <exclude>apache-log4j:log4j</exclude>
+ <exclude>jboss:jboss-test</exclude>
+ <exclude>apache-logging:commons-logging</exclude>
+ <exclude>sun-jaf:activation</exclude>
+ <exclude>sun-javamail:mail</exclude>
+ <exclude>javax.servlet.jsp:jsp-api</exclude>
+ <exclude>javax.servlet:servlet-api</exclude>
+ <exclude>xml-apis:xml-apis</exclude>
+ <exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
+ <exclude>sun-jaxws:FastInfoset</exclude>
+ <exclude>org.jboss.jbossas:jboss-as-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap JBAS-6171 -->
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-20 15:56:47 UTC (rev 87584)
+++ trunk/pom.xml 2009-04-20 16:12:11 UTC (rev 87585)
@@ -158,47 +158,6 @@
<timestampFormat>{0, date, long} {0, time, long}</timestampFormat>
</configuration>
</plugin>
- <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.5</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>
@@ -406,7 +365,9 @@
<profile>
<id>default-build</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!module</name>
+ </property>
</activation>
<modules>
<module>component-matrix</module>
@@ -452,6 +413,61 @@
</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.5</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>
More information about the jboss-cvs-commits
mailing list