diff --git a/build-central/pom.xml b/build-central/pom.xml
index 0517b091e..7c7822621 100644
--- a/build-central/pom.xml
+++ b/build-central/pom.xml
@@ -25,8 +25,8 @@ Spring Batch Maven Central Build - used to build Maven artifacts for the central
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>com.springsource.build</groupId>
-						<artifactId>com.springsource.build.converter</artifactId>
+						<groupId>org.springframework.build</groupId>
+						<artifactId>org.springframework.build.repository.maven</artifactId>
 						<version>1.0-SNAPSHOT</version>
 						<executions>
 							<execution>
diff --git a/build-ivy/build.xml b/build-ivy/build.xml
index 78686dcc5..d6cf9e0de 100644
--- a/build-ivy/build.xml
+++ b/build-ivy/build.xml
@@ -8,6 +8,9 @@
 	</path>
 
 	<property file="${basedir}/../build.properties" />
+	<propertyset id="bundlor.properties">
+	  <propertyref builtin="all"/>
+	</propertyset>
 	<import file="${basedir}/../spring-build/multi-bundle/default.xml"/>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 70f364be1..98e4fe650 100644
--- a/pom.xml
+++ b/pom.xml
@@ -903,6 +903,12 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
+		<pluginRepository>
+			<id>com.springsource.repository.bundles.snapshot</id>
+			<name>SpringSource Enterprise Bundle Repository -
+				SpringSource Bundle Snapshots</name>
+			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
+		</pluginRepository>
 		<pluginRepository>
 			<id>spring-external</id>
 			<name>Spring External Repository</name>
diff --git a/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF b/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF
index d7566007b..c4012b4d7 100644
--- a/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF
+++ b/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF
@@ -64,108 +64,116 @@ Import-Package: com.thoughtworks.xstream;version="[1.3,1.4)",com.thoug
  il.xml;version="[2.5.5, 3.0.0)";resolution:=optional,org.w3c.dom
 Bundle-Vendor: Spring
 Bundle-SymbolicName: org.springframework.batch.core
