Skip to content

Commit 6c411fb

Browse files
spark404spark404
committed
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
1 parent e6b539a commit 6c411fb

2 files changed

Lines changed: 1 addition & 75 deletions

File tree

‎console-proxy/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,11 @@
4242
<version>${cs.codec.version}</version>
4343
</dependency>
4444
<!-- required deps for the systemvm -->
45-
<dependency>
46-
<groupId>org.apache.cloudstack</groupId>
47-
<artifactId>cloud-core</artifactId>
48-
<version>${project.version}</version>
49-
</dependency>
5045
<dependency>
5146
<groupId>org.apache.cloudstack</groupId>
5247
<artifactId>cloud-agent</artifactId>
5348
<version>${project.version}</version>
5449
</dependency>
55-
<dependency>
56-
<groupId>org.apache.cloudstack</groupId>
57-
<artifactId>cloud-api</artifactId>
58-
<version>${project.version}</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.apache.cloudstack</groupId>
62-
<artifactId>cloud-utils</artifactId>
63-
<version>${project.version}</version>
64-
</dependency>
6550
<dependency>
6651
<groupId>org.apache.cloudstack</groupId>
6752
<artifactId>cloud-patches</artifactId>

‎patches/pom.xml‎

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,12 @@
1313
<modelVersion>4.0.0</modelVersion>
1414
<artifactId>cloud-patches</artifactId>
1515
<name>Apache CloudStack SystemVM Patches</name>
16+
<packaging>pom</packaging>
1617
<parent>
1718
<groupId>org.apache.cloudstack</groupId>
1819
<artifactId>cloudstack</artifactId>
1920
<version>4.1.0-SNAPSHOT</version>
2021
</parent>
21-
<dependencies>
22-
<dependency>
23-
<groupId>log4j</groupId>
24-
<artifactId>log4j</artifactId>
25-
<version>${cs.log4j.version}</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>com.google.code.gson</groupId>
29-
<artifactId>gson</artifactId>
30-
<version>${cs.gson.version}</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>commons-codec</groupId>
34-
<artifactId>commons-codec</artifactId>
35-
<version>${cs.codec.version}</version>
36-
</dependency>
37-
<!-- required deps for the systemvm -->
38-
<dependency>
39-
<groupId>org.apache.cloudstack</groupId>
40-
<artifactId>cloud-core</artifactId>
41-
<version>${project.version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.apache.cloudstack</groupId>
45-
<artifactId>cloud-agent</artifactId>
46-
<version>${project.version}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.apache.cloudstack</groupId>
50-
<artifactId>cloud-api</artifactId>
51-
<version>${project.version}</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.apache.cloudstack</groupId>
55-
<artifactId>cloud-utils</artifactId>
56-
<version>${project.version}</version>
57-
</dependency>
58-
</dependencies>
5922
<build>
6023
<defaultGoal>install</defaultGoal>
6124
<plugins>
@@ -111,26 +74,4 @@
11174
</plugin>
11275
</plugins>
11376
</build>
114-
<profiles>
115-
<profile>
116-
<id>vmware</id>
117-
<activation>
118-
<property>
119-
<name>nonoss</name>
120-
</property>
121-
</activation>
122-
<dependencies>
123-
<dependency>
124-
<groupId>org.apache.cloudstack</groupId>
125-
<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
126-
<version>${project.version}</version>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.apache.cloudstack</groupId>
130-
<artifactId>cloud-vmware-base</artifactId>
131-
<version>${project.version}</version>
132-
</dependency>
133-
</dependencies>
134-
</profile>
135-
</profiles>
13677
</project>

0 commit comments

Comments
 (0)