diff --git a/common/pom.xml b/common/pom.xml
index 2ab9073c..2921800a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -59,7 +59,7 @@ limitations under the License.
               <target>
                 <mkdir dir="${project.build.directory}/generated-sources/java"/>
                 <exec executable="sh">
-                  <arg line="${basedir}/src/saveVersion.sh ${project.version} ${project.build.directory}/generated-sources/java"/>
+                  <arg line="'${basedir}/src/saveVersion.sh' ${project.version} '${project.build.directory}/generated-sources/java'"/>
                 </exec>
               </target>
             </configuration>
diff --git a/common/src/saveVersion.sh b/common/src/saveVersion.sh
index 31d3a334..2fc7be4b 100755
--- a/common/src/saveVersion.sh
+++ b/common/src/saveVersion.sh
@@ -29,7 +29,7 @@ date=`date`
 cwd=`pwd`
 
 # Exit if target file already exists
-if [ -e $outputFile ]; then
+if [ -e "$outputFile" ]; then
   exit 0
 fi
 
@@ -45,8 +45,8 @@ else
   revision="Unknown"
   url="file://$cwd"
 fi
-mkdir -p $outputDirectory
-cat > $outputFile <<EOF
+mkdir -p "$outputDirectory"
+cat > "$outputFile" <<EOF
 /*
  * Generated by src/saveVersion.sh
  */