This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06ebd29cc7bdbf7966e418634aa8d96c8b3de5e3 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Aug 19 11:11:22 2020 +0200 [CAMEL-14578] Add a property to disable source checking on specific files --- camel-dependencies/pom.xml | 2 + core/camel-main/pom.xml | 22 ++++------- parent/pom.xml | 94 ++++++++++++++++++++++++++-------------------- 3 files changed, 63 insertions(+), 55 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 1e45a05..f0c07f4 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -526,6 +526,8 @@ <snmp4j-version>2.6.3_1</snmp4j-version> <solr-version>8.5.1</solr-version> <solr-version-range>[8,9)</solr-version-range> + <sourcecheckExcludes></sourcecheckExcludes> + <sourcecheckExcludesComma></sourcecheckExcludesComma> <spark-version>2.4.6</spark-version> <splunk-version>1.6.5.0_1</splunk-version> <spring-batch-version>4.2.4.RELEASE</spring-batch-version> diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml index 53f8668..9345b72 100644 --- a/core/camel-main/pom.xml +++ b/core/camel-main/pom.xml @@ -35,6 +35,14 @@ <properties> <firstVersion>3.0</firstVersion> <label>core</label> + + <sourcecheckExcludes> + **/MySecondFooConfigurer.java, + **/MySecondBarConfigurer.java + </sourcecheckExcludes> + <sourcecheckExcludesComma> + ${sourcecheckExcludes}, + </sourcecheckExcludesComma> </properties> <dependencies> @@ -159,20 +167,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>net.revelc.code</groupId> - <artifactId>impsort-maven-plugin</artifactId> - <configuration> - <excludes>**/package-info.java,**/MySecondFooConfigurer.java,**/MySecondBarConfigurer.java</excludes> - </configuration> - </plugin> - <plugin> - <groupId>net.revelc.code.formatter</groupId> - <artifactId>formatter-maven-plugin</artifactId> - <configuration> - <excludes>**/MySecondFooConfigurer.java,**/MySecondBarConfigurer.java</excludes> - </configuration> - </plugin> </plugins> </build> diff --git a/parent/pom.xml b/parent/pom.xml index 5a71fae..d8c9281 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -612,6 +612,9 @@ <camel.osgi.provide.capability /> <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest> + + <sourcecheckExcludes></sourcecheckExcludes> + <sourcecheckExcludesComma></sourcecheckExcludesComma> </properties> <dependencyManagement> @@ -3939,9 +3942,7 @@ </sourceDirectories> <headerLocation>header-java.txt</headerLocation> <includes>**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd</includes> - <excludes> - **/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java - </excludes> + <excludes>${sourcecheckExcludesComma}**/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java</excludes> </configuration> <goals> <goal>checkstyle</goal> @@ -3950,6 +3951,54 @@ </executions> </plugin> <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>impsort-maven-plugin</artifactId> + <version>${impsort-maven-plugin-version}</version> + <configuration> + <groups>java.,javax.,org.w3c.,org.xml.,junit.,*</groups> + <excludes>${sourcecheckExcludesComma}**/package-info.java</excludes> + <staticAfter>true</staticAfter> + <removeUnused>true</removeUnused> + </configuration> + <executions> + <execution> + <id>sort-imports</id> + <phase>validate</phase> + <goals> + <goal>sort</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>net.revelc.code.formatter</groupId> + <artifactId>formatter-maven-plugin</artifactId> + <version>${formatter-maven-plugin.version}</version> + <configuration> + <configFile>camel-eclipse-formatter-config.xml</configFile> + <skip>${format.skip}</skip> + <skipHtmlFormatting>true</skipHtmlFormatting> + <cachedir>${basedir}/target</cachedir> + <excludes>${sourcecheckExcludes}</excludes> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-buildtools</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>format</id> + <phase>validate</phase> + <goals> + <goal>format</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <configuration> @@ -4253,48 +4302,10 @@ <plugin> <groupId>net.revelc.code</groupId> <artifactId>impsort-maven-plugin</artifactId> - <version>${impsort-maven-plugin-version}</version> - <configuration> - <groups>java.,javax.,org.w3c.,org.xml.,junit.,*</groups> - <excludes>**/package-info.java</excludes> - <staticAfter>true</staticAfter> - <removeUnused>true</removeUnused> - </configuration> - <executions> - <execution> - <id>sort-imports</id> - <phase>process-sources</phase> - <goals> - <goal>sort</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>net.revelc.code.formatter</groupId> <artifactId>formatter-maven-plugin</artifactId> - <version>${formatter-maven-plugin.version}</version> - <configuration> - <configFile>camel-eclipse-formatter-config.xml</configFile> - <skip>${format.skip}</skip> - <skipHtmlFormatting>true</skipHtmlFormatting> - <cachedir>${basedir}/target</cachedir> - </configuration> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-buildtools</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>format</id> - <goals> - <goal>format</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -4425,6 +4436,7 @@ </execution> <execution> <id>validate</id> + <phase>validate</phase> <goals> <goal>validate</goal> </goals>
