From 283d4c98fac7645aaf33ebf40e0df1f63288e67e Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 2 Nov 2010 17:45:55 +0200
Subject: [PATCH] trying to reduce duplication between the different poms

---
 pom.xml                                  | 176 ++++-------------------
 spring-datastore-keyvalue-parent/pom.xml | 139 +++++++++++++++---
 spring-datastore-redis/pom.xml           |   1 -
 3 files changed, 143 insertions(+), 173 deletions(-)

diff --git a/pom.xml b/pom.xml
index b1a5baf01..cf1629d6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,110 +11,19 @@
 		<module>spring-datastore-keyvalue-parent</module>
 		<module>spring-datastore-keyvalue-core</module>
 		<module>spring-datastore-redis</module>
-	</modules>
+  </modules>
 
-	<developers>
-		<developer>
-			<id>mpollack</id>
-			<name>Mark Pollack</name>
-			<email>mpollack at vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.SpringSource.com</organizationUrl>
-			<roles>
-				<role>Project Admin</role>
-				<role>Developer</role>
-			</roles>
-			<timezone>-5</timezone>
-		</developer>
-	</developers>
-
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-			<comments>
-			Copyright 2010 the original author or authors.
-			 
-			Licensed under the Apache License, Version 2.0 (the "License");
-			you may not use this file except in compliance with the License.
-			You may obtain a copy of the License at
-			
-			     http://www.apache.org/licenses/LICENSE-2.0
-			
-			Unless required by applicable law or agreed to in writing, software
-			distributed under the License is distributed on an "AS IS" BASIS,
-			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-			implied.
-			See the License for the specific language governing permissions and
-			limitations under the License.
-			</comments>
-		</license>
-	</licenses>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- dist.* properties are used by the antrun tasks below -->
-		<dist.id>spring-datastore-keyvalue</dist.id>
-		<dist.name>Spring Datastore Key-Value</dist.name>
-		<dist.key>DATADOC</dist.key>
-		<dist.version>${project.version}</dist.version>
-		<dist.releaseType>snapshot</dist.releaseType>
-		<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
-		<dist.fileName>${dist.finalName}.zip</dist.fileName>
-		<dist.filePath>target/${dist.fileName}</dist.filePath>
-		<dist.bucketName>dist.springframework.org</dist.bucketName>
-		<!-- these properties should be in ~/.m2/settings.xml
-		<dist.accessKey>s3 access key</dist.accessKey>
-		<dist.secretKey>s3 secret key</dist.secretKey>
-		-->
-	</properties>
-	<profiles>
-		<profile>
-			<id>staging</id>
-			<distributionManagement>
-				<site>
-					<id>spring-site-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-keyvalue/docs/${project.version}</url>
-				</site>
-				<repository>
-					<id>spring-milestone-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-keyvalue/milestone</url>
-				</repository>
-				<snapshotRepository>
-					<id>spring-snapshot-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/datastore-keyvalue/snapshot</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-	</profiles>
-	<distributionManagement>
-		<!-- see 'staging' profile for dry-run deployment settings -->
-		<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
-		<site>
-			<id>spring-site</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-keyvalue/docs/${project.version}</url>
-		</site>
-		<repository>
-			<id>spring-milestone</id>
-			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/milestone</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
 	<build>
 		<extensions>
 			<extension>
-				<!-- available only in the springframework maven repository. see <repositories> section below -->
 				<groupId>org.springframework.build.aws</groupId>
 				<artifactId>org.springframework.build.aws.maven</artifactId>
 				<version>2.0.0.RELEASE</version>
 			</extension>
 		</extensions>
+
 		<plugins>
+      <!--
 			<plugin>
 				<groupId>com.agilejava.docbkx</groupId>
 				<artifactId>docbkx-maven-plugin</artifactId>
@@ -140,15 +49,9 @@
 					<includes>index.xml</includes>
 					<xincludeSupported>true</xincludeSupported>
 					<foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-					<!-- original spring-build fopdf xsl
