Re-enabled LDAP tests and moved log4j after apache-ds in dependency list to avoid classpath issues

This commit is contained in:
Luke Taylor 2005-12-16 03:20:36 +00:00
parent bfb4fb81d4
commit 31be69be37
1 changed files with 12 additions and 13 deletions

View File

@ -256,15 +256,6 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -360,6 +351,17 @@
<type>jar</type>
</dependency>
<!-- Keep log4j after the apacheds stuff to avoid nasty classpath errors -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
@ -389,9 +391,6 @@
<includes>
<include>**/*Tests.java</include>
</includes>
<excludes>
<exclude>**/ldap/**</exclude>
</excludes>
<resources>
<resource>
<directory>${basedir}/src/test/resources</directory>