Repository: cayenne Updated Branches: refs/heads/master fb8686d40 -> a9f43dbed
move checkstyle and pmd into separate profile Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/07173c5d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/07173c5d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/07173c5d Branch: refs/heads/master Commit: 07173c5db80f7e47a78aaa6ebbfca06d9172fb67 Parents: e14aea3 Author: kolonitsky <alex.kolonit...@gmail.com> Authored: Thu Feb 12 16:28:40 2015 +0300 Committer: kolonitsky <alex.kolonit...@gmail.com> Committed: Thu Feb 12 16:28:40 2015 +0300 ---------------------------------------------------------------------- cayenne-client/pom.xml | 35 ++- cayenne-crypto/pom.xml | 34 ++- cayenne-di/pom.xml | 34 ++- cayenne-lifecycle/pom.xml | 33 ++- cayenne-project/pom.xml | 34 ++- cayenne-server/pom.xml | 77 +++--- cayenne-tools/pom.xml | 33 ++- modeler/cayenne-modeler-generic-ext/pom.xml | 39 ++-- modeler/cayenne-modeler-generic/pom.xml | 36 +-- modeler/cayenne-modeler-mac-ext/pom.xml | 38 +-- modeler/cayenne-modeler-mac-legacy/pom.xml | 38 +-- modeler/cayenne-modeler-mac/pom.xml | 36 +-- modeler/cayenne-modeler-win/pom.xml | 21 +- modeler/cayenne-modeler/pom.xml | 37 +-- modeler/cayenne-wocompat/pom.xml | 37 +-- plugins/maven-cayenne-modeler-plugin/pom.xml | 32 ++- plugins/maven-cayenne-plugin/pom.xml | 34 ++- pom.xml | 273 ++++++++++++---------- 18 files changed, 573 insertions(+), 328 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/cayenne-client/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml index 82dacbf..09332a4 100644 --- a/cayenne-client/pom.xml +++ b/cayenne-client/pom.xml @@ -104,18 +104,35 @@ </executions> </plugin> <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/cayenne-crypto/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml index a7b43c2..89a52f3 100644 --- a/cayenne-crypto/pom.xml +++ b/cayenne-crypto/pom.xml @@ -98,15 +98,31 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> + + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/cayenne-di/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-di/pom.xml b/cayenne-di/pom.xml index 468cb23..18e355f 100644 --- a/cayenne-di/pom.xml +++ b/cayenne-di/pom.xml @@ -62,15 +62,31 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> + + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/cayenne-lifecycle/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml index 081519e..4669f09 100644 --- a/cayenne-lifecycle/pom.xml +++ b/cayenne-lifecycle/pom.xml @@ -86,15 +86,30 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/cayenne-project/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-project/pom.xml b/cayenne-project/pom.xml index faa8b85..ca11f00 100644 --- a/cayenne-project/pom.xml +++ b/cayenne-project/pom.xml @@ -66,15 +66,31 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> + + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/cayenne-server/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml index 7c313b7..a0ef333 100644 --- a/cayenne-server/pom.xml +++ b/cayenne-server/pom.xml @@ -204,6 +204,7 @@ ${project.build.directory}/generated-sources/javacc/org/apache/cayenne/ejbql </outputDirectory> <buildNodeFiles>false</buildNodeFiles> + <grammarEncoding>UTF-8</grammarEncoding> </configuration> <goals> <goal>jjtree-javacc</goal> @@ -266,39 +267,55 @@ </executions> </plugin> <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/ExpressionParserTreeConstants.java</exclude> - <exclude>**/JavaCharStream.java</exclude> - <exclude>**/JJTExpressionParserState.java</exclude> - <exclude>**/ParseException.java</exclude> - <exclude>**/Token.java</exclude> - <exclude>**/TokenMgrError.java</exclude> - <exclude>**/ExpressionParser.java</exclude> - <exclude>**/ExpressionParserConstants.java</exclude> - <exclude>**/ExpressionParserTokenManager.java</exclude> - <exclude>**/SimpleNode.java</exclude> - <exclude>**/ParseException.java</exclude> - <exclude>**/Parser.java.java</exclude> - <exclude>**/ParserConstants.java</exclude> - <exclude>**/ParserTokenManager.java</exclude> - <exclude>**/SimpleCharStream.java</exclude> - <exclude>**/TokenMgrError.java</exclude> - <exclude>org/apache/cayenne/ejbql/parser/*</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/ExpressionParserTreeConstants.java</exclude> + <exclude>**/JavaCharStream.java</exclude> + <exclude>**/JJTExpressionParserState.java</exclude> + <exclude>**/ParseException.java</exclude> + <exclude>**/Token.java</exclude> + <exclude>**/TokenMgrError.java</exclude> + <exclude>**/ExpressionParser.java</exclude> + <exclude>**/ExpressionParserConstants.java</exclude> + <exclude>**/ExpressionParserTokenManager.java</exclude> + <exclude>**/SimpleNode.java</exclude> + <exclude>**/ParseException.java</exclude> + <exclude>**/Parser.java.java</exclude> + <exclude>**/ParserConstants.java</exclude> + <exclude>**/ParserTokenManager.java</exclude> + <exclude>**/SimpleCharStream.java</exclude> + <exclude>**/TokenMgrError.java</exclude> + <exclude>org/apache/cayenne/ejbql/parser/*</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/cayenne-tools/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-tools/pom.xml b/cayenne-tools/pom.xml index a97dd13..49ee901 100644 --- a/cayenne-tools/pom.xml +++ b/cayenne-tools/pom.xml @@ -156,15 +156,30 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </build> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-modeler-generic-ext/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-generic-ext/pom.xml b/modeler/cayenne-modeler-generic-ext/pom.xml index 1dcc8dd..93460f5 100644 --- a/modeler/cayenne-modeler-generic-ext/pom.xml +++ b/modeler/cayenne-modeler-generic-ext/pom.xml @@ -63,17 +63,30 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-modeler-generic/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-generic/pom.xml b/modeler/cayenne-modeler-generic/pom.xml index 81871fb..934d65f 100644 --- a/modeler/cayenne-modeler-generic/pom.xml +++ b/modeler/cayenne-modeler-generic/pom.xml @@ -82,21 +82,29 @@ </plugins> </build> </profile> - </profiles> + <profile> + <id>code-quality</id> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> <pluginRepositories> <pluginRepository> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-modeler-mac-ext/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-mac-ext/pom.xml b/modeler/cayenne-modeler-mac-ext/pom.xml index d872b69..6412b00 100644 --- a/modeler/cayenne-modeler-mac-ext/pom.xml +++ b/modeler/cayenne-modeler-mac-ext/pom.xml @@ -66,17 +66,29 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-modeler-mac-legacy/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-mac-legacy/pom.xml b/modeler/cayenne-modeler-mac-legacy/pom.xml index bab4045..23ba4ba 100644 --- a/modeler/cayenne-modeler-mac-legacy/pom.xml +++ b/modeler/cayenne-modeler-mac-legacy/pom.xml @@ -66,21 +66,29 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - - <profiles> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> <profile> <id>mac</id> <build> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-modeler-mac/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml index e273842..8dc3a16 100644 --- a/modeler/cayenne-modeler-mac/pom.xml +++ b/modeler/cayenne-modeler-mac/pom.xml @@ -66,21 +66,29 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>code-quality</id> - <profiles> + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> <profile> <id>mac</id> <build> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-modeler-win/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml index 3e92d14..dccf0f5 100644 --- a/modeler/cayenne-modeler-win/pom.xml +++ b/modeler/cayenne-modeler-win/pom.xml @@ -102,6 +102,19 @@ </execution> </executions> </plugin> + </plugins> + </build> + </profile> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> <!--<configuration> @@ -111,10 +124,10 @@ <plugin> <artifactId>maven-pmd-plugin</artifactId> </plugin> - </plugins> - </build> - </profile> - </profiles> + </plugins> + </build> + </profile> + </profiles> <pluginRepositories> <pluginRepository> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-modeler/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml index 35d5b3c..fa18085 100644 --- a/modeler/cayenne-modeler/pom.xml +++ b/modeler/cayenne-modeler/pom.xml @@ -115,17 +115,28 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/modeler/cayenne-wocompat/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-wocompat/pom.xml b/modeler/cayenne-wocompat/pom.xml index a15641b..cfe0dbd 100644 --- a/modeler/cayenne-wocompat/pom.xml +++ b/modeler/cayenne-wocompat/pom.xml @@ -48,17 +48,28 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/plugins/maven-cayenne-modeler-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-modeler-plugin/pom.xml b/plugins/maven-cayenne-modeler-plugin/pom.xml index 6bc1f6a..dd09f94 100644 --- a/plugins/maven-cayenne-modeler-plugin/pom.xml +++ b/plugins/maven-cayenne-modeler-plugin/pom.xml @@ -73,12 +73,6 @@ <build> <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> <plugin> <artifactId>maven-plugin-plugin</artifactId> <configuration> @@ -87,5 +81,31 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/plugins/maven-cayenne-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/pom.xml b/plugins/maven-cayenne-plugin/pom.xml index 026f1aa..ee2ed25 100644 --- a/plugins/maven-cayenne-plugin/pom.xml +++ b/plugins/maven-cayenne-plugin/pom.xml @@ -154,15 +154,29 @@ </plugins> </reporting> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <!--<configuration> + <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> + </configuration>--> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/07173c5d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 481301a..d6cdbdd 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,9 @@ <pmd.skip>false</pmd.skip> <checkstyle.skip>false</checkstyle.skip> <findbugs.skip>false</findbugs.skip> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> <url>http://cayenne.apache.org/</url> @@ -849,103 +852,6 @@ <artifactId>japp-maven-plugin</artifactId> <version>3.0</version> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.9.1</version> - <configuration> - <skip>${checkstyle.skip}</skip> - <consoleOutput>true</consoleOutput> - <enableRulesSummary>false</enableRulesSummary> - <failOnViolation>false</failOnViolation> - <!-- TODO make it 'true' when we will be ready --> - <violationSeverity>warning</violationSeverity> - <configLocation>/cayenne-checkstyle.xml</configLocation> - </configuration> - <executions> - <execution> - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.cayenne.build-tools</groupId> - <artifactId>cayenne-checkers</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.2</version> - <configuration> - <skip>${pmd.skip}</skip> - <sourceEncoding>utf-8</sourceEncoding> - <targetJdk>1.6</targetJdk> - <verbose>true</verbose> - <failOnViolation>false</failOnViolation> - <!-- TODO make it 'true' when we will be ready --> - <failurePriority>2</failurePriority> - <rulesets> - <!-- go back on one dir to parent project --> - <ruleset>/cayenne-pmd.xml</ruleset> - </rulesets> - </configuration> - <executions> - <execution> - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.cayenne.build-tools</groupId> - <artifactId>cayenne-checkers</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5</version> - <configuration> - <effort>Max</effort> - <!-- do max effort at CI Server --> - <threshold>Low</threshold> - <!-- make it 'low' at CI Server --> - </configuration> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - <version>2.6.1</version> - <configuration> - <comparisonVersion>3.1RC1</comparisonVersion> - <minSeverity>info</minSeverity> - <logResults>true</logResults> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - <version>2.0</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> @@ -960,7 +866,10 @@ </execution> </executions> </plugin> - + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + </plugin> </plugins> </pluginManagement> @@ -1042,14 +951,144 @@ <profiles> <profile> - <id>fast-and-dirty</id> + <id>code-quality</id> + + <activation> + <property> + <name>!fast-and-dirty</name> + </property> + </activation> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.9.1</version> + <configuration> + <skip>${checkstyle.skip}</skip> + <consoleOutput>true</consoleOutput> + <enableRulesSummary>false</enableRulesSummary> + <failOnViolation>false</failOnViolation> + <!-- TODO make it 'true' when we will be ready --> + <violationSeverity>warning</violationSeverity> + <configLocation>/cayenne-checkstyle.xml</configLocation> + </configuration> + <executions> + <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.cayenne.build-tools</groupId> + <artifactId>cayenne-checkers</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>3.2</version> + <configuration> + <skip>${pmd.skip}</skip> + <sourceEncoding>utf-8</sourceEncoding> + <targetJdk>1.6</targetJdk> + <verbose>true</verbose> + <failOnViolation>false</failOnViolation> + <!-- TODO make it 'true' when we will be ready --> + <failurePriority>2</failurePriority> + <rulesets> + <!-- go back on one dir to parent project --> + <ruleset>/cayenne-pmd.xml</ruleset> + </rulesets> + </configuration> + <executions> + <execution> + <phase>process-sources</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.cayenne.build-tools</groupId> + <artifactId>cayenne-checkers</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.5</version> + <configuration> + <effort>Max</effort> + <!-- do max effort at CI Server --> + <threshold>Low</threshold> + <!-- make it 'low' at CI Server --> + </configuration> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <version>2.6.1</version> + <configuration> + <comparisonVersion>3.1RC1</comparisonVersion> + <minSeverity>info</minSeverity> + <logResults>true</logResults> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + <version>2.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> - <properties> - <pmd.skip>true</pmd.skip> - <maven.test.skip>true</maven.test.skip> - <checkstyle.skip>true</checkstyle.skip> - <findbugs.skip>true</findbugs.skip> - </properties> + <reporting> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <inherited>true</inherited> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <inherited>true</inherited> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <configuration> + <effort>Max</effort> + <threshold>Low</threshold> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + </plugin> + </plugins> + </reporting> </profile> <profile> <id>tests-development</id> @@ -1432,30 +1471,6 @@ <artifactId>maven-surefire-report-plugin</artifactId> <version>2.8</version> </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <inherited>true</inherited> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <inherited>true</inherited> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <effort>Max</effort> - <threshold>Low</threshold> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - </plugin> </plugins> </reporting> </project>
