Merge "Removing master branch from Cert-Service located in AAF repo"

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 60f1ad6..da5dfdc 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -520,6 +520,7 @@
     project-type: freestyle
     node: '{build-node}'
     disabled: '{disabled}'
+    java-version: openjdk8
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -555,6 +556,9 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index c787335..38cc304 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -33,6 +33,8 @@
           branch: 'frankfurt'
       - 'elalto':
           branch: 'elalto'
+      - 'dynamicBPMN':
+          branch: 'Dynamic_BPMN'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''