From 244790db8dfbcea6416823bb60c2bf6961e6572d Mon Sep 17 00:00:00 2001
From: Ben Hale <ben.hale@springsource.com>
Date: Mon, 27 Oct 2008 10:48:31 +0000
Subject: [PATCH] Removed bad merge from Maven

---
 core-tiger/pom.xml             |  8 ++++++--
 core/pom.xml                   |  8 ++++++--
 parent/pom.xml                 | 14 +++++++++-----
 pom.xml                        | 23 ++++++++++++++++-------
 test-support/pom.xml           |  8 ++++++--
 test/integration-tests/pom.xml | 10 +++++++---
 test/pom.xml                   | 10 +++++++---
 7 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 48f6d0a7..53fbad5f 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -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>
diff --git a/core/pom.xml b/core/pom.xml
index 16b2aff8..87ff05a5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1c69c42a..95ac8e42 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 1439bd18..d6fe0674 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
\ No newline at end of file
+</project>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index 06f82f1d..fc0885e0 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -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>
diff --git a/test/integration-tests/pom.xml b/test/integration-tests/pom.xml
index c41ec6b9..b37db978 100644
--- a/test/integration-tests/pom.xml
+++ b/test/integration-tests/pom.xml
@@ -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>
\ No newline at end of file
+</project>
diff --git a/test/pom.xml b/test/pom.xml
index b5c54802..185b16c7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -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>
\ No newline at end of file
+</project>