mirror of
				https://github.com/spring-projects/spring-security.git
				synced 2025-10-31 14:48:54 +00:00 
			
		
		
		
	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
					
				
							
								
								
									
										25
									
								
								project.xml
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								project.xml
									
									
									
									
									
								
							| @ -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> | ||||
| @ -358,7 +349,18 @@ | ||||
|       <artifactId>apacheds-server-main</artifactId> | ||||
|       <version>0.9.4-SNAPSHOT</version> | ||||
|       <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> | ||||
|       <groupId>jmock</groupId> | ||||
| @ -389,9 +391,6 @@ | ||||
|       <includes> | ||||
|         <include>**/*Tests.java</include> | ||||
|       </includes> | ||||
|       <excludes> | ||||
|         <exclude>**/ldap/**</exclude> | ||||
|       </excludes> | ||||
|       <resources> | ||||
|         <resource> | ||||
|           <directory>${basedir}/src/test/resources</directory> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user