From a85bea2d9e3f8aae4a83c395a8884e9368757a19 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 13 Jan 2009 14:24:37 +0000
Subject: [PATCH] BATCH-818: fix bundlor config

---
 pom.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 397b7c0ad..c4bfe5c7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,8 +152,7 @@
 				<pluginManagement>
 					<plugins>
 						<!--
-							This seems to work better than the default (2008/03/19) because
-							links on sub-module sites are not broken
+							This seems to work better than the default (2008/03/19) because links on sub-module sites are not broken
 						-->
 						<plugin>
 							<artifactId>maven-site-plugin</artifactId>
@@ -173,7 +172,6 @@
 					<plugin>
 						<groupId>com.springsource.bundlor</groupId>
 						<artifactId>com.springsource.bundlor.maven</artifactId>
-						<version>${bundlor.version}</version>
 						<executions>
 							<execution>
 								<id>bundlor-manifest</id>
@@ -181,10 +179,6 @@
 								<goals>
 									<goal>manifest</goal>
 								</goals>
-								<configuration>
-									<manifestTemplatePath>template.mf</manifestTemplatePath>
-									<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
-								</configuration>
 							</execution>
 						</executions>
 					</plugin>
@@ -247,8 +241,7 @@
 												<![CDATA[</summary>]]>
 											</footer>
 										</concat>
-										<xslt in="target/site/emma-reports/emma-report.xml" out="target/site/emma-reports/index.html"
-											style="src/main/xsl/emma2html.xsl">
+										<xslt in="target/site/emma-reports/emma-report.xml" out="target/site/emma-reports/index.html" style="src/main/xsl/emma2html.xsl">
 											<param name="project" expression="${project.name}" />
 											<param name="version" expression="${project.version}" />
 										</xslt>
@@ -298,6 +291,15 @@
 					<artifactId>emma-maven-plugin</artifactId>
 					<version>1.0-20070912.011112-4</version>
 				</plugin>
+				<plugin>
+					<groupId>com.springsource.bundlor</groupId>
+					<artifactId>com.springsource.bundlor.maven</artifactId>
+					<version>${bundlor.version}</version>
+					<configuration>
+						<manifestTemplatePath>${project.basedir}/template.mf</manifestTemplatePath>
+						<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
+					</configuration>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
@@ -317,8 +319,7 @@
 									</junitreport>
 									<echo>Creating Emma reports</echo>
 									<mkdir dir="target/site/emma-reports" />
-									<xslt includes="target/emma/coverage.xml" destdir="target/emma-reports"
-										style="${project.parent.basedir}/src/main/xsl/emma.xsl">
+									<xslt includes="target/emma/coverage.xml" destdir="target/emma-reports" style="${project.parent.basedir}/src/main/xsl/emma.xsl">
 										<mapper type="glob" from="*.xml" to="*.fragment" />
 										<param name="project" expression="${project.name}" />
 									</xslt>