diff --git a/apache-commons-cli-build.xml b/apache-commons-cli-build.xml
index 643b9b2..af4ba64 100644
--- a/apache-commons-cli-build.xml
+++ b/apache-commons-cli-build.xml
@@ -6,7 +6,15 @@
   <!-- Build environment properties                                           -->
   <!-- ====================================================================== -->
 
-  <property name="build.finalName" value="commons-cli-1.7.0"/>
+  <property name="project.artifactId" value="commons-cli"/>
+  <property name="project.groupId" value="commons-cli"/>
+  <property name="project.version" value="1.7.0"/>
+
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
+  <property name="compiler.target" value="${compiler.source}"/>
+
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
@@ -43,10 +51,11 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
-           target="8" 
-           verbose="false" 
-           fork="false" 
-           source="8">
+           release="${compiler.release}"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false"
+           source="${compiler.source}">
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
@@ -84,7 +93,7 @@
              nonavbar="false" 
              serialwarn="false" 
              charset="ISO-8859-1" 
-             source="8" 
+             source="${compiler.source}" 
              linksource="true" 
              breakiterator="false">
       <link href="http://java.sun.com/javase/7/docs/api/"/>
@@ -109,17 +118,17 @@
         <attribute name="Bundle-Name" value="Apache Commons CLI"/>
         <attribute name="Bundle-SymbolicName" value="org.apache.commons.cli"/>
         <attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
-        <attribute name="Bundle-Version" value="1.7.0"/>
-        <attribute name="Export-Package" value="org.apache.commons.cli;version=&quot;1.7.0&quot;"/>
+        <attribute name="Bundle-Version" value="${project.version}"/>
+        <attribute name="Export-Package" value="org.apache.commons.cli;version=&quot;${project.version}&quot;"/>
         <attribute name="Implementation-Title" value="Apache Commons CLI"/>
         <attribute name="Implementation-Vendor-Id" value="org.apache"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-        <attribute name="Implementation-Version" value="1.7.0"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
         <attribute name="Include-Resource" value="META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
-        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.7))&quot;"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
         <attribute name="Specification-Title" value="Apache Commons CLI"/>
         <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-        <attribute name="Specification-Version" value="1.7.0"/>
+        <attribute name="Specification-Version" value="${project.version}"/>
       </manifest>
     </jar>
   </target>