X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-mapper.yaml;h=b0d647072f6513b9a74a74f3410d1aae214d202f;hb=6633c8385873029713b06369e04694e07e86e607;hp=6e0fe730492a63e088f28f3b2b2ee9ee39b5f0ae;hpb=a18a7cffc1a0bf139f2238c10de21e2730c74289;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 6e0fe7304..b0d647072 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -2,16 +2,19 @@
 - project:
     name: dcaegen2-services-mapper
     project-name: 'dcaegen2-services-mapper'
+    java-version: openjdk11
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package docker:build -DpushImage'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -21,7 +24,11 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dcaegen2-services-mapper-settings'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -30,6 +37,7 @@
 
 - project:
     name: dcaegen2-services-mapper-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -48,18 +56,22 @@
 
 - project:
     name: dcaegen2-services-mapper-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/mapper
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-mapper'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dcaegen2-services-mapper-settings'
 
 - project:
     name: dcaegen2-services-mapper-info
     project-name: dcaegen2-services-mapper
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g