From ef62031617b14dd65f25b0a44c338d9f8eefe1d1 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 2 Jun 2010 19:20:22 +0000
Subject: [PATCH] commented out section in distribution.xml assembly descriptor
 that aggregates dependencies into the lib/ directory until we figure out what
 our final plan is with distributing third party dependencies. also copied
 distributionManagement section from root pom to parent pom; unfortunately it
 looks like this duplication across the poms cannot be avoided.

---
 spring-integration-parent/pom.xml | 17 +++++++++++++++++
 src/assembly/distribution.xml     | 25 +++++++++++++------------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
index cea6833715..bf0659c452 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -44,6 +44,23 @@
 			</distributionManagement>
 		</profile>
 	</profiles>
+	<distributionManagement>
+		<!-- see 'staging' profile for dry-run deployment settings -->
+		<downloadUrl>http://static.springframework.org/spring-integration/site/downloads/releases.html</downloadUrl>
+		<repository>
+			<id>local</id>
+			<url>file://${java.io.tmpdir}/spring-integration-repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+		<site>
+			<id>static.springframework.org</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-integration/sites/${project.version}</url>
+		</site>
+	</distributionManagement>
 	<build>
 		<extensions>
 			<extension>
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index 8294d1f655..70e761e8e4 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly>
 	<!-- distribution assembly descriptor. packages up jars, source jars, documentation,
-		 dependencies and other resources into a single archive suitable for download and
-		 standalone use.
-		 see pom.xml 'maven-assembly-plugin' declaration
-		 see src/main/scripts/build-distribution.sh
-		 see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
+	     dependencies and other resources into a single archive suitable for download and
+	     standalone use.
+	     see pom.xml 'maven-assembly-plugin' declaration
+	     see src/main/scripts/build-distribution.sh
+	     see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
 	<id>distribution</id>
 	<formats>
 		<format>zip</format>
@@ -24,25 +24,26 @@
 			<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 -->
+			     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> -->
 		<fileSet>
 			<!-- adds reference manual (html and pdf) to the distribution archive under the
-				 'docs/reference' directory
-				 see pom.xml 'maven-javadoc-plugin' declaration -->
+			     'docs/reference' directory
+			     see pom.xml 'maven-javadoc-plugin' declaration -->
 			<directory>target/site/reference</directory>
 			<outputDirectory>docs/reference</outputDirectory>
 		</fileSet>
 		<fileSet>
 			<!-- adds javadoc html to the distribution archive under the 'docs/javadoc' directory
-				 see pom.xml 'maven-javadoc-plugin' declaration -->
+			     see pom.xml 'maven-javadoc-plugin' declaration -->
 			<directory>target/site/apidocs</directory>
 			<outputDirectory>docs/javadoc</outputDirectory>
 		</fileSet>
@@ -81,7 +82,7 @@
 		</moduleSet>
 		<moduleSet>
 			<!-- adds module source jars to the distribution archive under the 'src' directory
-				 see pom.xml 'maven-source-plugin' declaration -->
+			     see pom.xml 'maven-source-plugin' declaration -->
 			<includes>
 				<include>org.springframework.integration:spring-integration-core</include>
 				<include>org.springframework.integration:spring-integration-event</include>