From d3cd73d86160dfa0d633c9460dd05667834ebe67 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Wed, 22 Jan 2014 11:15:39 +0100 Subject: [PATCH] Add license check plugin to root pom. Disabled for the entire project, except for poms that override it (opendaylight, nvp) --- LICENSE.header | 10 ++-- plugins/network-elements/nicira-nvp/pom.xml | 15 ++++++ plugins/network-elements/opendaylight/pom.xml | 26 ++--------- pom.xml | 46 +++++++++++++++++++ 4 files changed, 70 insertions(+), 27 deletions(-) diff --git a/LICENSE.header b/LICENSE.header index 4eacb643179..60b675e3101 100644 --- a/LICENSE.header +++ b/LICENSE.header @@ -1,16 +1,16 @@ Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file +or more contributor license agreements. See the NOTICE file distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file +regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at +with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the +KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index a4b4c494da9..78985f6259e 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -34,6 +34,21 @@ true + + + com.mycila + license-maven-plugin + + + cloudstack-checklicence + process-classes + + check + + + + + diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml index 47d66f60b13..03a899fd4ac 100644 --- a/plugins/network-elements/opendaylight/pom.xml +++ b/plugins/network-elements/opendaylight/pom.xml @@ -48,35 +48,17 @@ - com.mycila.maven-license-plugin - maven-license-plugin - 1.9.0 + com.mycila + license-maven-plugin + cloudstack-checklicence process-classes - format + check - - true - true -
../../../LICENSE.header
- - XML_STYLE -     DOUBLESLASH_STYLE -     SEMICOLON_STYLE - - false - - target/** - .settings/** - .checkstyle - .project - .classpath - -
diff --git a/pom.xml b/pom.xml index db88fe9adc4..9770ec7ccb9 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,7 @@ 1.0.10 4.0.0 2.11 + 2.5 @@ -455,6 +456,19 @@ + + com.mycila + license-maven-plugin + + + cloudstack-checklicence + none + + check + + + + @@ -488,6 +502,38 @@ **\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/awsapi\/,**\/XenServerJava\/,**\/apidoc\/ + + com.mycila + license-maven-plugin + ${cs.mycila.license.version} + + + cloudstack-checklicence + process-classes + + check + + + + + true + true +
LICENSE.header
+ + XML_STYLE +     DOUBLESLASH_STYLE +     SEMICOLON_STYLE + + false + + **/target/** + .settings/** + .checkstyle + .project + .classpath + +
+
maven-clean-plugin