diff --git a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml b/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml
index 0ad7df1d4..bd3046b2c 100644
--- a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml
+++ b/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml
@@ -29,7 +29,7 @@
 				class="org.springframework.batch.execution.runtime.ScheduledJobIdentifier">
 				<property name="name" update="false" column="JOB_NAME" />
 				<property name="jobKey" update="false"
-					column="JOB_KEY" />
+					column="JOB_KEY" length="250"/>
 				<property name="scheduleDate" update="false"
 					column="SCHEDULE_DATE" />
 			</component>
@@ -41,7 +41,7 @@
 				class="org.springframework.batch.execution.runtime.ScheduledJobIdentifier">
 				<property name="name" update="false" column="JOB_NAME" />
 				<property name="jobKey" update="false"
-					column="JOB_KEY" />
+					column="JOB_KEY" length="250"/>
 			</component>
 		</subclass>
 
diff --git a/execution/src/main/resources/schema-db2.sql b/execution/src/main/resources/schema-db2.sql
deleted file mode 100644
index 91e403b03..000000000
--- a/execution/src/main/resources/schema-db2.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Autogenerated: do not edit this file
-DROP TABLE BATCH_STEP_EXECUTION ;
-DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
-
-DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_STEP_SEQ ;
-DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_JOB_SEQ ;
-
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
-	ID BIGINT  PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(20) , 
-	SCHEDULE_DATE DATE ,
-	STATUS VARCHAR(10) );
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE TABLE BATCH_STEP  (
-	ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	STEP_NAME VARCHAR(100) NOT NULL,
-	STATUS VARCHAR(10),
-	RESTART_DATA VARCHAR(200));
-
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT NOT NULL,  
-	STEP_ID BIGINT NOT NULL,
-	JOB_EXECUTION_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(250),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_STEP_SEQ;
-CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_JOB_SEQ;
diff --git a/execution/src/main/resources/schema-derby.sql b/execution/src/main/resources/schema-derby.sql
deleted file mode 100644
index e51484528..000000000
--- a/execution/src/main/resources/schema-derby.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Autogenerated: do not edit this file
-DROP TABLE BATCH_STEP_EXECUTION ;
-DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
-
-DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_STEP_SEQ ;
-DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_JOB_SEQ ;
-
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
-	ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(20) , 
-	SCHEDULE_DATE DATE ,
-	STATUS VARCHAR(10) );
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE TABLE BATCH_STEP  (
-	ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	STEP_NAME VARCHAR(100) NOT NULL,
-	STATUS VARCHAR(10),
-	RESTART_DATA VARCHAR(200));
-
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
-	VERSION BIGINT NOT NULL,  
-	STEP_ID BIGINT NOT NULL,
-	JOB_EXECUTION_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(250),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_STEP_SEQ;
-CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_JOB_SEQ;
diff --git a/execution/src/main/resources/schema-hsqldb.sql b/execution/src/main/resources/schema-hsqldb.sql
deleted file mode 100644
index 9015aa9fc..000000000
--- a/execution/src/main/resources/schema-hsqldb.sql
+++ /dev/null
@@ -1,66 +0,0 @@
--- Autogenerated: do not edit this file
-DROP TABLE BATCH_STEP_EXECUTION IF EXISTS;
-DROP TABLE BATCH_JOB_EXECUTION IF EXISTS;
-DROP TABLE BATCH_STEP IF EXISTS;
-DROP TABLE BATCH_JOB IF EXISTS;
-
-DROP TABLE BATCH_STEP_EXECUTION_SEQ IF EXISTS;
-DROP TABLE BATCH_STEP_SEQ IF EXISTS;
-DROP TABLE BATCH_JOB_EXECUTION_SEQ IF EXISTS;
-DROP TABLE BATCH_JOB_SEQ IF EXISTS;
-
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
-	ID BIGINT IDENTITY PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(20) , 
-	SCHEDULE_DATE DATE ,
-	STATUS VARCHAR(10) );
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	ID BIGINT IDENTITY PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE TABLE BATCH_STEP  (
-	ID BIGINT IDENTITY PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	STEP_NAME VARCHAR(100) NOT NULL,
-	STATUS VARCHAR(10),
-	RESTART_DATA VARCHAR(200));
-
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	ID BIGINT IDENTITY PRIMARY KEY ,
-	VERSION BIGINT NOT NULL,  
-	STEP_ID BIGINT NOT NULL,
-	JOB_EXECUTION_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(250),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE TABLE BATCH_STEP_EXECUTION_SEQ (
-	ID BIGINT IDENTITY
-);
-CREATE TABLE BATCH_STEP_SEQ (
-	ID BIGINT IDENTITY
-);
-CREATE TABLE BATCH_JOB_EXECUTION_SEQ (
-	ID BIGINT IDENTITY
-);
-CREATE TABLE BATCH_JOB_SEQ (
-	ID BIGINT IDENTITY
-);
diff --git a/execution/src/main/resources/schema-oracle10g.sql b/execution/src/main/resources/schema-oracle10g.sql
deleted file mode 100644
index 6d0669770..000000000
--- a/execution/src/main/resources/schema-oracle10g.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Autogenerated: do not edit this file
-DROP TABLE BATCH_STEP_EXECUTION ;
-DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
-
-DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_STEP_SEQ ;
-DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_JOB_SEQ ;
-
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
-	ID NUMBER(38)  PRIMARY KEY ,  
-	VERSION NUMBER(38),  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(20) , 
-	SCHEDULE_DATE DATE ,
-	STATUS VARCHAR(10) );
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	ID NUMBER(38)  PRIMARY KEY ,
-	VERSION NUMBER(38),  
-	JOB_ID NUMBER(38) NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE TABLE BATCH_STEP  (
-	ID NUMBER(38)  PRIMARY KEY ,
-	VERSION NUMBER(38),  
-	JOB_ID NUMBER(38) NOT NULL,
-	STEP_NAME VARCHAR(100) NOT NULL,
-	STATUS VARCHAR(10),
-	RESTART_DATA VARCHAR(200));
-
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	ID NUMBER(38)  PRIMARY KEY ,
-	VERSION NUMBER(38) NOT NULL,  
-	STEP_ID NUMBER(38) NOT NULL,
-	JOB_EXECUTION_ID NUMBER(38) NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT NUMBER(38) , 
-	TASK_COUNT NUMBER(38) , 
-	TASK_STATISTICS VARCHAR(250),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_STEP_SEQ;
-CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_JOB_SEQ;
diff --git a/execution/src/main/resources/schema-postgresql.sql b/execution/src/main/resources/schema-postgresql.sql
deleted file mode 100644
index 91e403b03..000000000
--- a/execution/src/main/resources/schema-postgresql.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Autogenerated: do not edit this file
-DROP TABLE BATCH_STEP_EXECUTION ;
-DROP TABLE BATCH_JOB_EXECUTION ;
-DROP TABLE BATCH_STEP ;
-DROP TABLE BATCH_JOB ;
-
-DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_STEP_SEQ ;
-DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
-DROP SEQUENCE BATCH_JOB_SEQ ;
-
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB  (
-	ID BIGINT  PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(20) , 
-	SCHEDULE_DATE DATE ,
-	STATUS VARCHAR(10) );
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE TABLE BATCH_STEP  (
-	ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_ID BIGINT NOT NULL,
-	STEP_NAME VARCHAR(100) NOT NULL,
-	STATUS VARCHAR(10),
-	RESTART_DATA VARCHAR(200));
-
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	ID BIGINT  PRIMARY KEY ,
-	VERSION BIGINT NOT NULL,  
-	STEP_ID BIGINT NOT NULL,
-	JOB_EXECUTION_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP ,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(250),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(250));
-
-CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_STEP_SEQ;
-CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
-CREATE SEQUENCE BATCH_JOB_SEQ;
diff --git a/execution/src/main/sql/init.sql.vpp b/execution/src/main/sql/init.sql.vpp
index 6f0e7ac3d..d59bf36af 100644
--- a/execution/src/main/sql/init.sql.vpp
+++ b/execution/src/main/sql/init.sql.vpp
@@ -3,7 +3,7 @@ CREATE TABLE BATCH_JOB  (
 	ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},  
 	VERSION ${BIGINT},  
 	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(20) , 
+	JOB_KEY VARCHAR(250) , 
 	SCHEDULE_DATE DATE ,
 	STATUS VARCHAR(10) );
 
diff --git a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
index 1112442ef..f3c8be6e8 100644
--- a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
+++ b/execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
@@ -3,7 +3,7 @@ CREATE TABLE BATCH_JOB  (
 	ID BIGINT IDENTITY PRIMARY KEY ,  
 	VERSION BIGINT,  
 	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(20) , 
+	JOB_KEY VARCHAR(250) , 
 	SCHEDULE_DATE DATE ,
 	STATUS VARCHAR(10) );