AMBARI-8869. Include AMS debian packages in Ambari build. Updated build properties. (swagle)

ambari-metrics/ambari-metrics-timelineservice/pom.xml

@@ -34,8 +34,9 @@
     <!-- Needed for generating FindBugs warnings using parent pom -->
     <!--<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>-->
     <protobuf.version>2.5.0</protobuf.version>
-    <hadoop.version>2.4.0</hadoop.version>
-    <phoenix.version>4.2.0.2.2.1.0-2114</phoenix.version>
+    <hadoop.version>(2.6.0.2.2.0.0, 2.6.0.2.2.1.0)</hadoop.version>
+    <phoenix.version>4.2.0.2.2.0.0-2041</phoenix.version>
+    <hbase.version>0.98.4.2.2.0.0-2041-hadoop2</hbase.version>
   </properties>
 
   <build>
@@ -477,14 +478,14 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-it</artifactId>
-      <version>0.98.4-hadoop2</version>
+      <version>${hbase.version}</version>
       <scope>test</scope>
       <classifier>tests</classifier>
     </dependency>
       <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-testing-util</artifactId>
-        <version>0.98.4-hadoop2</version>
+        <version>${hbase.version}</version>
         <scope>test</scope>
         <optional>true</optional>
         <exclusions>

ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java

@@ -171,6 +171,7 @@ public class ApplicationHistoryManagerImpl extends AbstractService implements
     return ApplicationAttemptReport.newInstance(
       appAttemptHistory.getApplicationAttemptId(), appAttemptHistory.getHost(),
       appAttemptHistory.getRPCPort(), appAttemptHistory.getTrackingURL(),
+      null,
       appAttemptHistory.getDiagnosticsInfo(),
       appAttemptHistory.getYarnApplicationAttemptState(),
       appAttemptHistory.getMasterContainerId());

ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java

@@ -177,9 +177,9 @@ public class ApplicationHistoryServer extends CompositeService {
               ahsClientService, "ws")
             .with(getConfig())
             .withHttpSpnegoPrincipalKey(
-              YarnConfiguration.TIMELINE_SERVICE_WEBAPP_SPNEGO_USER_NAME_KEY)
+              YarnConfiguration.TIMELINE_SERVICE_PRINCIPAL)
             .withHttpSpnegoKeytabKey(
-              YarnConfiguration.TIMELINE_SERVICE_WEBAPP_SPNEGO_KEYTAB_FILE_KEY)
+              YarnConfiguration.TIMELINE_SERVICE_KEYTAB)
             .at(bindAddress)
             .start(new AHSWebApp(historyManager, timelineStore, timelineMetricStore));
     } catch (Exception e) {