Mandated Java 6 for Maven build (#125)

* Integrated Android in Travis CI * Integrated Android in Travis CI #2 * Integrated Android in Travis CI #3 * Updated android mpb file * Travis update for Android #2 * Travis Update for Android #3 * Travis Android update fix #4 * Update using_android.mpb * SSL Build fix for Android * Delete automation_tests.sh Automation tests file no longer needed. * LZ4 issue fix for Android * Skip maven tests for Android * Update pom.xml
jredmondson · Oct 14, 2018 · 5fa33b7 · 5fa33b7
1 parent 70cb7cc
commit 5fa33b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/port/java/pom.xml b/port/java/pom.xml
@@ -25,6 +25,8 @@
 	<properties>
 		<madara.version>3.2.0</madara.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.6</maven.compiler.source>
+    		<maven.compiler.target>1.6</maven.compiler.target>
 	</properties>
 
 	<dependencies>

diff --git a/port/java/using_android.mpb b/port/java/using_android.mpb
@@ -8,4 +8,6 @@ feature (android) {
   includes += $(SYSROOT)/usr/include
 
   libs += log
+
+  postbuild = mvn -f port/java -DskipTests -P development package jar:test-jar install
 }
diff --git a/port/java/using_java.mpb b/port/java/using_java.mpb
@@ -43,7 +43,7 @@ feature (java) {
 	postbuild += mvn -f port/java versions:set -DnewVersion=`<%cat%> $(MADARA_ROOT)/VERSION.txt`
 	postbuild += mvn -f port/java versions:commit
         postbuild += mvn -f port/java "-Dtest=ai/madara/tests/basic/**" -P development clean package test
-  	postbuild += mvn -f port/java -DskipTests -P development jar:test-jar install
+  	postbuild += mvn -f port/java -DskipTests -P development package jar:test-jar install
 }
 
 //Amit added this. Couldn't find a better way to selectively add postbuild statements.