diff options
| -rw-r--r-- | buildhelpers/src/main/resources/checkstyle/header (renamed from checkstyle/header) | 0 | ||||
| -rw-r--r-- | buildhelpers/src/main/resources/checkstyle/import-control.xml (renamed from checkstyle/import-control.xml) | 0 | ||||
| -rw-r--r-- | buildhelpers/src/main/resources/checkstyle/vaadin-checkstyle.xml (renamed from checkstyle/vaadin-checkstyle.xml) | 3 | ||||
| -rw-r--r-- | common.xml | 27 | ||||
| -rw-r--r-- | pom.xml | 34 | ||||
| -rw-r--r-- | uitest/build.xml | 5 | ||||
| -rw-r--r-- | uitest/pom.xml | 7 |
7 files changed, 44 insertions, 32 deletions
diff --git a/checkstyle/header b/buildhelpers/src/main/resources/checkstyle/header index a1063268ac..a1063268ac 100644 --- a/checkstyle/header +++ b/buildhelpers/src/main/resources/checkstyle/header diff --git a/checkstyle/import-control.xml b/buildhelpers/src/main/resources/checkstyle/import-control.xml index 076dbd8a22..076dbd8a22 100644 --- a/checkstyle/import-control.xml +++ b/buildhelpers/src/main/resources/checkstyle/import-control.xml diff --git a/checkstyle/vaadin-checkstyle.xml b/buildhelpers/src/main/resources/checkstyle/vaadin-checkstyle.xml index 4f25ec6996..eb6c625067 100644 --- a/checkstyle/vaadin-checkstyle.xml +++ b/buildhelpers/src/main/resources/checkstyle/vaadin-checkstyle.xml @@ -144,11 +144,12 @@ <module name="IllegalImport" /> <!-- defaults to sun.* packages --> <module name="RedundantImport" /> <module name="UnusedImports" /> +<!-- <module name="ImportControl"> <property name="file" value="${checkstyle.importControl.file}" /> <property name="severity" value="error" /> </module> - +--> <!-- Checks for Size Violations. --> <!-- See http://checkstyle.sf.net/config_sizes.html --> diff --git a/common.xml b/common.xml index 339453ffd5..0c817afa1c 100644 --- a/common.xml +++ b/common.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="common" basedir="." default="checkstyle" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> +<project name="common" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <tstamp> <format property="build.date" pattern="yyyy-MM-dd" /> @@ -14,29 +14,4 @@ <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> - - <!-- Checkstyle conf --> - <property name="cs.dir" location="${vaadin.basedir}/checkstyle" /> - <property name="cs.xml" location="${cs.dir}/vaadin-checkstyle.xml" /> - <property name="cs.header-file" location="${cs.dir}/header" /> - <property name="cs.import-control-file" location="${cs.dir}/import-control.xml" /> - <taskdef resource="checkstyletask.properties" uri="antlib:com.puppycrawl.tools.checkstyle" classpathref="taskdefs.classpath" /> - - <target name="checkstyle"> - <fail unless="result.dir" message="No result.dir parameter given" /> - <fail unless="cs.src" message="No cs.src parameter given" /> - <property name="result.dir.full" location="${result.dir}" /> - <mkdir dir="${result.dir}" /> - <echo>##teamcity[importData type='checkstyle' path='${result.dir.full}/checkstyle-errors.xml']</echo> - <cs:checkstyle config="${cs.xml}" failOnViolation="false"> - <fileset dir="${cs.src}" includes="**/*.java"> - <exclude name="com/vaadin/sass/internal/parser/Parser.java" /> - <exclude name="com/vaadin/sass/internal/parser/ParserConstants.java" /> - <exclude name="com/vaadin/sass/internal/parser/ParserTokenManager.java" /> - </fileset> - <formatter type="xml" toFile="${result.dir}/checkstyle-errors.xml" /> - <property key="checkstyle.header.file" file="${cs.header-file}" /> - <property key="checkstyle.importControl.file" file="${cs.import-control-file}" /> - </cs:checkstyle> - </target> </project> @@ -76,7 +76,6 @@ <modules> - <module>all</module> <module>buildhelpers</module> <module>shared</module> <module>push</module> @@ -88,6 +87,7 @@ <module>widgets</module> <module>uitest</module> <module>liferay</module> + <module>all</module> <!-- Nexus staging bug needs the last module to be deployed. --> <module>bom</module> </modules> @@ -171,6 +171,11 @@ <version>${vaadin.plugin.version}</version> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + </plugin> + <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> <version>1.0.0</version> @@ -204,6 +209,33 @@ </pluginManagement> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <dependencies> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-buildhelpers</artifactId> + <version>${project.version}</version> + </dependency> + <!-- Needed because of a JavadocMethodCheck bug in 6.11 --> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>6.17</version> + </dependency> + </dependencies> + <configuration> + <configLocation>checkstyle/vaadin-checkstyle.xml</configLocation> + <headerLocation>checkstyle/header</headerLocation> + <encoding>UTF-8</encoding> + <consoleOutput>false</consoleOutput> + <failsOnError>false</failsOnError> + <linkXRef>false</linkXRef> + </configuration> + </plugin> + <!-- Unpacked Dependencies as resource --> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/uitest/build.xml b/uitest/build.xml index f70d335942..c0d6aff784 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -65,10 +65,7 @@ <fail unless="result.dir" message="No result.dir parameter given" /> <delete dir="${result.dir}" /> </target> - <target name="checkstyle"> - <echo>Checkstyle is disabled for uitest for now</echo> - </target> - <target name="test" depends="checkstyle"> + <target name="test"> </target> <target name="test-testbench" depends="clean-testbench-errors" diff --git a/uitest/pom.xml b/uitest/pom.xml index 8430014379..f63b9e7fa6 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -349,6 +349,13 @@ <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> |