cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [39/59] [abbrv] git commit: updated refs/heads/disk-cache to bbae6f8
Date Wed, 25 Sep 2013 10:29:34 GMT
Cleanup pom.xml in various projects to properly use managed versions and other defaults


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

Branch: refs/heads/disk-cache
Commit: 15a97ec4126da99990d34c55afdbc1fe716f9fd5
Parents: 4945d46
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Sat Sep 21 17:21:06 2013 +0800
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Sat Sep 21 17:21:06 2013 +0800

----------------------------------------------------------------------
 developer/pom.xml                             | 1 -
 engine/storage/integration-test/pom.xml       | 3 +--
 plugins/hypervisors/ucs/pom.xml               | 2 --
 plugins/hypervisors/xen/pom.xml               | 1 +
 plugins/network-elements/dns-notifier/pom.xml | 1 -
 services/secondary-storage/pom.xml            | 1 -
 test/pom.xml                                  | 7 ++-----
 tools/devcloud-kvm/pom.xml                    | 1 -
 tools/devcloud/pom.xml                        | 1 -
 tools/marvin/pom.xml                          | 1 -
 tools/pom.xml                                 | 1 -
 11 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index be14494..0eb18bf 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -74,7 +74,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/engine/storage/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index 46c3161..dc4065e 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -119,13 +119,13 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
+      <!--  TODO: Is this version override required -->
       <version>4.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>${cs.mysql.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -150,7 +150,6 @@
       </plugin>
        <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <id>generate-resource</id>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/plugins/hypervisors/ucs/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml
index 0309a42..ae9708c 100755
--- a/plugins/hypervisors/ucs/pom.xml
+++ b/plugins/hypervisors/ucs/pom.xml
@@ -18,9 +18,7 @@
     <version>4.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cloudstack</groupId>
   <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
-  <version>4.3.0-SNAPSHOT</version>
   <name>Apache CloudStack Plugin - Hypervisor UCS</name>
   <url>http://maven.apache.org</url>
   <properties>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/plugins/hypervisors/xen/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
index 9621f49..66b6b1d 100644
--- a/plugins/hypervisors/xen/pom.xml
+++ b/plugins/hypervisors/xen/pom.xml
@@ -33,6 +33,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
+      <!-- TODO: Check if we need this version override -->
       <version>4.2.2</version>
       <scope>compile</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/plugins/network-elements/dns-notifier/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml
index a0fa242..8c63ebf 100644
--- a/plugins/network-elements/dns-notifier/pom.xml
+++ b/plugins/network-elements/dns-notifier/pom.xml
@@ -25,7 +25,6 @@
     <version>4.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cloudstack</groupId>
   <artifactId>cloud-plugin-example-dns-notifier</artifactId>
   <name>Apache CloudStack Plugin - Dns Notifier Example</name>
   <description>This is sample source code on how to write a plugin for CloudStack</description>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/services/secondary-storage/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml
index 2015ce0..b2f10f9 100644
--- a/services/secondary-storage/pom.xml
+++ b/services/secondary-storage/pom.xml
@@ -59,7 +59,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.14</version>
         <configuration>
          <skipTests>${skipTests}</skipTests>
          <systemPropertyVariables>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index eb69705..d04a045 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -34,8 +34,7 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>${cs.log4j.version}</version>
-        </dependency>
+            </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -44,12 +43,10 @@
         <dependency>
             <groupId>com.trilead</groupId>
             <artifactId>trilead-ssh2</artifactId>
-            <version>${cs.trilead.version}</version>
-        </dependency>
+            </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>apache-log4j-extras</artifactId>
-            <version>${cs.log4j.extras.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>log4j</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/tools/devcloud-kvm/pom.xml
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml
index 6c1b543..c95cf42 100644
--- a/tools/devcloud-kvm/pom.xml
+++ b/tools/devcloud-kvm/pom.xml
@@ -24,7 +24,6 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.21</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/tools/devcloud/pom.xml
----------------------------------------------------------------------
diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml
index 51b40f0..aa1a7db 100644
--- a/tools/devcloud/pom.xml
+++ b/tools/devcloud/pom.xml
@@ -24,7 +24,6 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.21</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/tools/marvin/pom.xml
----------------------------------------------------------------------
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
index a23c652..0869248 100644
--- a/tools/marvin/pom.xml
+++ b/tools/marvin/pom.xml
@@ -24,7 +24,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <id>clean</id>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a97ec4/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index 9633109..a7c5a2d 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <name>Apache CloudStack Developer Tools</name>
-    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-tools</artifactId>
     <packaging>pom</packaging>
     <parent>


Mime
View raw message