Repository: camel Updated Branches: refs/heads/master e53b17117 -> 24fd0ccfe
CAMEL-11251 Curcular dependency from buildtools... ... to buildtools via license-plugin This moves the declaration of mycila license plugin to the `license` profile in order to remove the cyclic dependency from `camel-buildtools`. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/24fd0ccf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/24fd0ccf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/24fd0ccf Branch: refs/heads/master Commit: 24fd0ccfeff22bf9e605e76b3a48f152dadbe56e Parents: e53b171 Author: Zoran Regvart <zregv...@apache.org> Authored: Tue May 9 23:25:54 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Wed May 10 00:24:57 2017 +0200 ---------------------------------------------------------------------- pom.xml | 74 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/24fd0ccf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 04a02d2..70dd388 100755 --- a/pom.xml +++ b/pom.xml @@ -333,44 +333,6 @@ <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> - - <plugin> - <groupId>com.mycila</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>${mycila-license-version}</version> - <configuration> - <header>header.txt</header> - <excludes> - <exclude>KEYS</exclude> - <exclude>**/NOTICE</exclude> - <exclude>**/LICENSE</exclude> - <exclude>**/NOTICE.txt</exclude> - <exclude>**/LICENSE.txt</exclude> - <exclude>doap.rdf</exclude> - <exclude>**/README</exclude> - <exclude>**/*.adoc</exclude> - <exclude>**/node_modules/**</exclude> - <exclude>**/cacerts</exclude> - <exclude>**/*.p12</exclude> - <exclude>**/*.txt</exclude> - </excludes> - <mapping> - <properties>CAMEL_PROPERTIES_STYLE</properties> - <spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories> - <spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides> - </mapping> - <headerDefinitions> - <headerDefinition>license-properties-headerdefinition.xml</headerDefinition> - </headerDefinitions> - </configuration> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-buildtools</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> </plugins> </pluginManagement> </build> @@ -769,14 +731,46 @@ </profile> <profile> - <id>update-license</id> + <id>license</id> <build> - <defaultGoal>com.mycila:license-maven-plugin:format</defaultGoal> + <defaultGoal>license:format</defaultGoal> <plugins> <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> <version>${mycila-license-version}</version> + <configuration> + <header>header.txt</header> + <excludes> + <exclude>KEYS</exclude> + <exclude>**/NOTICE</exclude> + <exclude>**/LICENSE</exclude> + <exclude>**/NOTICE.txt</exclude> + <exclude>**/LICENSE.txt</exclude> + <exclude>doap.rdf</exclude> + <exclude>**/README</exclude> + <exclude>**/*.adoc</exclude> + <exclude>**/node_modules/**</exclude> + <exclude>**/cacerts</exclude> + <exclude>**/*.p12</exclude> + <exclude>**/*.txt</exclude> + </excludes> + <mapping> + <properties>CAMEL_PROPERTIES_STYLE</properties> + <spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories> + <spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides> + </mapping> + <headerDefinitions> + <headerDefinition>license-properties-headerdefinition.xml</headerDefinition> + </headerDefinitions> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-buildtools</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> </build>
