You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/01/14 09:39:57 UTC

git commit: updated refs/heads/master to b61f0a7

Updated Branches:
  refs/heads/master e5512960a -> b61f0a74c


Centralize all eclipse m2e excludes in the main pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b61f0a74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b61f0a74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b61f0a74

Branch: refs/heads/master
Commit: b61f0a74cac02c02a2c820e08f5c39ab5920bbea
Parents: e551296
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Jan 14 09:38:55 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Jan 14 09:39:42 2014 +0100

----------------------------------------------------------------------
 awsapi/pom.xml                           | 43 ---------------------------
 client/pom.xml                           | 30 -------------------
 plugins/user-authenticators/ldap/pom.xml | 33 --------------------
 pom.xml                                  | 27 +++++++++++++++++
 4 files changed, 27 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b61f0a74/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 3c2bbe1..f031230 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -418,49 +418,6 @@
         </executions>
       </plugin>
     </plugins>
-      <!-- 
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId> org.apache.maven.plugins </groupId>
-                    <artifactId> maven-antrun-plugin </artifactId>
-                    <versionRange>[1.7,)</versionRange>
-                    <goals>
-                      <goal>run</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.0,)</versionRange>
-                    <goals>
-                      <goal>copy-dependencies</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute/>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    -->
   </build>
   <profiles>
     <profile>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b61f0a74/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index abbc25d..5215e0c 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -562,36 +562,6 @@
         </executions>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. 
-          It has no influence on the Maven build itself. -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId> org.apache.maven.plugins </groupId>
-                    <artifactId> maven-antrun-plugin </artifactId>
-                    <versionRange>[1.7,)</versionRange>
-                    <goals>
-                      <goal>run</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
   <profiles>
     <profile>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b61f0a74/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index dc4e172..46eec81 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -90,39 +90,6 @@
       </plugin>
 
     </plugins>
-    <pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.m2e</groupId>
-                <artifactId>lifecycle-mapping</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                    <lifecycleMappingMetadata>
-                        <pluginExecutions>
-                            <pluginExecution>
-                                <pluginExecutionFilter>
-                                    <groupId>
-                                        org.codehaus.gmaven
-                                    </groupId>
-                                    <artifactId>
-                                        gmaven-plugin
-                                    </artifactId>
-                                    <versionRange>[1.3,)</versionRange>
-                                    <goals>
-                                        <goal>compile</goal>
-                                        <goal>testCompile</goal>
-                                    </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                    <ignore></ignore>
-                                </action>
-                            </pluginExecution>
-                        </pluginExecutions>
-                    </lifecycleMappingMetadata>
-                </configuration>
-            </plugin>
-        </plugins>
-    </pluginManagement>
   </build>
   <dependencies>
     <!-- Mandatory dependencies for using Spock -->

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b61f0a74/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f65bdd..c661d31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,6 +560,33 @@
                     <ignore />
                   </action>
                 </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>com.mycila.maven-license-plugin</groupId>
+                    <artifactId>maven-license-plugin</artifactId>
+                    <versionRange>[1.9.0,)</versionRange>
+                    <goals>
+                      <goal>format</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <versionRange>[1.3,)</versionRange>
+                    <goals>
+                        <goal>compile</goal>
+                        <goal>testCompile</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                      <ignore></ignore>
+                  </action>
+                </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>