From b8c2e625b3d53d83da4976e4a17f6b72a76299c7 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Mon, 7 May 2012 09:46:26 +0200
Subject: [PATCH] Polished pom.xml.

Removed obsolete stuff as we're now deploying to Artifactory.
---
 pom.xml                            | 239 ++++++-----------------------
 spring-data-commons-core/pom.xml   |   4 -
 spring-data-commons-parent/pom.xml | 151 ++++--------------
 3 files changed, 76 insertions(+), 318 deletions(-)

diff --git a/pom.xml b/pom.xml
index e0ac608c4..48f17e446 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.data</groupId>
 	<artifactId>spring-data-commons-dist</artifactId>
@@ -74,52 +75,11 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- dist.* properties are used by the antrun tasks below -->
-		<dist.id>spring-data-commons</dist.id>
-		<dist.name>Spring Data Commons</dist.name>
-		<dist.key>DATACMNS</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>
-		-->
-	    <javadoc.loc>src/main/javadoc</javadoc.loc>
-	    <findbugs.skip>false</findbugs.skip>
+		<javadoc.loc>src/main/javadoc</javadoc.loc>
+		<findbugs.skip>false</findbugs.skip>
 	</properties>
-	<profiles>
-		<profile>
-			<id>staging</id>
-			<distributionManagement>
-				<site>
-					<id>spring-site-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/data-commons/docs/${project.version}</url>
-				</site>
-				<repository>
-					<id>spring-milestone-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/data-commons/milestone</url>
-				</repository>
-				<snapshotRepository>
-					<id>spring-snapshot-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/data-commons/snapshot</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-	</profiles>
 
 	<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>3.1.0.RELEASE</version>
-			</extension>
-		</extensions>
 		<plugins>
 			<plugin>
 				<groupId>com.agilejava.docbkx</groupId>
@@ -146,15 +106,13 @@
 					<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> -->
+					<!-- 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> -->
+					<!-- produce multi-page html output <chunkedOutput>false</chunkedOutput> 
+						<htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization> -->
 					<entities>
 						<entity>
 							<name>version</name>
@@ -176,15 +134,15 @@
 								<include name="**/*.jpg" />
 							</fileset>
 						</copy>
-						<move file="${project.basedir}/target/site/reference/pdf/index.pdf" tofile="${project.basedir}/target/site/reference/pdf/spring-data-commons-reference.pdf" failonerror="false" />
+						<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
+							tofile="${project.basedir}/target/site/reference/pdf/spring-data-commons-reference.pdf"
+							failonerror="false" />
 					</postProcess>
 				</configuration>
 			</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
-			 	-->
+				<!-- 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>
@@ -204,137 +162,47 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.4</version>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.8</version>
 				<executions>
 					<execution>
-						<id>upload-dist</id>
-						<phase>deploy</phase>
-						<configuration>
-							<tasks>
-								<ant antfile="${basedir}/src/ant/upload-dist.xml">
-									<target name="upload-dist" />
-								</ant>
-							</tasks>
-						</configuration>
 						<goals>
-							<goal>run</goal>
+							<goal>javadoc</goal>
 						</goals>
+						<phase>package</phase>
 					</execution>
 				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.build</groupId>
-						<artifactId>org.springframework.build.aws.ant</artifactId>
-						<version>3.0.5.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>net.java.dev.jets3t</groupId>
-						<artifactId>jets3t</artifactId>
-						<version>0.7.2</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-	      <plugin>
-	        <artifactId>maven-javadoc-plugin</artifactId>
-	        <version>2.7</version>
-	         <configuration>
-	           <aggregate>true</aggregate>
-	           <breakiterator>true</breakiterator>
-	           <header>Spring Data Commons</header>
-	           <source>1.5</source>
-	           <show>protected</show>
-	           <quiet>true</quiet>
-	           <javadocDirectory>${javadoc.loc}</javadocDirectory>
-	           <overview>${javadoc.loc}/overview.html</overview>
-	           <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
-	           <docfilessubdirs>true</docfilessubdirs>
-
-	           <groups>
-	             <group>
-	                <title>Spring Data Commons Core</title>
-	                <packages>org.springframework.data.commons.core*</packages>
-	             </group>            
-	             <group>
-	                <title>Spring Data Commons Aspects</title>
-	                <packages>org.springframework.data.commons.aspects*</packages>
-	             </group>            
-	           </groups>
-	           <links>
-	             <link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
-	             <link>http://download.oracle.com/javase/6/docs/api/</link>
-	           </links>
-	         </configuration>
-	      </plugin>
-
-		</plugins>
-		<!-- the name of this project is 'spring-data-commons-dist';
-			 make sure the zip file is just 'spring-data-commons'. -->
-		<finalName>${dist.finalName}</finalName>
-
-	</build>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.2</version>
-			</plugin>
-
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jxr-maven-plugin</artifactId>
-				<version>2.0-beta-1</version>
-			</plugin>
-
-			<!-- ============== -->
-			<!-- FindBugs -->
-			<!-- ============== -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<!--
-					<xmlOutput>true</xmlOutput>
-					<xmlOutputDirectory>target</xmlOutputDirectory>
-					-->
-					<threshold>Normal</threshold>
-					<effort>Default</effort>
-					<!--
-					<debug>true</debug>
-					<relaxed>true</relaxed>
-					-->
-					<skip>${findbugs.skip}</skip>
-				</configuration>
-			</plugin>
-
-			<!-- ============== -->
-			<!-- jDepend        -->
-			<!-- ============== -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-				<version>2.0-beta-2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.5</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>2.6</version>
 				<configuration>
 					<aggregate>true</aggregate>