-Export-Package: org.springframework.batch.core;version="0";uses:="org.
- springframework.batch.item",org.springframework.batch.core.annotation
- ;version="0";uses:="org.springframework.beans.factory.annotation",org
- .springframework.batch.core.configuration;version="0";uses:="org.spri
- ngframework.batch.core,org.springframework.batch.core.launch",org.spr
- ingframework.batch.core.configuration.support;version="0";uses:="org.
- osgi.framework,org.springframework.batch.core,org.springframework.bat
- ch.core.configuration,org.springframework.batch.core.launch,org.sprin
- gframework.beans,org.springframework.beans.factory,org.springframewor
- k.beans.factory.config,org.springframework.context,org.springframewor
- k.context.support,org.springframework.core.io,org.springframework.osg
- i.context",org.springframework.batch.core.configuration.util;version=
- "0";uses:="org.springframework.util",org.springframework.batch.core.c
- onfiguration.xml;version="0";uses:="org.springframework.beans.factory
- .config,org.springframework.beans.factory.support,org.springframework
- .beans.factory.xml,org.w3c.dom",org.springframework.batch.core.conver
- ter;version="0";uses:="org.springframework.batch.core",org.springfram
- ework.batch.core.explore;version="0";uses:="org.springframework.batch
- .core",org.springframework.batch.core.explore.support;version="0";use
- s:="javax.sql,org.springframework.batch.core,org.springframework.batc
- h.core.explore,org.springframework.batch.core.repository.dao,org.spri
- ngframework.beans.factory,org.springframework.jdbc.support.incremente
- r",org.springframework.batch.core.job;version="0";uses:="org.springfr
- amework.batch.core,org.springframework.batch.core.repository,org.spri
- ngframework.beans.factory",org.springframework.batch.core.job.flow;ve
- rsion="0";uses:="org.springframework.batch.core,org.springframework.b
- atch.core.job,org.springframework.batch.core.repository",org.springfr
- amework.batch.core.job.flow.support;version="0";uses:="org.springfram
- ework.batch.core.job.flow,org.springframework.beans.factory",org.spri
- ngframework.batch.core.job.flow.support.state;version="0";uses:="org.
- springframework.batch.core,org.springframework.batch.core.job.flow,or
- g.springframework.batch.core.job.flow.support,org.springframework.cor
- e.task",org.springframework.batch.core.job.flow.support.util;version=
- "0",org.springframework.batch.core.launch;version="0";uses:="org.spri
- ngframework.batch.core,org.springframework.batch.core.repository",org
- .springframework.batch.core.launch.support;version="0";uses:="org.aop
- alliance.intercept,org.springframework.batch.core,org.springframework
- .batch.core.configuration,org.springframework.batch.core.converter,or
- g.springframework.batch.core.explore,org.springframework.batch.core.l
- aunch,org.springframework.batch.core.repository,org.springframework.b
+Export-Package: org.springframework.batch.core;version="2.0.0.CI-SNAPS
+ HOT";uses:="org.springframework.batch.item",org.springframework.batch
+ .core.annotation;version="2.0.0.CI-SNAPSHOT";uses:="org.springframewo
+ rk.beans.factory.annotation",org.springframework.batch.core.configura
+ tion;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.cor
+ e,org.springframework.batch.core.launch",org.springframework.batch.co
+ re.configuration.support;version="2.0.0.CI-SNAPSHOT";uses:="org.osgi.
+ framework,org.springframework.batch.core,org.springframework.batch.co
+ re.configuration,org.springframework.batch.core.launch,org.springfram
+ ework.beans,org.springframework.beans.factory,org.springframework.bea
+ ns.factory.config,org.springframework.context,org.springframework.con
+ text.support,org.springframework.core.io,org.springframework.osgi.con
+ text",org.springframework.batch.core.configuration.util;version="2.0.
+ 0.CI-SNAPSHOT";uses:="org.springframework.util",org.springframework.b
+ atch.core.configuration.xml;version="2.0.0.CI-SNAPSHOT";uses:="org.sp
+ ringframework.beans.factory.config,org.springframework.beans.factory.
+ support,org.springframework.beans.factory.xml,org.w3c.dom",org.spring
+ framework.batch.core.converter;version="2.0.0.CI-SNAPSHOT";uses:="org
+ .springframework.batch.core",org.springframework.batch.core.explore;v
+ ersion="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.core",org
+ .springframework.batch.core.explore.support;version="2.0.0.CI-SNAPSHO
+ T";uses:="javax.sql,org.springframework.batch.core,org.springframewor
+ k.batch.core.explore,org.springframework.batch.core.repository.dao,or
+ g.springframework.beans.factory,org.springframework.jdbc.support.incr
+ ementer",org.springframework.batch.core.job;version="2.0.0.CI-SNAPSHO
+ T";uses:="org.springframework.batch.core,org.springframework.batch.co
+ re.repository,org.springframework.beans.factory",org.springframework.
+ batch.core.job.flow;version="2.0.0.CI-SNAPSHOT";uses:="org.springfram
+ ework.batch.core,org.springframework.batch.core.job,org.springframewo
+ rk.batch.core.repository",org.springframework.batch.core.job.flow.sup
+ port;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.cor
+ e.job.flow,org.springframework.beans.factory",org.springframework.bat
+ ch.core.job.flow.support.state;version="2.0.0.CI-SNAPSHOT";uses:="org
+ .springframework.batch.core,org.springframework.batch.core.job.flow,o
+ rg.springframework.batch.core.job.flow.support,org.springframework.co
+ re.task",org.springframework.batch.core.job.flow.support.util;version
+ ="2.0.0.CI-SNAPSHOT",org.springframework.batch.core.launch;version="2
+ .0.0.CI-SNAPSHOT";uses:="org.springframework.batch.core,org.springfra
+ mework.batch.core.repository",org.springframework.batch.core.launch.s
+ upport;version="2.0.0.CI-SNAPSHOT";uses:="org.aopalliance.intercept,o
+ rg.springframework.batch.core,org.springframework.batch.core.configur
+ ation,org.springframework.batch.core.converter,org.springframework.ba
+ tch.core.explore,org.springframework.batch.core.launch,org.springfram
+ ework.batch.core.repository,org.springframework.beans.factory,org.spr
+ ingframework.core.task,org.springframework.transaction.annotation",or
+ g.springframework.batch.core.listener;version="2.0.0.CI-SNAPSHOT";use
+ s:="org.aopalliance.intercept,org.springframework.batch.core,org.spri
+ ngframework.batch.core.configuration.util,org.springframework.beans.f
+ actory",org.springframework.batch.core.partition;version="2.0.0.CI-SN
+ APSHOT";uses:="org.springframework.batch.core",org.springframework.ba
+ tch.core.partition.support;version="2.0.0.CI-SNAPSHOT";uses:="org.spr
+ ingframework.batch.core,org.springframework.batch.core.partition,org.
+ springframework.batch.core.repository,org.springframework.batch.core.
+ step,org.springframework.beans.factory,org.springframework.core.task"
+ ,org.springframework.batch.core.repository;version="2.0.0.CI-SNAPSHOT
+ ";uses:="org.springframework.batch.core",org.springframework.batch.co
+ re.repository.dao;version="2.0.0.CI-SNAPSHOT";uses:="com.thoughtworks
+ .xstream.converters.reflection,com.thoughtworks.xstream.io,org.spring
+ framework.batch.core,org.springframework.batch.item,org.springframewo
+ rk.beans.factory,org.springframework.dao,org.springframework.jdbc.cor
+ e,org.springframework.jdbc.core.simple,org.springframework.jdbc.suppo
+ rt.incrementer,org.springframework.jdbc.support.lob",org.springframew
+ ork.batch.core.repository.support;version="2.0.0.CI-SNAPSHOT";uses:="
+ javax.sql,org.springframework.batch.core,org.springframework.batch.co
+ re.repository,org.springframework.batch.core.repository.dao,org.sprin
+ gframework.batch.item.database.support,org.springframework.beans.fact
+ ory,org.springframework.transaction",org.springframework.batch.core.r
+ esource;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.
+ core,org.springframework.batch.core.converter,org.springframework.bat
+ ch.core.listener,org.springframework.batch.repeat,org.springframework
+ .beans.factory,org.springframework.context,org.springframework.core.i
+ o,org.springframework.jdbc.core",org.springframework.batch.core.scope
+ ;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.beans,org.spr
+ ingframework.beans.factory,org.springframework.beans.factory.config,o
+ rg.springframework.beans.factory.support,org.springframework.core,org
+ .springframework.util",org.springframework.batch.core.scope.context;v
+ ersion="2.0.0.CI-SNAPSHOT";uses:="org.aspectj.lang.annotation,org.spr
+ ingframework.batch.core,org.springframework.batch.repeat,org.springfr
+ amework.batch.repeat.context,org.springframework.core",org.springfram
+ ework.batch.core.scope.util;version="2.0.0.CI-SNAPSHOT";uses:="org.sp
+ ringframework.aop.framework,org.springframework.aop.target,org.spring
+ framework.beans,org.springframework.beans.factory,org.springframework
+ .beans.factory.config,org.springframework.beans.factory.support,org.s
+ pringframework.core,org.springframework.util",org.springframework.bat
+ ch.core.step;version="2.0.0.CI-SNAPSHOT";uses:="org.springframework.b
+ atch.core,org.springframework.batch.core.listener,org.springframework
+ .batch.core.repository,org.springframework.batch.item,org.springframe
+ work.beans.factory",org.springframework.batch.core.step.item;version=
+ "2.0.0.CI-SNAPSHOT";uses:="org.apache.commons.logging,org.springframe
+ work.batch.core,org.springframework.batch.core.listener,org.springfra
+ mework.batch.core.repository,org.springframework.batch.core.scope.con
+ text,org.springframework.batch.core.step.skip,org.springframework.bat
+ ch.core.step.tasklet,org.springframework.batch.item,org.springframewo
+ rk.batch.repeat,org.springframework.batch.repeat.exception,org.spring
+ framework.batch.repeat.listener,org.springframework.batch.retry,org.s
+ pringframework.batch.retry.backoff,org.springframework.batch.retry.co
+ ntext,org.springframework.batch.retry.listener,org.springframework.ba
+ tch.retry.policy,org.springframework.batch.retry.support,org.springfr
+ amework.batch.support,org.springframework.beans.factory,org.springfra
+ mework.core.task,org.springframework.transaction,org.springframework.
+ transaction.interceptor",org.springframework.batch.core.step.skip;ver
+ sion="2.0.0.CI-SNAPSHOT";uses:="org.springframework.batch.core,org.sp
+ ringframework.core",org.springframework.batch.core.step.tasklet;versi
+ on="2.0.0.CI-SNAPSHOT";uses:="org.apache.commons.logging,org.springfr
+ amework.batch.core,org.springframework.batch.core.listener,org.spring
+ framework.batch.core.repository,org.springframework.batch.core.scope.
+ context,org.springframework.batch.core.step,org.springframework.batch
+ .item,org.springframework.batch.item.adapter,org.springframework.batc
+ h.item.support,org.springframework.batch.repeat,org.springframework.b
  eans.factory,org.springframework.core.task,org.springframework.transa
