Set correct version, minor pom fix, remove incorrect deprecated annot…

…ation

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>com.dieselpoint</groupId>
 	<artifactId>norm</artifactId>
 	<name>Norm</name>
-	<version>2.0</version>
+	<version>1.2</version>
 	<packaging>jar</packaging>
 
 	<description>An extremely lightweight data access layer over JDBC</description>
@@ -38,7 +38,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<skipTests>true</skipTests>
+		<!-- <skipTests>true</skipTests> -->
 	</properties>
 
 	<!-- Here's the explanation for all this: http://central.sonatype.org/pages/apache-maven.html -->
@@ -103,8 +103,7 @@
 				<version>3.4.1</version>
 				<configuration>
 					<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
-					<additionalparam>-Xdoclint:none</additionalparam>
-					<additionalOptions>-Xdoclint:none</additionalOptions>
+					<doclint>none</doclint>
 				</configuration>
 				<executions>
 					<execution>

src/main/java/com/dieselpoint/norm/Query.java

@@ -491,27 +491,6 @@ public Query generatedKeyReceiver(Object generatedKeyReceiver, String... generat
 		return this;
 	}
 
-	/**
-	 * Temporary hack. Avoid.
-	 * 
-	 * @deprecated
-	 * @param generatedKeyName
-	 * @return / public Query generatedKeyName(String generatedKeyName) {
-	 *         this.generatedKeyName = generatedKeyName; return this; }
-	 * 
-	 *         public long getGeneratedKeyValue() { return generatedKeyValue; }
-	 */
-
-	/**
-	 * This is a temporary hack to deal with inserting Maps using sql. May go away.
-	 * Marking this deprecated right from the start.
-	 * 
-	 * @deprecated
-	 * @return / public long getGeneratedKey(String colName) { if (generatedKeys !=
-	 *         null) { try { return generatedKeys.getLong(colName); } catch
-	 *         (SQLException e) { throw new DbException(e); } } return -1; }
-	 */
-
 	/**
 	 * Simple, primitive method for creating a table based on a pojo.
 	 */