+					<breakiterator>true</breakiterator>
+					<header>Spring Data Commons</header>
+					<source>1.5</source>
+					<show>protected</show>
+					<quiet>true</quiet>
+					<javadocDirectory>${javadoc.loc}</javadocDirectory>
+					<overview>${javadoc.loc}/overview.html</overview>
+					<stylesheetfile>${javadoc.loc}/spring-javadoc.css</stylesheetfile>
+					<docfilessubdirs>true</docfilessubdirs>
+					<groups>
+						<group>
+							<title>Spring Data Commons Core</title>
+							<packages>org.springframework.data.commons.core*</packages>
+						</group>
+						<group>
+							<title>Spring Data Commons Aspects</title>
+							<packages>org.springframework.data.commons.aspects*</packages>
+						</group>
+					</groups>
+					<links>
+						<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
+						<link>http://download.oracle.com/javase/6/docs/api/</link>
+					</links>
 				</configuration>
-			</plugin>						
+			</plugin>
 		</plugins>
-	</reporting>
+	</build>
 
 	<repositories>
 		<repository>
@@ -342,14 +210,8 @@
 			<name>Spring Framework Maven Release Repository</name>
 			<url>http://repo.springsource.org/release</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>
-	
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-plugins</id>
@@ -358,21 +220,10 @@
 	</pluginRepositories>
 
 	<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/data-commons/snapshot-site</url>
+			<id>static.springframework.org</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-commons/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>
 </project>
diff --git a/spring-data-commons-core/pom.xml b/spring-data-commons-core/pom.xml
index 696d8e87e..2a956d805 100644
--- a/spring-data-commons-core/pom.xml
+++ b/spring-data-commons-core/pom.xml
@@ -127,10 +127,6 @@
 	
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>maven-apt-plugin</artifactId>
diff --git a/spring-data-commons-parent/pom.xml b/spring-data-commons-parent/pom.xml
index 127372768..18610c912 100644
--- a/spring-data-commons-parent/pom.xml
+++ b/spring-data-commons-parent/pom.xml
@@ -7,9 +7,9 @@
 	<url>http://www.springsource.org/spring-data</url>
 	<version>1.3.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
+	
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- versions for commonly-used dependencies -->
 		<junit.version>4.8.1</junit.version>
 		<log4j.version>1.2.16</log4j.version>
 		<org.mockito.version>1.8.5</org.mockito.version>
@@ -23,30 +23,12 @@
 		<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
 		<site>
 			<id>spring-docs</id>
-			<url>
-				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-commons/snapshot-site
-			</url>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-commons/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>
 	
 	<dependencies>
-		<!--
-			dependency definitions to be inherited by child poms. any
-			<dependency> declarations here will automatically show up on child
-			project classpaths. only items that are truly common across all
-			projects (modules and samples) should go here. otherwise, consider
-			<dependencyManagement> above
-		-->
+
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
@@ -71,55 +53,6 @@
 	</dependencies>
 
 	<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>3.1.0.RELEASE</version>
-			</extension>
-		</extensions>
-		<resources>
-			<resource>
-				<directory>${project.basedir}/src/main/java</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-					<exclude>**/*.aj</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>${project.basedir}/src/main/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>${project.basedir}/src/test/java</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-			<testResource>
-				<directory>${project.basedir}/src/test/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-		</testResources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -165,40 +98,35 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+				<version>1.0.0.RELEASE</version>
+				<configuration>
+					<failOnWarnings>true</failOnWarnings>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundlor</id>
+						<goals>
+							<goal>bundlor</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.1</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-ssh</artifactId>
+						<version>1.0</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<!--
-						configures the springsource bundlor plugin, which generates
-						OSGI-compatible MANIFEST.MF files during the 'compile' phase of
-						the maven build. this plugin is declared within the
-						pluginManagement section because not every module that inherits
-						from this pom needs bundlor's services, e.g.:
-						spring-integration-samples and all its children. for this reason,
-						all modules that wish to use bundlor must declare it explicitly.
-						it is not necessary to specify the <version> or <configuration>
-						sections, but groupId and artifactId are required. see
-						http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
-						for more info
-					-->
-					<groupId>com.springsource.bundlor</groupId>
-					<artifactId>com.springsource.bundlor.maven</artifactId>
-					<version>1.0.0.RELEASE</version>
-					<configuration>
-						<failOnWarnings>true</failOnWarnings>
-					</configuration>
-					<executions>
-						<execution>
-							<id>bundlor</id>
-							<goals>
-								<goal>bundlor</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 	<pluginRepositories>
 		<pluginRepository>
@@ -215,21 +143,4 @@
 			</snapshots>
 		</repository>
 	</repositories>
-	<reporting>
-		<plugins>
-			<plugin>
-				<!--
-					significantly speeds up the 'Dependencies' report during site
-					creation see
-					http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html
-				-->
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.1</version>
-				<configuration>
-					<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
 </project>