From beafd5566c9cbed945596c64ffa196323611c60f Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Sat, 4 Sep 2010 13:24:25 +0200
Subject: [PATCH] Polish whitespace and comments in pom files

- Convert spaces to tabs on -ftp/pom.xml

- Normalize multi-line comments to fit the following style:
    <!--
        depend explicitly on 2.0 in order to pick up the new
        release:update-versions goal
    -->

- Revert some of the formatting that the Maven release:update-versions
  goal forced on us. After it failed to perform its duties during the M7
  release, it appears we will not be using it anymore.
---
 pom.xml                        |  23 ++---
 spring-integration-ftp/pom.xml | 172 ++++++++++++++++-----------------
 src/assembly/distribution.xml  |  10 --
 3 files changed, 98 insertions(+), 107 deletions(-)

diff --git a/pom.xml b/pom.xml
index a98557da76..df7758a9d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,11 +30,6 @@
 		<module>spring-integration-sftp</module>
 		<module>spring-integration-twitter</module>
 	</modules>
-	<scm>
-		<connection>scm:svn:https://src.springframework.org/svn/spring-integration/trunk</connection>
-		<developerConnection>scm:svn:https://src.springframework.org/svn/spring-integration/trunk/</developerConnection>
-		<url>https://fisheye.springframework.org/browse/spring-integration/trunk</url>
-	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- dist.* properties are used by the antrun tasks below -->
@@ -256,7 +251,9 @@
 								<include name="**/*.jpg" />
 							</fileset>
 						</copy>
-						<move file="${project.basedir}/target/site/reference/pdf/index.pdf" tofile="${project.basedir}/target/site/reference/pdf/spring-integration-reference.pdf" failonerror="false" />
+						<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
+							tofile="${project.basedir}/target/site/reference/pdf/spring-integration-reference.pdf"
+							failonerror="false" />
 					</postProcess>
 				</configuration>
 			</plugin>
@@ -376,9 +373,11 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin><!--
-				run `mvn package assembly:assembly` to trigger assembly creation.
-				see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
+			<plugin>
+				<!--
+					run `mvn package assembly:assembly` to trigger assembly creation.
+					see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html
+				 -->
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>2.2-beta-5</version>
 				<inherited>false</inherited>
@@ -399,8 +398,10 @@
 					</executions>
 			</plugin>
 			<plugin>
-				<!-- depend explicitly on 2.0 in order to pick up the new
-				     release:update-versions goal -->
+				<!--
+					depend explicitly on 2.0 in order to pick up the new
+					release:update-versions goal
+				-->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
 				<version>2.0</version>
diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml
index f402efa788..b3ab0f838b 100644
--- a/spring-integration-ftp/pom.xml
+++ b/spring-integration-ftp/pom.xml
@@ -1,89 +1,89 @@
 <?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>
-    <parent>
-        <groupId>org.springframework.integration</groupId>
-        <artifactId>spring-integration-parent</artifactId>
-        <version>2.0.0.BUILD-SNAPSHOT</version>
-    </parent>
-    <groupId>org.springframework.integration</groupId>
-    <artifactId>spring-integration-ftp</artifactId>
-    <packaging>jar</packaging>
-    <name>Spring Integration FTP Support</name>
-    <dependencies>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-file</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>${cglib.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>${org.easymock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>${org.easymock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${org.springframework.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${org.springframework.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-stream</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-core</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.5</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-        </dependency>
-    </dependencies>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.integration</groupId>
+		<artifactId>spring-integration-parent</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<groupId>org.springframework.integration</groupId>
+	<artifactId>spring-integration-ftp</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Integration FTP Support</name>
+	<dependencies>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-file</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>${cglib.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>${org.easymock.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymockclassextension</artifactId>
+			<version>${org.easymock.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>${org.springframework.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${org.springframework.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-stream</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-core</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index 6b3326c9a5..116b9d557e 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -24,16 +24,6 @@
 			<outputDirectory/>
 			<lineEnding>dos</lineEnding>
 		</fileSet>
-		<!-- TODO: commented out, pending resolution of what to do with distributing 3rd party deps
-		<fileSet>
-			     adds dependency jars to the distribution archive under the 'lib' directory
-				 see pom.xml 'maven-dependency-plugin' declaration
-			<directory>${project.build.directory}/dependency</directory>
-			<includes>
-				<include>**/*.jar</include>
-			</includes>
-			<outputDirectory>lib</outputDirectory>
-		</fileSet> -->
 		<fileSet>
 			<!-- adds reference manual (html and pdf) to the distribution archive under the
 			     'docs/reference' directory