Merge branch 'driverUpdate'

.classpath

@@ -22,5 +22,6 @@
 	<classpathentry kind="lib" path="lib/commons-lang-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/RedshiftJDBC4-1.1.10.1010.jar"/>
 	<classpathentry kind="lib" path="lib/ojdbc7.jar"/>
+	<classpathentry kind="lib" path="lib/ojdbc14.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

build.xml

@@ -22,7 +22,7 @@
 		<jar destfile="${build.dir}/WhiteRabbit.jar">
 			<manifest>
 				<attribute name="Main-Class" value="org.ohdsi.utilities.WhiteRabbitLauncher"/>
-				<attribute name="Class-Path" value=". WhiteRabbit_lib/terajdbc4.jar WhiteRabbit_lib/tdgssconfig.jar WhiteRabbit_lib/ojdbc7.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.37-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar WhiteRabbit_lib/commons-lang-2.0.jar WhiteRabbit_lib/commons-logging-1.2.jar WhiteRabbit_lib/hsqldb-2.2.5.jar WhiteRabbit_lib/jackcess-2.1.3.jar WhiteRabbit_lib/ucanaccess-3.0.3.1.jar WhiteRabbit_lib/RedshiftJDBC4-1.1.10.1010.jar"/>
+				<attribute name="Class-Path" value=". WhiteRabbit_lib/terajdbc4.jar WhiteRabbit_lib/tdgssconfig.jar WhiteRabbit_lib/ojdbc14.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.37-bin.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc4.jar WhiteRabbit_lib/postgresql-9.4-1201.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar WhiteRabbit_lib/commons-csv-1.1.jar WhiteRabbit_lib/commons-lang-2.0.jar WhiteRabbit_lib/commons-logging-1.2.jar WhiteRabbit_lib/hsqldb-2.2.5.jar WhiteRabbit_lib/jackcess-2.1.3.jar WhiteRabbit_lib/ucanaccess-3.0.3.1.jar WhiteRabbit_lib/RedshiftJDBC4-1.1.10.1010.jar"/>
 			</manifest>
 			<fileset dir="${build.dir}"/>
 			<fileset dir="${src.dir}" includes="**/*.csv,**/*.png" />
@@ -40,7 +40,7 @@
 		</copy>
 		<delete dir="${build.dir}/WhiteRabbit_lib"/>
 		<mkdir dir="${build.dir}/WhiteRabbit_lib"/>
-		<copy file="lib/ojdbc7.jar" todir="${build.dir}/WhiteRabbit_lib"/>
+		<copy file="lib/ojdbc14.jar" todir="${build.dir}/WhiteRabbit_lib"/>
 		<copy file="lib/sqljdbc4.jar" todir="${build.dir}/WhiteRabbit_lib"/>
 		<copy file="lib/mysql-connector-java-5.1.37-bin.jar" todir="${build.dir}/WhiteRabbit_lib"/>
 		<copy file="lib/dom4j-1.6.1.jar" todir="${build.dir}/WhiteRabbit_lib"/>