You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/01/22 20:28:11 UTC
[46/53] [abbrv] git commit: updated refs/heads/rbac to 33cd1ab
Add license check plugin to root pom. Disabled for the entire project, except for poms that override it (opendaylight, nvp)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d3cd73d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3cd73d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3cd73d8
Branch: refs/heads/rbac
Commit: d3cd73d86160dfa0d633c9460dd05667834ebe67
Parents: 33eaa4f
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Jan 22 11:15:39 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Jan 22 11:22:42 2014 +0100
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3cd73d8/LICENSE.header
----------------------------------------------------------------------
diff --git a/LICENSE.header b/LICENSE.header
index 4eacb64..60b675e 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.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3cd73d8/plugins/network-elements/nicira-nvp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index a4b4c49..78985f6 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -34,6 +34,21 @@
<filtering>true</filtering>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cloudstack-checklicence</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3cd73d8/plugins/network-elements/opendaylight/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml
index 47d66f6..03a899f 100644
--- a/plugins/network-elements/opendaylight/pom.xml
+++ b/plugins/network-elements/opendaylight/pom.xml
@@ -48,35 +48,17 @@
</testResources>
<plugins>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.9.0</version>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
+ <id>cloudstack-checklicence</id>
<phase>process-classes</phase>
<goals>
- <goal>format</goal>
+ <goal>check</goal>
</goals>
</execution>
</executions>
- <configuration>
- <strictCheck>true</strictCheck>
- <aggregate>true</aggregate>
- <header>../../../LICENSE.header</header>
- <mapping>
- <xml>XML_STYLE</xml>
- <java>DOUBLESLASH_STYLE</java>
- <clj>SEMICOLON_STYLE</clj>
- </mapping>
- <useDefaultExcludes>false</useDefaultExcludes>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>.settings/**</exclude>
- <exclude>.checkstyle</exclude>
- <exclude>.project</exclude>
- <exclude>.classpath</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3cd73d8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db88fe9..9770ec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,7 @@
<cs.daemon.version>1.0.10</cs.daemon.version>
<cs.jna.version>4.0.0</cs.jna.version>
<cs.checkstyle.version>2.11</cs.checkstyle.version>
+ <cs.mycila.license.version>2.5</cs.mycila.license.version>
</properties>
<distributionManagement>
@@ -455,6 +456,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cloudstack-checklicence</id>
+ <phase>none</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -489,6 +503,38 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>${cs.mycila.license.version}</version>
+ <executions>
+ <execution>
+ <id>cloudstack-checklicence</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <strictCheck>true</strictCheck>
+ <aggregate>true</aggregate>
+ <header>LICENSE.header</header>
+ <mapping>
+ <xml>XML_STYLE</xml>
+ <java>DOUBLESLASH_STYLE</java>
+ <clj>SEMICOLON_STYLE</clj>
+ </mapping>
+ <useDefaultExcludes>false</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>.settings/**</exclude>
+ <exclude>.checkstyle</exclude>
+ <exclude>.project</exclude>
+ <exclude>.classpath</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>