-					<foCustomization>src/docbkx/resources/xsl/pdf/fopdf.xsl</foCustomization> -->
 					<htmlStylesheet>css/html.css</htmlStylesheet>
-					<!-- produce single-page html output -->
 					<chunkedOutput>false</chunkedOutput>
 					<htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
-					<!-- produce multi-page html output
-					<chunkedOutput>false</chunkedOutput>
-					<htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization> -->
 					<entities>
 						<entity>
 							<name>version</name>
@@ -175,39 +78,10 @@
 							failonerror="false" />
 					</postProcess>
 				</configuration>
-			</plugin>
+			</plugin>			
 			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>aggregate</id>
-						<goals>
-							<goal>aggregate</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<javadoc:aggregate>true</javadoc:aggregate>
-							<breakiterator>true</breakiterator>
-							<header>Spring Datastore Key-Value</header>
-							<source>1.5</source>
-							<quiet>true</quiet>
-							<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
-							<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
-							<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
-							<!-- copies doc-files subdirectory which contains image resources -->
-							<docfilessubdirs>true</docfilessubdirs>
-							<links>
-								<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
-								<link>http://java.sun.com/javase/6/docs/api</link>
-							</links>
-						</configuration>
-					</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 -->
+				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>
@@ -261,26 +135,30 @@
 				</dependencies>
 			</plugin>
 		</plugins>
-		<!-- the name of this project is 'spring-amqp-dist';
-			 make sure the zip file is just 'spring-amqp'. -->
+					
 		<finalName>${dist.finalName}</finalName>
+    -->
+    
+    </plugins>
 	</build>
-	<repositories>
+	
+	<distributionManagement>
+		<!-- see 'staging' profile for dry-run deployment settings -->
+		<downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
+		<site>
+			<id>static.springframework.org</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-keyvalue/site/${project.version}</url>
+		</site>
 		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
+			<id>spring-milestone</id>
+			<name>Spring Milestone Repository</name>
+			<url>s3://maven.springframework.org/milestone</url>
 		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<!-- necessary for org.springframework.build.aws.maven dependency -->
-			<id>repository.source.maven.release</id>
-			<name>SpringSource Maven Release Repository</name>
-			<url>http://repository.springsource.com/maven/bundles/release</url>
-		</repository>
-	</repositories>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 </project>
\ No newline at end of file
diff --git a/spring-datastore-keyvalue-parent/pom.xml b/spring-datastore-keyvalue-parent/pom.xml
index 1ecbbefdc..2f3b0974b 100644
--- a/spring-datastore-keyvalue-parent/pom.xml
+++ b/spring-datastore-keyvalue-parent/pom.xml
@@ -8,6 +8,7 @@
 	<url>http://www.springsource.org/spring-data/datastore-keyvalue</url>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- versions for commonly-used dependencies -->
@@ -16,7 +17,70 @@
 		<org.mockito.version>1.8.4</org.mockito.version>
 		<org.slf4j.version>1.5.10</org.slf4j.version>
 		<org.springframework.version>3.0.4.RELEASE</org.springframework.version>
+		<!-- dist.* properties are used by the antrun tasks below -->
+		<dist.id>spring-datastore-keyvalue</dist.id>
+		<dist.name>Spring Datastore Key-Value</dist.name>
+		<dist.key>DATADOC</dist.key>
+		<dist.version>${project.version}</dist.version>
+		<dist.releaseType>snapshot</dist.releaseType>
+		<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
+		<dist.fileName>${dist.finalName}.zip</dist.fileName>
+		<dist.filePath>target/${dist.fileName}</dist.filePath>
+		<dist.bucketName>dist.springframework.org</dist.bucketName>
 	</properties>
