From 6c411fb2490df5fe374a786c84799bf602031168 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Wed, 7 Nov 2012 17:47:04 +0100
Subject: [PATCH] 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
---
 console-proxy/pom.xml | 15 -----------
 patches/pom.xml       | 61 +------------------------------------------
 2 files changed, 1 insertion(+), 75 deletions(-)

diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index fc758cd04cc..ef0b656edf8 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -42,26 +42,11 @@
       <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>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-patches</artifactId>
diff --git a/patches/pom.xml b/patches/pom.xml
index 86aa9169a75..a662bcb9791 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>