[DMAAP] Refactor dmaap jobs

Added H jobs to relevant templates
Changed some of the trigger jobs to trigger on docker-stage
Merged some MR jobs in the relevant template
Removed java verify for zookeeper

Change-Id: Iace56a99d5df21425f8b00e491bac8e790e340c0
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DMAAP-1570
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 3e3676b..8c77747 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: dmaap-datarouter-java11
     project-name: 'dmaap-datarouter'
@@ -6,6 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
           mvn-goals: 'clean package -P docker docker:build docker:push'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -15,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-datarouter-settings'