Revert "SQUASH: cannot get project to work with both java 5 and Java 6 compatibility. Bail on it."

This reverts commit 460628b.

Author: ctrimble

pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>bridj</artifactId>
 	<name>BridJ (NativeLibs4Java C/C++ Interop Layer)</name>
 	<url>http://code.google.com/p/bridj/</url>
-	<version>0.9.0-SNAPSHOT</version>
+	<version>0.8.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<repositories>
 		<repository>
@@ -25,9 +25,8 @@
 	<properties>
 		<versionSpecificSubPackage>v0_7_0</versionSpecificSubPackage>
 		<maven.compiler.optimize>true</maven.compiler.optimize>
-		<!--<maven.compiler.testSource>6</maven.compiler.testSource>-->
-		<!--<maven.compiler.testTarget>6</maven.compiler.testTarget>-->
-                <maven.javadoc.skip>true</maven.javadoc.skip>
+		<maven.compiler.testSource>6</maven.compiler.testSource>
+		<maven.compiler.testTarget>6</maven.compiler.testTarget>
 	</properties>
 	<scm>
 		<connection>scm:git:git@github.com:nativelibs4java/BridJ.git</connection>
@@ -112,7 +111,7 @@
 			  </javahClassNames>
 			</configuration>
 		</plugin-->
-			<!--<plugin>
+			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
                                 <version>3.6.0</version>
 				<executions>
@@ -128,7 +127,7 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>-->
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>

src/test/java/org/bridj/ObjectiveCTest.java

@@ -289,7 +289,7 @@ public void testNativeDelegate() {
        testDelegate(new DelgImpl());
    }
    static class MyDelg extends ObjCProxy implements Delg {
-        //@Override
+        @Override
         public int add_to(int a, int b) {
             return a + b;
         }