+	
+	
+	
+  <developers>
+		<developer>
+			<id>mpollack</id>
+			<name>Mark Pollack</name>
+			<email>mpollack at vmware.com</email>
+			<organization>SpringSource</organization>
+			<organizationUrl>http://www.SpringSource.com</organizationUrl>
+			<roles>
+				<role>Project Admin</role>
+				<role>Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+		<developer>
+			<id>cleau</id>
+			<name>Costin Leau</name>
+			<email>cleau at vmware.com</email>
+			<organization>SpringSource</organization>
+			<organizationUrl>http://www.SpringSource.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+2</timezone>
+		</developer>
+
+	</developers>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
+			<comments>
+			Copyright 2010 the original author or authors.
+			 
+			Licensed under the Apache License, Version 2.0 (the "License");
+			you may not use this file except in compliance with the License.
+			You may obtain a copy of the License at
+			
+			     http://www.apache.org/licenses/LICENSE-2.0
+			
+			Unless required by applicable law or agreed to in writing, software
+			distributed under the License is distributed on an "AS IS" BASIS,
+			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+			implied.
+			See the License for the specific language governing permissions and
+			limitations under the License.
+			</comments>
+		</license>
+	</licenses>
+
 	<profiles>
 		<profile>
 			<id>strict</id>
@@ -53,24 +117,7 @@
 			<!-- TODO: move the repositories in here before release -->
 		</profile>
 	</profiles>
-	<distributionManagement>
-		<!-- see 'staging' profile for dry-run deployment settings -->
-		<downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
-		<site>
-			<id>static.springframework.org</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-keyvalue/site/${project.version}</url>
-		</site>
-		<repository>
-			<id>spring-milestone</id>
-			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/milestone</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
+
 	<dependencyManagement>
 		<!--
 			inheritable <dependency> declarations for child poms. children still
@@ -213,10 +260,6 @@
 	<build>
 		<extensions>
 			<extension>
-				<!--
-					available only in the springframework maven repository. see
-					<repositories> section below
-				-->
 				<groupId>org.springframework.build.aws</groupId>
 				<artifactId>org.springframework.build.aws.maven</artifactId>
 				<version>2.0.0.RELEASE</version>
@@ -297,6 +340,35 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.5</version>
+				<executions>
+					<execution>
+						<id>aggregate</id>
+						<goals>
+							<goal>aggregate</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<javadoc:aggregate>true</javadoc:aggregate>
+							<breakiterator>true</breakiterator>
+							<header>Spring Datastore Key-Value</header>
+							<source>1.5</source>
+							<quiet>true</quiet>
+							<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
+							<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
+							<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
+							<!-- copies doc-files subdirectory which contains image resources -->
+							<docfilessubdirs>true</docfilessubdirs>
+							<links>
+								<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
+								<link>http://java.sun.com/javase/6/docs/api</link>
+							</links>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -332,6 +404,7 @@
 			</plugins>
 		</pluginManagement>
 	</build>
+	
 	<pluginRepositories>
 		<pluginRepository>
 			<!-- necessary for bundlor and utils -->
@@ -382,4 +455,24 @@
 			</plugin>
 		</plugins>
 	</reporting>
-</project>
+	
+	<distributionManagement>
+		<!-- see 'staging' profile for dry-run deployment settings -->
+		<downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
+		<site>
+			<id>static.springframework.org</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-keyvalue/site/${project.version}</url>
+		</site>
+		<repository>
+			<id>spring-milestone</id>
+			<name>Spring Milestone Repository</name>
+			<url>s3://maven.springframework.org/milestone</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+	
+</project>
\ No newline at end of file
diff --git a/spring-datastore-redis/pom.xml b/spring-datastore-redis/pom.xml
index 68d2cabda..e88a04f15 100644
--- a/spring-datastore-redis/pom.xml
+++ b/spring-datastore-redis/pom.xml
@@ -116,7 +116,6 @@
       	  <version>1.0.0.M1</version>
       	  <scope>compile</scope>
     	</dependency>
-
 	</dependencies>
 	<build>
 		<plugins>