Skip to content

Commit 43e4de4

Browse files
ibuildthecloudibuildthecloud
committed
Fix up some dependencies
1 parent 7fbc59d commit 43e4de4

3 files changed

Lines changed: 26 additions & 6 deletions

File tree

‎pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
<cs.pool.version>1.6</cs.pool.version>
5454
<cs.codec.version>1.6</cs.codec.version>
5555
<cs.configuration.version>1.8</cs.configuration.version>
56+
<cs.collections.version>3.2.1</cs.collections.version>
57+
<cs.logging.version>1.1.1</cs.logging.version>
58+
<cs.discovery.version>0.5</cs.discovery.version>
5659
<cs.ejb.version>3.0</cs.ejb.version>
5760
<cs.junit.version>4.10</cs.junit.version>
5861
<cs.bcprov.version>1.46</cs.bcprov.version>
@@ -75,6 +78,8 @@
7578
<cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
7679
<cs.neethi.version>2.0.4</cs.neethi.version>
7780
<cs.servlet.version>2.4</cs.servlet.version>
81+
<cs.jstl.version>1.2</cs.jstl.version>
82+
7883
<skipTests>true</skipTests>
7984

8085
</properties>

‎server/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
<artifactId>mail</artifactId>
6060
<version>${cs.mail.version}</version>
6161
</dependency>
62-
<!-- <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-utils</artifactId>
63-
<version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
64-
</dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-agent</artifactId>
65-
<version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
66-
</dependency> -->
62+
<dependency>
63+
<groupId>jstl</groupId>
64+
<artifactId>jstl</artifactId>
65+
<version>${cs.jstl.version}</version>
66+
</dependency>
6767
</dependencies>
6868
<build>
6969
<defaultGoal>install</defaultGoal>

‎utils/pom.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>cglib</groupId>
37-
<artifactId>cglib</artifactId>
37+
<artifactId>cglib-nodep</artifactId>
3838
<version>${cs.cglib.version}</version>
3939
</dependency>
4040
<dependency>
@@ -63,6 +63,21 @@
6363
<artifactId>commons-codec</artifactId>
6464
<version>${cs.codec.version}</version>
6565
</dependency>
66+
<dependency>
67+
<groupId>commons-collections</groupId>
68+
<artifactId>commons-collections</artifactId>
69+
<version>${cs.collections.version}</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>commons-discovery</groupId>
73+
<artifactId>commons-discovery</artifactId>
74+
<version>${cs.discovery.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>commons-logging</groupId>
78+
<artifactId>commons-logging</artifactId>
79+
<version>${cs.logging.version}</version>
80+
</dependency>
6681
<dependency>
6782
<groupId>org.bouncycastle</groupId>
6883
<artifactId>bcprov-jdk16</artifactId>

0 commit comments

Comments
 (0)