diff options
| -rw-r--r-- | checkstyle/vaadin-checkstyle.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 3 | ||||
| -rw-r--r-- | shared/pom.xml | 21 |
3 files changed, 27 insertions, 1 deletions
diff --git a/checkstyle/vaadin-checkstyle.xml b/checkstyle/vaadin-checkstyle.xml index 9739f14c8f..d04c53ab00 100644 --- a/checkstyle/vaadin-checkstyle.xml +++ b/checkstyle/vaadin-checkstyle.xml @@ -271,4 +271,8 @@ </module> + <module name="SuppressionFilter"> + <property name="file" value="${config_loc}/suppressions.xml" /> + </module> + </module> @@ -459,9 +459,10 @@ </dependency> </dependencies> <configuration> + <propertyExpansion>config_loc=${basedir}/../checkstyle</propertyExpansion> <configLocation>../checkstyle/vaadin-checkstyle.xml</configLocation> <headerLocation>../checkstyle/header</headerLocation> - <suppressionsLocation>../checkstyle/suppressions.xml</suppressionsLocation> +<!-- <suppressionsLocation>../checkstyle/suppressions.xml</suppressionsLocation> --> <encoding>UTF-8</encoding> <consoleOutput>false</consoleOutput> <failsOnError>false</failsOnError> diff --git a/shared/pom.xml b/shared/pom.xml index b2fa632415..545f40703f 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -80,6 +80,27 @@ </executions> </plugin> + <!-- Unpacked Dependencies as source --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + + <!-- Needs extra source folder for unpacked dependencies --> + <executions> + <execution> + <id>add-source-path</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${dependency.unpack.directory}</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> |