Author: Alex.Kolonitsky Date: 2010-05-13 08:28:59 -0400 (Thu, 13 May 2010) New Revision: 17017 Modified: root/build/parent/trunk/pom.xml root/commons/trunk/api/pom.xml root/commons/trunk/parent/pom.xml root/core/trunk/api/pom.xml root/core/trunk/impl/pom.xml root/core/trunk/parent/pom.xml root/core/trunk/pom.xml root/examples/pom.xml root/ui/core/trunk/pom.xml Log: fix generation taglib.xml and faces-config.xml Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/build/parent/trunk/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -59,6 +59,7 @@ </issueManagement> <properties> + <richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> @@ -111,7 +112,6 @@ <artifactId>maven-javascript-plugin</artifactId> <version>3.3.1.GA</version> </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> @@ -121,13 +121,20 @@ <artifactId>maven-antrun-plugin</artifactId> </plugin> <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> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + <configuration> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + </configuration> <executions> <execution> <id>richfaces-checkstyle-report</id> @@ -137,16 +144,8 @@ </goals> </execution> </executions> - <configuration> - <skip>${skipCheckstyle}</skip> - </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> <artifactId>maven-source-plugin</artifactId> <executions> <execution> @@ -166,10 +165,10 @@ <manifest> <addDefaultSpecificationEntries> true - </addDefaultSpecificationEntries> + </addDefaultSpecificationEntries> <addDefaultImplementationEntries> true - </addDefaultImplementationEntries> + </addDefaultImplementationEntries> </manifest> <manifestEntries> <mode>development</mode> @@ -199,24 +198,44 @@ </executions> </plugin> <plugin> - <artifactId>maven-eclipse-plugin</artifactId> + <artifactId>maven-compiler-plugin</artifactId> <configuration> - <wtpversion>2.0</wtpversion> - <downloadSources>true</downloadSources> + <source>1.5</source> + <target>1.5</target> </configuration> </plugin> + + <!-- reporting --> <plugin> - <artifactId>maven-compiler-plugin</artifactId> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + </plugin> + + <!-- dev --> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <wtpversion>2.0</wtpversion> + <downloadSources>true</downloadSources> </configuration> </plugin> + + <!-- docs --> <plugin> <groupId>gr.abiss.mvn.plugins</groupId> <artifactId>maven-jstools-plugin</artifactId> <version>0.7</version> + <configuration> + <jsDir>${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> </build> Modified: root/commons/trunk/api/pom.xml =================================================================== --- root/commons/trunk/api/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/commons/trunk/api/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -64,10 +64,8 @@ </dependencies> <build> - <!-- Trigger checkstyle for this build --> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> </plugins> Modified: root/commons/trunk/parent/pom.xml =================================================================== --- root/commons/trunk/parent/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/commons/trunk/parent/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -39,7 +39,6 @@ <properties> <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> - <richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version> </properties> <dependencyManagement> @@ -70,27 +69,4 @@ </dependency> </dependencies> </dependencyManagement> - - <build> - <pluginManagement> - <!-- Configure checkstyle plugin for commons --> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> \ No newline at end of file Modified: root/core/trunk/api/pom.xml =================================================================== --- root/core/trunk/api/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/core/trunk/api/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -34,7 +34,7 @@ <description> The RichFaces Core API. - </description> + </description> <dependencies> <!-- Runtime dependencies --> @@ -86,14 +86,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <!-- Trigger checkstyle for this build --> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: root/core/trunk/impl/pom.xml =================================================================== --- root/core/trunk/impl/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/core/trunk/impl/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -143,12 +143,6 @@ </resources> <plugins> - <!-- Trigger checkstyle for this build --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <!-- TODO Centralize this because calendar and context menu use this too @@ -174,11 +168,6 @@ <!-- Configure js documentation plugin --> <groupId>gr.abiss.mvn.plugins</groupId> <artifactId>maven-jstools-plugin</artifactId> - <configuration> - <jsDir>${basedir}/src/main/resources/Meta-inf/resources</jsDir> - <includes>**/*.js</includes> - <caseSensitive>true</caseSensitive> - </configuration> </plugin> <!-- Modified: root/core/trunk/parent/pom.xml =================================================================== --- root/core/trunk/parent/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/core/trunk/parent/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -38,7 +38,6 @@ <properties> <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> - <richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version> </properties> <dependencyManagement> @@ -95,27 +94,4 @@ </dependency> </dependencies> </dependencyManagement> - - <build> - <pluginManagement> - <!-- Configure checkstyle plugin for commons --> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> \ No newline at end of file Modified: root/core/trunk/pom.xml =================================================================== --- root/core/trunk/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/core/trunk/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -44,17 +44,24 @@ <module>impl</module> </modules> - <reporting> + <build> <plugins> - <!-- TODO: want to centralize, need to research --> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> + <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> </configuration> </plugin> </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> </reporting> </project> Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/examples/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -144,13 +144,6 @@ <build> <plugins> <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <wtpversion>2.0</wtpversion> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - <plugin> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> Modified: root/ui/core/trunk/pom.xml =================================================================== --- root/ui/core/trunk/pom.xml 2010-05-13 12:20:33 UTC (rev 17016) +++ root/ui/core/trunk/pom.xml 2010-05-13 12:28:59 UTC (rev 17017) @@ -38,32 +38,7 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.4</version> - - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>checkstyle</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <executions> - <execution> - <id>richfaces-checkstyle-report</id> - <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> - </configuration> - - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> @@ -71,14 +46,7 @@ <reporting> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> - - <configuration> - <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> - </configuration> </plugin> </plugins> </reporting>