diff --git a/jdbcmapper/pom.xml b/jdbcmapper/pom.xml
index 230bd9a..223006b 100644
--- a/jdbcmapper/pom.xml
+++ b/jdbcmapper/pom.xml
@@ -9,15 +9,11 @@
     <artifactId>jdbcmapper</artifactId>
     <name>${project.artifactId}</name>
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>querymapper</artifactId>
             <version>${project.version}</version>
+            <classifier>${jar.classifier}</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index 36e851d..45dd4ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
    $Header:$
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.sonatype.oss</groupId>
@@ -64,7 +65,7 @@
         <localCheckout>true</localCheckout>
         <source.classifier>sources</source.classifier>
         <javadoc.classifier>javadoc</javadoc.classifier>
-        <jar.classifier />
+        <jar.classifier/>
     </properties>
     <packaging>pom</packaging>
     <dependencyManagement>
@@ -117,7 +118,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
                 <configuration>
                     <excludes>
                         <exclude>**/*.java</exclude>
@@ -127,15 +127,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
                 <executions>
-                <execution>
-                    <id>attach-sources</id>
-                    <phase>verify</phase>
-                    <goals>
-                        <goal>jar-no-fork</goal>
-                    </goals>
-                </execution>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
                 </executions>
                 <configuration>
                     <excludes>
@@ -158,12 +157,23 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.4</version>
+                    <configuration>
+                        <classifier>${jar.classifier}</classifier>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
                     <version>2.2</version>
+                    <configuration>
+                        <classifier>${source.classifier}</classifier>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/presto-sqlparser/pom.xml b/presto-sqlparser/pom.xml
index c7ef751..b006a8c 100644
--- a/presto-sqlparser/pom.xml
+++ b/presto-sqlparser/pom.xml
@@ -13,6 +13,7 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>jdbcmapper</artifactId>
             <version>${project.version}</version>
+            <classifier>${jar.classifier}</classifier>
         </dependency>
         <dependency>
             <groupId>com.facebook.presto</groupId>
diff --git a/querymapper/pom.xml b/querymapper/pom.xml
index 00505fe..986e15f 100644
--- a/querymapper/pom.xml
+++ b/querymapper/pom.xml
@@ -13,11 +13,13 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
+            <classifier>${jar.classifier}</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>runtime-compiler</artifactId>
             <version>${project.version}</version>
+            <classifier>${jar.classifier}</classifier>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/revertJava6.sh b/revertJava6.sh
new file mode 100755
index 0000000..7e3512b
--- /dev/null
+++ b/revertJava6.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find */src/{main,test}/java -type f -name '*.java' -print0 | xargs -0 sed -i -e 's@/\*IFJAVA8_START@//IFJAVA8_START@' -e 's@IFJAVA8_END\*/@//IFJAVA8_END@'