Re-enabled LDAP tests and moved log4j after apache-ds in dependency list to avoid classpath issues
This commit is contained in:
parent
bfb4fb81d4
commit
31be69be37
23
project.xml
23
project.xml
|
@ -256,15 +256,6 @@
|
||||||
<war.bundle>true</war.bundle>
|
<war.bundle>true</war.bundle>
|
||||||
</properties>
|
</properties>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
|
@ -360,6 +351,17 @@
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>jmock</groupId>
|
<groupId>jmock</groupId>
|
||||||
<artifactId>jmock</artifactId>
|
<artifactId>jmock</artifactId>
|
||||||
|
@ -389,9 +391,6 @@
|
||||||
<includes>
|
<includes>
|
||||||
<include>**/*Tests.java</include>
|
<include>**/*Tests.java</include>
|
||||||
</includes>
|
</includes>
|
||||||
<excludes>
|
|
||||||
<exclude>**/ldap/**</exclude>
|
|
||||||
</excludes>
|
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
<directory>${basedir}/src/test/resources</directory>
|
<directory>${basedir}/src/test/resources</directory>
|
||||||
|
|
Loading…
Reference in New Issue