Author: jbalunas(a)redhat.com Date: 2010-08-19 11:59:18 -0400 (Thu, 19 Aug 2010) New Revision: 18822 Modified: branches/RF-9112/core/parent/pom.xml branches/RF-9112/parent/pom.xml Log: RF-9112 update to root-parent pom Modified: branches/RF-9112/core/parent/pom.xml =================================================================== --- branches/RF-9112/core/parent/pom.xml 2010-08-19 15:40:49 UTC (rev 18821) +++ branches/RF-9112/core/parent/pom.xml 2010-08-19 15:59:18 UTC (rev 18822) @@ -38,7 +38,6 @@ </description> <properties> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> <dependencyManagement> Modified: branches/RF-9112/parent/pom.xml =================================================================== --- branches/RF-9112/parent/pom.xml 2010-08-19 15:40:49 UTC (rev 18821) +++ branches/RF-9112/parent/pom.xml 2010-08-19 15:59:18 UTC (rev 18822) @@ -38,11 +38,8 @@ the project, and contains pluginmangement, and common testing dependency management elements. </description> - + <properties> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <!-- Override the default 2.0.9 from jboss-parent --> - <maven.min.version>2.1.0</maven.min.version> <richfaces.checkstyle.version>2-SNAPSHOT</richfaces.checkstyle.version> </properties> @@ -60,19 +57,24 @@ <dependency> <groupId>org.jboss.test-jsf</groupId> <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.jboss.test-jsf</groupId> <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.jboss.test-jsf</groupId> <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> </dependency> <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-jetty</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.7</version> @@ -89,11 +91,92 @@ --> <pluginManagement> <plugins> + <!-- Build --> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number>${buildNumber} + </Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> + </plugin> + + <!-- reporting --> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.3</version> + <configuration> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml + </configLocation> + </configuration> + <executions> + <execution> + <id>richfaces-checkstyle-report</id> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </plugin> <!-- - TODO: migrate plugin config from richfaces-parent. - Need to be careful of what root-aggregator, and bom - need though because they do not inherit this + docs TODO should move to profiles probably a "doc" + profile --> + <plugin> + <groupId>gr.abiss.mvn.plugins</groupId> + <artifactId>maven-jstools-plugin</artifactId> + <version>0.7</version> + <configuration> + <jsDir>${project.basedir}/src/main/resources/META-INF/resources + </jsDir> + <includes>**/*.js</includes> + <caseSensitive>true</caseSensitive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + </plugin> </plugins> </pluginManagement> <plugins> @@ -108,13 +191,83 @@ <profiles> <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <!-- TODO move to doc profile? --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <javadocVersion>1.5</javadocVersion> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-javadoc</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <!-- - TODO: migrate profile config from richfaces-parent. Need - to be careful of what root-aggregator, and bom need - though because they do not inherit this + Triggers generated documentation as part of builds ( + javadoc, jsdoc, etc... --> + <id>doc</id> + <!-- TODO --> </profile> - + <profile> + <!-- Triggers clover reports to be generated --> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <configuration> + <licenseLocation> + ${clover.license.path} + </licenseLocation> + <jdk>1.5</jdk> + <generatePdf>false</generatePdf> + <generateXml>true</generateXml> + <generateHtml>true</generateHtml> + </configuration> + <executions> + <execution> + <id>instrument</id> + <phase>verify</phase> + <goals> + <goal>instrument</goal> + <goal>check</goal> + <goal>clover</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <!-- + Required when in JBoss hudson env to have clover reports + generate + --> + <id>hudson</id> + <properties> + <clover.license.path> + /home/hudson/config_repository/resources/richfaces/richfaces-clover-license.txt + </clover.license.path> + </properties> + </profile> + <!-- The following profiles determine the JSF api/impl combinations that will be used in the project builds.