Merge pull request #208 from evlstyle/master

Update build versions to support java 1.8 , add logic to correct the mail content type in reportal.
azkaban · Nov 20, 2015 · 75391d9 · 75391d9
2 parents c22c3dd + 13ed4fd
commit 75391d9
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,6 @@
 languages: java
+jdk:
+- oraclejdk8
 install:
  - time npm install -g less dustjs-linkedin
 script: ant
diff --git a/build.properties b/build.properties
@@ -1,3 +1,3 @@
 name=azkaban-plugins
-version=2.6.4
+version=2.7.0
 spec.file=azkaban.spec
diff --git a/extlib/azkaban-common-2.7.0.jar b/extlib/azkaban-common-2.7.0.jar
diff --git a/extlib/azkaban-execserver-2.7.0.jar b/extlib/azkaban-execserver-2.7.0.jar
diff --git a/extlib/azkaban-webserver-2.7.0.jar b/extlib/azkaban-webserver-2.7.0.jar
diff --git a/plugins/hadoopsecuritymanager-yarn/build.xml b/plugins/hadoopsecuritymanager-yarn/build.xml
@@ -63,7 +63,7 @@
 		<mkdir dir="${dist.classes.dir}" />
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<src path="${hadoopsecuritymanager-common.java.src.dir}" />
 			<classpath refid="main.classpath" />

diff --git a/plugins/hadoopsecuritymanager/build.xml b/plugins/hadoopsecuritymanager/build.xml
@@ -45,7 +45,7 @@
 		<mkdir dir="${dist.classes.dir}" />
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<src path="${hadoopsecuritymanager-common.java.src.dir}" />
 			<classpath refid="main.classpath" />

diff --git a/plugins/hdfsviewer/build.xml b/plugins/hdfsviewer/build.xml
@@ -81,7 +81,7 @@
 		</copy>
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<classpath refid="main.classpath" />
 		</javac>
@@ -100,7 +100,7 @@
 		</copy>
 
 		<javac fork="true" destdir="${dist.tests.dir}"
-	      target="1.6" debug="true" deprecation="false" failonerror="true">
+	      target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.unit.dir}" />
 			<classpath refid="main.classpath" />
 		</javac>

diff --git a/plugins/javaviewer/build.xml b/plugins/javaviewer/build.xml
@@ -87,7 +87,7 @@
 		</copy>
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<classpath refid="main.classpath" />
 		</javac>

diff --git a/plugins/jobsummary/build.xml b/plugins/jobsummary/build.xml
@@ -80,7 +80,7 @@
 		</copy>
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<classpath refid="main.classpath" />
 		</javac>

diff --git a/plugins/jobtype/build.xml b/plugins/jobtype/build.xml
@@ -75,7 +75,7 @@
 		</copy-->
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<src path="${hadoopsecuritymanager-common.java.src.dir}" />
 
@@ -87,7 +87,7 @@
         <delete dir="${dist.classes.test.dir}" />
         <mkdir dir="${dist.classes.test.dir}" /> 
         <javac fork="true" destdir="${dist.classes.test.dir}"
-            target="1.6" debug="true" deprecation="false" failonerror="true">
+            target="1.8" debug="true" deprecation="false" failonerror="true">
             <src path="${java.src.test.dir}" />
 			<classpath refid="main.classpath" />
         </javac>

diff --git a/plugins/jobtype/lib/azkaban-common-2.7.0.jar b/plugins/jobtype/lib/azkaban-common-2.7.0.jar
diff --git a/plugins/pigvisualizer/build.xml b/plugins/pigvisualizer/build.xml
@@ -107,7 +107,7 @@
 		</copy>
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<classpath refid="main.classpath" />
 		</javac>

diff --git a/plugins/reportal/build.properties b/plugins/reportal/build.properties
@@ -1,2 +1,2 @@
 name=azkaban-reportal
-version=2.6.3
+version=2.7.0
diff --git a/plugins/reportal/build.xml b/plugins/reportal/build.xml
@@ -85,7 +85,7 @@
 		</copy>
 
 		<javac fork="true" destdir="${dist.classes.dir}"
-			target="1.6" debug="true" deprecation="false" failonerror="true">
+			target="1.8" debug="true" deprecation="false" failonerror="true">
 			<src path="${java.src.dir}" />
 			<classpath refid="main.classpath" />
 		</javac>

diff --git a/plugins/reportal/src/azkaban/viewer/reportal/ReportalMailCreator.java b/plugins/reportal/src/azkaban/viewer/reportal/ReportalMailCreator.java
@@ -128,6 +128,11 @@ private boolean createEmail(ExecutableFlow flow, Set<String> emailList,
   private boolean createMessage(Project project, ExecutableFlow flow,
       EmailMessage message, String urlPrefix, boolean printData)
       throws Exception {
+
+    // set mail content type to be "multipart/mixed" as we are customizing the main content.
+    // failed to to this may result in trouble accessing attachment when mail is viewed from IOS mail app.
+    message.enableAttachementEmbedment(false);
+
     message.println("<html>");
     message.println("<head></head>");
     message