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

Removed bad merge from Maven

Browse Source
This commit is contained in:
Ben Hale
2008-10-27 10:48:31 +00:00
parent 90e5e1dd28
commit 244790db8d
7 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core-tiger/pom.xml
View File

@@ -1,9 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-core-tiger</artifactId>

8
core/pom.xml
View File

@@ -1,9 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-core</artifactId>

14
parent/pom.xml
View File

@@ -1,10 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<packaging>pom</packaging>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
<name>Spring LDAP - Parent</name>
<distributionManagement>
<downloadUrl>http://static.springframework.org/spring-ldap/site/downloads/releases.html</downloadUrl>
@@ -24,9 +28,9 @@
</site>
</distributionManagement>
<scm>
<connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/tags/spring-ldap-1.3.0.RC1</connection>
<developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/tags/spring-ldap-1.3.0.RC1</developerConnection>
<url>http://fisheye3.cenqua.com/browse/springframework/spring-ldap/tags/spring-ldap-1.3.0.RC1</url>
<connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk</connection>
<developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk</developerConnection>
<url>http://fisheye3.cenqua.com/browse/springframework/spring-ldap/trunk</url>
</scm>
<properties>
<spring.version>2.5.5</spring.version>

23
pom.xml
View File

@@ -1,10 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring LDAP</name>
@@ -98,9 +102,13 @@
</site>
</distributionManagement>
<scm>
<connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/tags/spring-ldap-1.3.0.RC1</connection>
<developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/tags/spring-ldap-1.3.0.RC1</developerConnection>
<url>http://fisheye3.cenqua.com/browse/springframework/spring-ldap/tags/spring-ldap-1.3.0.RC1</url>
<connection>
scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk
</connection>
<developerConnection>
scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk
</developerConnection>
<url>http://fisheye3.cenqua.com/browse/springframework/spring-ldap/trunk</url>
</scm>
<properties>
<docbook.source>${basedir}/src/docbkx</docbook.source>
@@ -372,7 +380,8 @@
<include name="**/*.pdf" />
</fileset>
</copy>
<copy todir="target/site/reference/html/images">
<copy
todir="target/site/reference/html/images">
<fileset dir="src/docbkx/images">
<include name="**/*.css" />
<include name="**/*.png" />
@@ -429,4 +438,4 @@
</plugin>
</plugins>
</reporting>
</project>
</project>

8
test-support/pom.xml
View File

@@ -1,9 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-test</artifactId>

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

@@ -1,9 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-integration-tests</artifactId>
@@ -97,4 +101,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

10
test/pom.xml
View File

@@ -1,9 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-integration-tests-parent</artifactId>
@@ -56,4 +60,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
</project>