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

Fixed problems reported after first run with Maven 3.0.

Browse Source
This commit is contained in:
Ulrik Sandberg
2010-11-16 07:10:44 +00:00
parent e0fe30ebc3
commit bede63b2c7
7 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldif/ldif-batch/pom.xml
View File

@@ -33,7 +33,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-ldif-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>

2
ldif/ldif-core/pom.xml
View File

@@ -33,7 +33,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>

6
odm/pom.xml
View File

@@ -83,13 +83,13 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core-tiger</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>

2
parent/pom.xml
View File

@@ -239,7 +239,7 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
<Spring-LDAP-Version>${project.version}</Spring-LDAP-Version>
</manifestEntries>
</archive>
</configuration>

9
pom.xml
View File

@@ -339,9 +339,6 @@
</links>
</configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
@@ -367,7 +364,7 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
<Spring-LDAP-Version>${project.version}</Spring-LDAP-Version>
</manifestEntries>
</archive>
<descriptors>
@@ -387,7 +384,7 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
<Spring-LDAP-Version>${project.version}</Spring-LDAP-Version>
</manifestEntries>
</archive>
<descriptors>
@@ -439,7 +436,7 @@
<entities>
<entity>
<name>version</name>
<value>${pom.version}</value>
<value>${project.version}</value>
</entity>
</entities>
<postProcess>

9
test/integration-tests/pom.xml
View File

@@ -49,7 +49,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<scope>test</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -57,11 +57,6 @@
<version>3.2.6.ga</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
@@ -97,4 +92,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

2
test/pom.xml
View File

@@ -47,7 +47,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>${pom.artifactId}</warName>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
</plugins>