[jboss-cvs] JBossAS SVN: r87800 - in branches/Branch_5_x: build and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 24 10:04:13 EDT 2009
Author: pgier
Date: 2009-04-24 10:04:13 -0400 (Fri, 24 Apr 2009)
New Revision: 87800
Modified:
branches/Branch_5_x/build/build.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/pom.xml
Log:
Move enforcer plugin to a profile.
Modified: branches/Branch_5_x/build/build.xml
===================================================================
--- branches/Branch_5_x/build/build.xml 2009-04-24 13:53:02 UTC (rev 87799)
+++ branches/Branch_5_x/build/build.xml 2009-04-24 14:04:13 UTC (rev 87800)
@@ -1048,7 +1048,8 @@
<target name="createthirdparty" unless="inhibit.downloads"
depends="maven-init, init, check.inhibit.downloads, set.proxy">
- <property name="thirdparty.maven.opts" value=""/>
+ <property name="maven.opts" value=""/>
+ <property name="thirdparty.maven.opts" value="${maven.opts}"/>
<maven basedir="${basedir}/../thirdparty"
options="${thirdparty.maven.opts}"
@@ -1069,7 +1070,8 @@
<target name="maven-install" description="Run the install goal against the maven build"
depends="maven-init">
- <property name="maven.install.opts" value="-Pintegrated-build"/>
+ <property name="maven.opts" value=""/>
+ <property name="maven.install.opts" value="-Dintegrated-build ${maven.opts}"/>
<maven basedir="${basedir}/.."
options="${maven.install.opts}"
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-04-24 13:53:02 UTC (rev 87799)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-04-24 14:04:13 UTC (rev 87800)
@@ -100,56 +100,6 @@
<version.xdoclet>1.2.3</version.xdoclet>
</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>
@@ -2174,4 +2124,63 @@
</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: branches/Branch_5_x/pom.xml
===================================================================
--- branches/Branch_5_x/pom.xml 2009-04-24 13:53:02 UTC (rev 87799)
+++ branches/Branch_5_x/pom.xml 2009-04-24 14:04:13 UTC (rev 87800)
@@ -110,47 +110,6 @@
<version>2.0-beta-1</version>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-4</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>
@@ -379,7 +338,9 @@
<profile>
<id>default-build</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!integrated-build</name>
+ </property>
</activation>
<modules>
<module>component-matrix</module>
@@ -417,12 +378,71 @@
<!-- This profile is used by the ant/buildmagic build -->
<profile>
<id>integrated-build</id>
+ <activation>
+ <property>
+ <name>integrated-build</name>
+ </property>
+ </activation>
<modules>
<module>component-matrix</module>
<module>thirdparty</module>
</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-alpha-4</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