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 2012/11/07 17:56:15 UTC

git commit: Summary: cleanup up dependencies

Updated Branches:
  refs/heads/master e6b539ad7 -> 6c411fb24


Summary: cleanup up dependencies

Fixing some dependency issues, console-proxy only depends on agent (and
the core,api,utils via agent) and patches depends on nothing as its just
creating an achive with scripts

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

Branch: refs/heads/master
Commit: 6c411fb2490df5fe374a786c84799bf602031168
Parents: e6b539a
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Nov 7 17:47:04 2012 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Nov 7 17:50:02 2012 +0100

----------------------------------------------------------------------
 console-proxy/pom.xml |   15 -----------
 patches/pom.xml       |   61 +-------------------------------------------
 2 files changed, 1 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c411fb2/console-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index fc758cd..ef0b656 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -44,26 +44,11 @@
     <!-- required deps for the systemvm -->
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-agent</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-patches</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c411fb2/patches/pom.xml
----------------------------------------------------------------------
diff --git a/patches/pom.xml b/patches/pom.xml
index 86aa916..a662bcb 100644
--- a/patches/pom.xml
+++ b/patches/pom.xml
@@ -13,49 +13,12 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-patches</artifactId>
   <name>Apache CloudStack SystemVM Patches</name>
+  <packaging>pom</packaging>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
     <version>4.1.0-SNAPSHOT</version>
   </parent>
-  <dependencies>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${cs.log4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>${cs.codec.version}</version>
-    </dependency>
-    <!-- required deps for the systemvm -->
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-agent</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -111,26 +74,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>vmware</id>
-      <activation>
-        <property>
-          <name>nonoss</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.cloudstack</groupId>
-          <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.cloudstack</groupId>
-          <artifactId>cloud-vmware-base</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
 </project>