Skip to content

Commit 3f7c558

Browse files
author
Alex Huang
committed
Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project
1 parent 72c4610 commit 3f7c558

24 files changed

Lines changed: 18 additions & 654 deletions

File tree

‎engine/orchestration/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,9 @@
5353
<artifactId>cloud-server</artifactId>
5454
<version>${project.version}</version>
5555
</dependency>
56-
<dependency>
57-
<groupId>org.mockito</groupId>
58-
<artifactId>mockito-all</artifactId>
59-
<version>1.9.5</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>javax.inject</groupId>
63-
<artifactId>javax.inject</artifactId>
64-
<version>1</version>
65-
</dependency>
6656
</dependencies>
6757
<build>
6858
<defaultGoal>install</defaultGoal>
69-
<sourceDirectory>src</sourceDirectory>
70-
<testSourceDirectory>test</testSourceDirectory>
7159
<plugins>
7260
<plugin>
7361
<artifactId>maven-surefire-plugin</artifactId>

‎engine/service/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
<name>Apache CloudStack Cloud Engine Service</name>
3131
<url>http://www.cloudstack.org</url>
3232
<dependencies>
33-
<dependency>
34-
<groupId>junit</groupId>
35-
<artifactId>junit</artifactId>
36-
<version>3.8.1</version>
37-
<scope>test</scope>
38-
</dependency>
3933
<dependency>
4034
<groupId>org.apache.cloudstack</groupId>
4135
<artifactId>cloud-engine-api</artifactId>

‎engine/storage/cache/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,8 @@
3131
<version>${cs.mysql.version}</version>
3232
<scope>provided</scope>
3333
</dependency>
34-
<dependency>
35-
<groupId>org.mockito</groupId>
36-
<artifactId>mockito-all</artifactId>
37-
<version>1.9.5</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>javax.inject</groupId>
41-
<artifactId>javax.inject</artifactId>
42-
<version>1</version>
43-
</dependency>
4434
</dependencies>
4535
<build>
4636
<defaultGoal>install</defaultGoal>
47-
<sourceDirectory>src</sourceDirectory>
48-
<testSourceDirectory>test</testSourceDirectory>
4937
</build>
5038
</project>

‎engine/storage/datamotion/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@
4343
<version>${cs.mysql.version}</version>
4444
<scope>provided</scope>
4545
</dependency>
46-
<dependency>
47-
<groupId>org.mockito</groupId>
48-
<artifactId>mockito-all</artifactId>
49-
<version>1.9.5</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>javax.inject</groupId>
53-
<artifactId>javax.inject</artifactId>
54-
<version>1</version>
55-
</dependency>
5646
</dependencies>
5747
<build>
5848
<defaultGoal>install</defaultGoal>

‎engine/storage/image/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,5 @@
3131
<version>${cs.mysql.version}</version>
3232
<scope>provided</scope>
3333
</dependency>
34-
<dependency>
35-
<groupId>org.mockito</groupId>
36-
<artifactId>mockito-all</artifactId>
37-
<version>1.9.5</version>
38-
</dependency>
39-
40-
<dependency>
41-
<groupId>javax.inject</groupId>
42-
<artifactId>javax.inject</artifactId>
43-
<version>1</version>
44-
</dependency>
4534
</dependencies>
46-
<build>
47-
<defaultGoal>install</defaultGoal>
48-
<sourceDirectory>src</sourceDirectory>
49-
<testSourceDirectory>test</testSourceDirectory>
50-
</build>
5135
</project>

‎engine/storage/integration-test/pom.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,6 @@
128128
<version>${cs.mysql.version}</version>
129129
<scope>provided</scope>
130130
</dependency>
131-
<dependency>
132-
<groupId>org.mockito</groupId>
133-
<artifactId>mockito-all</artifactId>
134-
<version>1.9.5</version>
135-
</dependency>
136-
<dependency>
137-
<groupId>javax.inject</groupId>
138-
<artifactId>javax.inject</artifactId>
139-
<version>1</version>
140-
</dependency>
141131
<dependency>
142132
<groupId>org.testng</groupId>
143133
<artifactId>testng</artifactId>
@@ -147,13 +137,6 @@
147137

148138
</dependencies>
149139
<build>
150-
<defaultGoal>install</defaultGoal>
151-
<testSourceDirectory>${project.basedir}/test</testSourceDirectory>
152-
<testResources>
153-
<testResource>
154-
<directory>${project.basedir}/test/resource</directory>
155-
</testResource>
156-
</testResources>
157140
<plugins>
158141
<plugin>
159142
<artifactId>maven-compiler-plugin</artifactId>

‎engine/storage/integration-test/test/resource/StorageAllocatorTestContext.xml‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎engine/storage/integration-test/test/resource/component.xml‎

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)