From a6cf89fd7ef609ce5a82a628dffb66e184cb72ca Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 2 Sep 2010 15:57:56 +0000
Subject: [PATCH] Automatically update cafe sample Bundle-Version (INT-1388)

${project.version} has been introduced in the cafe sample's MANIFEST.MF
and the pom has been updated to ensure that the manifest is filtered by
maven.

This change removes need for manually updating the bundle version
during every release.
---
 spring-integration-samples/cafe/pom.xml                  | 9 ++++++++-
 .../cafe/src/main/resources/META-INF/MANIFEST.MF         | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml
index e803cdb580..a5be6afa77 100644
--- a/spring-integration-samples/cafe/pom.xml
+++ b/spring-integration-samples/cafe/pom.xml
@@ -33,7 +33,7 @@
 				<version>2.2</version>
 				<configuration>
 					<archive>
-						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+						<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
 			</plugin>
@@ -52,6 +52,13 @@
 					<include>META-INF/spring/*.xml</include>
 				</includes>
 			</resource>
+			<resource>
+				<filtering>true</filtering>
+				<directory>${basedir}/src/main/resources</directory>
+				<includes>
+					<include>META-INF/MANIFEST.MF</include>
+				</includes>
+			</resource>
 		</resources>
 	</build>
 	<repositories>
diff --git a/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF b/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
index 53c8cbdad0..3444bdfaf4 100644
--- a/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 2.0.0.BUILD-SNAPSHOT
+Bundle-Version: ${project.version}
 Bundle-Name: org.springframework.integration.samples.cafe
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.integration.samples.cafe