X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-messagerouter-messageservice.yaml;h=a6796663ca52ff617ab20b8057eac5a888f16725;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=2b2d3379468bc395163a07a3554053e73d48f2fa;hpb=941f092a9db0c63c7051de735dcff7ac06fe2b32;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 2b2d33794..a6796663c 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: dmaap-messagerouter-messageservice-java-11
-    project-name: 'dmaap-messagerouter-messageservice-java-11'
+    name: dmaap-messagerouter-messageservice-java
+    project-name: 'dmaap-messagerouter-messageservice-java'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     java-version: openjdk11
     files: '**'
@@ -24,41 +26,16 @@
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
 
-- project:
-    name: dmaap-messagerouter-messageservice-maintenance
-    project-name: 'dmaap-messagerouter-messageservice-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'dmaap/messagerouter/messageservice'
-    stream:
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    cron: ''
-
 - project:
     name: dmaap-csit
     jobs:
       - '{project-name}-review-verification-maven-{stream}':
             mvn-goals: clean deploy
-            mvn-params: '-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true'
+            mvn-params: '-P docker -Dskip.deploy=true -Dskip.docker.push=true'
       - '{project-name}-merge-verification-maven-{stream}':
             mvn-goals: clean deploy
             mvn-params: '-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true'
-    project-name: 'dmaap'
+    project-name: 'dmaap-messagerouter-messageservice'
     project: 'dmaap/messagerouter/messageservice'
     recipients: 'fiachra.corcoran@est.tech'
     stream:
@@ -93,7 +70,9 @@
     nexus-iq-namespace: 'onap-'
     project: dmaap/messagerouter/messageservice
     project-name: 'dmaap-messagerouter-messageservice'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     java-version: openjdk11