Repository: camel Updated Branches: refs/heads/master edea5fecd -> 895c47491
CAMEL-11194 Upgrade Checkstyle and update rules Workaround for Maven 3.2.5 - 3.3.9 versions Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/895c4749 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/895c4749 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/895c4749 Branch: refs/heads/master Commit: 895c4749197e567753e51adf6e0ffaa312e13ebf Parents: edea5fe Author: Zoran Regvart <zregv...@apache.org> Authored: Mon May 8 14:31:08 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Mon May 8 14:31:24 2017 +0200 ---------------------------------------------------------------------- buildingtools/pom.xml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/895c4749/buildingtools/pom.xml ---------------------------------------------------------------------- diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml index 9af1cf1..c235e16 100644 --- a/buildingtools/pom.xml +++ b/buildingtools/pom.xml @@ -35,8 +35,20 @@ </properties> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> <!-- This updates header-*.txt with the content of header.txt and the appropriate formatting for @@ -122,12 +134,10 @@ --> <artifactId>maven-resources-plugin</artifactId> <configuration> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> + <useDefaultDelimiters>false</useDefaultDelimiters> </configuration> </plugin> </plugins>