- ction.annotation",org.springframework.batch.core.listener;version="0"
- ;uses:="org.aopalliance.intercept,org.springframework.batch.core,org.
- springframework.batch.core.configuration.util,org.springframework.bea
- ns.factory",org.springframework.batch.core.partition;version="0";uses
- :="org.springframework.batch.core",org.springframework.batch.core.par
- tition.support;version="0";uses:="org.springframework.batch.core,org.
- springframework.batch.core.partition,org.springframework.batch.core.r
- epository,org.springframework.batch.core.step,org.springframework.bea
- ns.factory,org.springframework.core.task",org.springframework.batch.c
- ore.repository;version="0";uses:="org.springframework.batch.core",org
- .springframework.batch.core.repository.dao;version="0";uses:="com.tho
- ughtworks.xstream.converters.reflection,com.thoughtworks.xstream.io,o
- rg.springframework.batch.core,org.springframework.batch.item,org.spri
- ngframework.beans.factory,org.springframework.dao,org.springframework
- .jdbc.core,org.springframework.jdbc.core.simple,org.springframework.j
- dbc.support.incrementer,org.springframework.jdbc.support.lob",org.spr
- ingframework.batch.core.repository.support;version="0";uses:="javax.s
- ql,org.springframework.batch.core,org.springframework.batch.core.repo
- sitory,org.springframework.batch.core.repository.dao,org.springframew
- ork.batch.item.database.support,org.springframework.beans.factory,org
- .springframework.transaction",org.springframework.batch.core.resource
- ;version="0";uses:="org.springframework.batch.core,org.springframewor
- k.batch.core.converter,org.springframework.batch.core.listener,org.sp
- ringframework.batch.repeat,org.springframework.beans.factory,org.spri
- ngframework.context,org.springframework.core.io,org.springframework.j
- dbc.core",org.springframework.batch.core.scope;version="0";uses:="org
- .springframework.beans,org.springframework.beans.factory,org.springfr
- amework.beans.factory.config,org.springframework.beans.factory.suppor
- t,org.springframework.core,org.springframework.util",org.springframew
- ork.batch.core.scope.context;version="0";uses:="org.aspectj.lang.anno
- tation,org.springframework.batch.core,org.springframework.batch.repea
- t,org.springframework.batch.repeat.context,org.springframework.core",
- org.springframework.batch.core.scope.util;version="0";uses:="org.spri
- ngframework.aop.framework,org.springframework.aop.target,org.springfr
- amework.beans,org.springframework.beans.factory,org.springframework.b
- eans.factory.config,org.springframework.beans.factory.support,org.spr
- ingframework.core,org.springframework.util",org.springframework.batch
- .core.step;version="0";uses:="org.springframework.batch.core,org.spri
- ngframework.batch.core.listener,org.springframework.batch.core.reposi
- tory,org.springframework.batch.item,org.springframework.beans.factory
- ",org.springframework.batch.core.step.item;version="0";uses:="org.apa
- che.commons.logging,org.springframework.batch.core,org.springframewor
- k.batch.core.listener,org.springframework.batch.core.repository,org.s
- pringframework.batch.core.scope.context,org.springframework.batch.cor
- e.step.skip,org.springframework.batch.core.step.tasklet,org.springfra
- mework.batch.item,org.springframework.batch.repeat,org.springframewor
- k.batch.repeat.exception,org.springframework.batch.repeat.listener,or
- g.springframework.batch.retry,org.springframework.batch.retry.backoff
- ,org.springframework.batch.retry.context,org.springframework.batch.re
- try.listener,org.springframework.batch.retry.policy,org.springframewo
- rk.batch.retry.support,org.springframework.batch.support,org.springfr
- amework.beans.factory,org.springframework.core.task,org.springframewo
- rk.transaction,org.springframework.transaction.interceptor",org.sprin
- gframework.batch.core.step.skip;version="0";uses:="org.springframewor
- k.batch.core,org.springframework.core",org.springframework.batch.core
- .step.tasklet;version="0";uses:="org.apache.commons.logging,org.sprin
- gframework.batch.core,org.springframework.batch.core.listener,org.spr
- ingframework.batch.core.repository,org.springframework.batch.core.sco
- pe.context,org.springframework.batch.core.step,org.springframework.ba
- tch.item,org.springframework.batch.item.adapter,org.springframework.b
- atch.item.support,org.springframework.batch.repeat,org.springframewor
- k.beans.factory,org.springframework.core.task,org.springframework.tra
- nsaction,org.springframework.transaction.interceptor"
+ ction,org.springframework.transaction.interceptor"
+Bundle-Version: 2.0.0.CI-SNAPSHOT
 
