From 3ba59e7cec1aaddbe98e96927e8ffdd12009885f Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Tue, 30 Mar 2010 06:58:40 +0000
Subject: [PATCH] BATCHADM-32: add manifests to jars

---
 spring-batch-admin-parent/pom.xml    | 19 ++++++++++++++-----
 spring-batch-integration/pom.xml     | 28 ++++++++++++++++------------
 spring-batch-integration/template.mf | 25 +++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 spring-batch-integration/template.mf

diff --git a/spring-batch-admin-parent/pom.xml b/spring-batch-admin-parent/pom.xml
index 754ccd0de..824ad02d9 100644
--- a/spring-batch-admin-parent/pom.xml
+++ b/spring-batch-admin-parent/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.batch</groupId>
 	<artifactId>spring-batch-admin-parent</artifactId>
@@ -11,7 +12,7 @@
 		<spring.batch.version>2.1.0.RELEASE</spring.batch.version>
 		<spring.framework.version>3.0.1.RELEASE</spring.framework.version>
 		<spring.integration.version>1.0.3.RELEASE</spring.integration.version>
-		
+
 	</properties>
 	<profiles>
 		<profile>
@@ -108,14 +109,12 @@
 				<plugin>
 					<groupId>com.springsource.bundlor</groupId>
 					<artifactId>com.springsource.bundlor.maven</artifactId>
-					<version>${bundlor.version}</version>
 					<inherited>true</inherited>
 					<executions>
 						<execution>
 							<id>bundlor-transform</id>
-							<phase>package</phase>
 							<goals>
-								<goal>transform</goal>
+								<goal>bundlor</goal>
 							</goals>
 						</execution>
 					</executions>
@@ -619,4 +618,14 @@
 			</snapshots>
 		</repository>
 	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-releases</id>
+			<name>Spring Maven Release Repository</name>
+			<url>http://repository.springsource.com/maven/bundles/release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 </project>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index 59370f533..d9d80ee32 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/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>
 	<artifactId>spring-batch-integration</artifactId>
 	<name>Spring Batch Integration</name>
@@ -122,16 +123,19 @@
 		</dependency>
 	</dependencies>
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<configuration>
-						<junitArtifactName>junit:junit</junitArtifactName>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+			</plugin>
+		</plugins>
 	</build>
 </project>
diff --git a/spring-batch-integration/template.mf b/spring-batch-integration/template.mf
new file mode 100644
index 000000000..803b8701d
--- /dev/null
+++ b/spring-batch-integration/template.mf
@@ -0,0 +1,25 @@
+Bundle-SymbolicName: org.springframework.batch.integration
+Bundle-Name: Spring Batch Integration
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template: 
+ org.springframework.batch.*;version="[2.1.0, 3.0.0)",
+ org.springframework.integration.*;version="[1.0.0, 2.0.0)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.jdbc.*;version="[3.0.0, 4.0.0)",
+ org.springframework.stereotype.*;version="[3.0.0, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.0, 4.0.0)",
+ org.springframework.ui.*;version="[3.0.0, 4.0.0)",
+ org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
+ org.springframework.web.*;version="[3.0.0, 4.0.0)",
+ org.springframework.validation.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ org.apache.commons.dbcp.*;version="[1.2.2, 2.0.0)";resolution:=optional,
+ org.apache.commons.io.*;version="[1.4.0, 2.0.0)";resolution:=optional,
+ org.aspectj.*;version="0",
+ javax.sql;version="0",
+ javax.servlet.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0"