diff options
| author | elmot <elmot@vaadin.com> | 2016-04-27 13:55:20 +0300 |
|---|---|---|
| committer | elmot <elmot@vaadin.com> | 2016-04-27 14:09:56 +0300 |
| commit | 4410535d9accffe4cb3180359010f39d00453039 (patch) | |
| tree | 52ab1e948bf8c8fa2542620b7504ca14b4d85d8c | |
| parent | 882fc8c78680eedec3a1802cc309339662a4281d (diff) | |
| download | vaadin-framework-4410535d9accffe4cb3180359010f39d00453039.tar.gz vaadin-framework-4410535d9accffe4cb3180359010f39d00453039.zip | |
Move checkstyles plugin to actual modules
Change-Id: I2d87a1aeba8ffc8cc15909c32a0c9d10b3ada9a7
| -rw-r--r-- | all/pom.xml | 13 | ||||
| -rw-r--r-- | buildhelpers/pom.xml | 12 | ||||
| -rw-r--r-- | checkstyle/header (renamed from buildhelpers/src/main/resources/checkstyle/header) | 0 | ||||
| -rw-r--r-- | checkstyle/import-control.xml (renamed from buildhelpers/src/main/resources/checkstyle/import-control.xml) | 0 | ||||
| -rw-r--r-- | checkstyle/vaadin-checkstyle.xml (renamed from buildhelpers/src/main/resources/checkstyle/vaadin-checkstyle.xml) | 0 | ||||
| -rw-r--r-- | client-compiler/pom.xml | 12 | ||||
| -rw-r--r-- | client/pom.xml | 13 | ||||
| -rw-r--r-- | pom.xml | 42 | ||||
| -rw-r--r-- | server/pom.xml | 13 | ||||
| -rw-r--r-- | shared/pom.xml | 13 | ||||
| -rw-r--r-- | uitest/pom.xml | 7 | ||||
| -rw-r--r-- | widgets/pom.xml | 13 |
12 files changed, 105 insertions, 33 deletions
diff --git a/all/pom.xml b/all/pom.xml index fce46efd1f..5d29cd73cb 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -89,6 +89,19 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml index 4dee81d1cb..cfe8187c11 100644 --- a/buildhelpers/pom.xml +++ b/buildhelpers/pom.xml @@ -43,6 +43,18 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> diff --git a/buildhelpers/src/main/resources/checkstyle/header b/checkstyle/header index a1063268ac..a1063268ac 100644 --- a/buildhelpers/src/main/resources/checkstyle/header +++ b/checkstyle/header diff --git a/buildhelpers/src/main/resources/checkstyle/import-control.xml b/checkstyle/import-control.xml index 076dbd8a22..076dbd8a22 100644 --- a/buildhelpers/src/main/resources/checkstyle/import-control.xml +++ b/checkstyle/import-control.xml diff --git a/buildhelpers/src/main/resources/checkstyle/vaadin-checkstyle.xml b/checkstyle/vaadin-checkstyle.xml index eb6c625067..eb6c625067 100644 --- a/buildhelpers/src/main/resources/checkstyle/vaadin-checkstyle.xml +++ b/checkstyle/vaadin-checkstyle.xml diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index 30e51f4764..f97b85fd51 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -250,6 +250,18 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> <!-- Copy .java files to package --> diff --git a/client/pom.xml b/client/pom.xml index 0c4cf1d7ce..8a80b3ddbb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -201,6 +201,19 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <configuration> @@ -174,6 +174,22 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.17</version> + <dependencies> + <!-- 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> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -215,32 +231,6 @@ <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <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> - - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> diff --git a/server/pom.xml b/server/pom.xml index 6419b31dc0..92ed9c2713 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -219,6 +219,19 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> diff --git a/shared/pom.xml b/shared/pom.xml index 0dc923d314..8706e45f70 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -186,6 +186,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> </plugins> diff --git a/uitest/pom.xml b/uitest/pom.xml index 78e2c0e4ee..ab3d3db20c 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -337,13 +337,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <configuration> diff --git a/widgets/pom.xml b/widgets/pom.xml index 5bef76aab5..5fa0f7120b 100644 --- a/widgets/pom.xml +++ b/widgets/pom.xml @@ -199,6 +199,19 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> |