diff --git a/spring-batch-core/template.mf b/spring-batch-core/template.mf
index 4021c3bf4..3fddecb24 100644
--- a/spring-batch-core/template.mf
+++ b/spring-batch-core/template.mf
@@ -1,6 +1,7 @@
-Bundle-SymbolicName: org.springframework.batch.core
+Bundle-SymbolicName: com.springframework.batch.core
 Bundle-Name: Spring Batch Core
 Bundle-Vendor: Spring
+Bundle-Version: ${version}
 Ignored-Existing-Headers: 
  Import-Package,
  Export-Package
@@ -9,13 +10,13 @@ Import-Template:
  org.codehaus.jettison.*;version="[1.0,1.1)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.aspectj.*;version="[1.5.2,1.7.0)",
- org.apache.commons.lang.*;version="[2.1,3.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.0, 2.0.0)",
  org.springframework.aop.*;version="[2.5.5, 3.0.0)",
  org.springframework.batch.*;version="[2.0.0, 3.0.0)",
  org.springframework.beans.*;version="[2.5.5, 3.0.0)",
  org.springframework.context.*;version="[2.5.5, 3.0.0)",
  org.springframework.core.*;version="[2.5.5, 3.0.0)",
+ org.apache.commons.lang.*;version="[2.1,3.0)";resolution:=optional,
  org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional,
  org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional,
  org.springframework.transaction.*;version="[2.5.5, 3.0.0)";resolution:=optional,
