Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with non-needed dependencies causing assembly problems.

Browse Source
This commit is contained in:
Ulrik Sandberg
2010-01-24 17:22:05 +00:00
parent 0d49570aa6
commit 6d078288d3
7 changed files with 17 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldif/ldif-batch/src/test/resources/log4j.properties
View File

@@ -9,4 +9,4 @@ log4j.logger.org.springframework.context=INFO, console
log4j.logger.org.springframework.transaction=INFO, console
log4j.logger.org.springframework.aop=INFO, console
log4j.logger.org.springframework.batch=INFO, console
log4j.logger.org.springframework.ldap.ldif=DEBUG, console
log4j.logger.org.springframework.ldap.ldif=INFO, console

56
ldif/pom.xml
View File

@@ -11,64 +11,8 @@
<packaging>pom</packaging>
<name>Spring LDAP LDIF</name>
<description>This packages provides an LDIF Parser for use with the Spring LDAP suite of utilities.</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
<show>public</show>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
<link>http://static.springsource.org/spring/docs/2.5.x/api/</link>
<link>http://static.springsource.org/spring-ldap/docs/1.3.x/apidocs/</link>
<link>http://static.springsource.org/spring-batch/apidocs/</link>
</links>
</configuration>
</plugin>
</plugins>
</build>
<modules>
<module>ldif-core</module>
<module>ldif-batch</module>
</modules>
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<version>${version}</version>
<classifier>all</classifier>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

4
pom.xml
View File

@@ -121,10 +121,10 @@
<module>parent</module>
<module>core</module>
<module>core-tiger</module>
<module>ldif</module>
<module>odm</module>
<module>test-support</module>
<module>test</module>
<module>ldif</module>
<module>odm</module>
</modules>
<profiles>
<profile>

2
src/assembly/all.xml
View File

@@ -11,6 +11,8 @@
<include>org.springframework.ldap:spring-ldap-core</include>
<include>org.springframework.ldap:spring-ldap-core-tiger</include>
<include>org.springframework.ldap:spring-ldap-odm</include>
<include>org.springframework.ldap:spring-ldap-ldif-core</include>
<include>org.springframework.ldap:spring-ldap-ldif-batch</include>
<include>org.springframework.ldap:spring-ldap-test</include>
</includes>
<binaries>

2
src/assembly/minimal.xml
View File

@@ -14,6 +14,8 @@
<include>org.springframework.ldap:spring-ldap-core</include>
<include>org.springframework.ldap:spring-ldap-core-tiger</include>
<include>org.springframework.ldap:spring-ldap-odm</include>
<include>org.springframework.ldap:spring-ldap-ldif-core</include>
<include>org.springframework.ldap:spring-ldap-ldif-batch</include>
<include>org.springframework.ldap:spring-ldap-test</include>
</includes>
<binaries>

8
src/assembly/sources.xml
View File

@@ -18,6 +18,14 @@
<directory>odm/src/main/java</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>ldif/ldif-core/src/main/java</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>ldif/ldif-batch/src/main/java</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>test-support/src/main/java</directory>
<outputDirectory/>

2
src/assembly/with-dependencies.xml
View File

@@ -14,6 +14,8 @@
<include>org.springframework.ldap:spring-ldap-core</include>
<include>org.springframework.ldap:spring-ldap-core-tiger</include>
<include>org.springframework.ldap:spring-ldap-odm</include>
<include>org.springframework.ldap:spring-ldap-ldif-core</include>
<include>org.springframework.ldap:spring-ldap-ldif-batch</include>
<include>org.springframework.ldap:spring-ldap-test</include>
</includes>
<binaries>