diff --git a/spring-batch-infrastructure/template.mf b/spring-batch-infrastructure/template.mf
index 17acc4a9b..0a87c6581 100644
--- a/spring-batch-infrastructure/template.mf
+++ b/spring-batch-infrastructure/template.mf
@@ -1,6 +1,7 @@
-Bundle-SymbolicName: org.springframework.batch.infrastructure
+Bundle-SymbolicName: com.springframework.batch.infrastructure
 Bundle-Name: Spring Batch Infrastructure
 Bundle-Vendor: Spring
+Bundle-Version: ${version}
 Ignored-Existing-Headers: 
  Import-Package,
  Export-Package
diff --git a/spring-batch-test/template.mf b/spring-batch-test/template.mf
index 83306d259..8bd9eeea2 100644
--- a/spring-batch-test/template.mf
+++ b/spring-batch-test/template.mf
@@ -1,6 +1,7 @@
-Bundle-SymbolicName: org.springframework.batch.test
+Bundle-SymbolicName: com.springframework.batch.test
 Bundle-Name: Spring Batch Test
 Bundle-Vendor: Spring
+Bundle-Version: ${version}
 Ignored-Existing-Headers: 
  Import-Package,
  Export-Package
@@ -11,6 +12,7 @@ Import-Template:
  javax.persistence.*;version="[1.0.0,2.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.0, 2.0.0)",
+ org.apache.commons.io.*;version="[1.4.0, 2.0.0)";resolution:=optional,
  org.junit;version="[4.4.0,5.0.0)";resolution:=optional,
  junit.framework;version="[4.4.0,5.0.0)";resolution:=optional,
  org.hibernate.*;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional,
@@ -20,6 +22,7 @@ Import-Template:
  org.springframework.beans.*;version="[2.5.5, 3.0.0)";resolution:=optional,
  org.springframework.core.*;version="[2.5.5, 3.0.0)";resolution:=optional,
  org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional,
+ org.springframework.context.*;version="[2.5.5, 3.0.0)";resolution:=optional,
  org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional,
  org.springframework.jms.*;version="[2.5.5, 3.0.0)";resolution:=optional,
  org.springframework.orm.*;version="[2.5.5, 3.0.0)";resolution:=optional,