Merge "Update jjb for SO"

diff --combined jjb/so/so-libs.yaml
index 37d649d,eefe5ca..c8d4702
--- 1/jjb/so/so-libs.yaml
--- 2/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@@ -4,6 -4,7 +4,6 @@@
      project-name: 'so-libs'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
@@@ -15,8 -16,6 +15,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'so-libs-settings'
      # due to a strange macro / variable translation problem this needs to be
      # passed as a string block to properly get the properties correctly defined
@@@ -30,6 -29,7 +28,6 @@@
      jobs:
        - gerrit-maven-sonar
      build-node: ubuntu1604-basebuild-4c-4g
 -    java-version: ''
      project: 'so/libs'
      project-name: 'so-libs'
      branch: 'master'

diff --combined jjb/so/so.yaml
index 8b1eded,36ef2fe..46b93fc
--- 1/jjb/so/so.yaml
--- 2/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@@ -27,8 -27,6 +27,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'so-settings'
      files: '**'
      archive-artifacts: ''
@@@ -38,6 -36,7 +36,6 @@@
      jobs:
        - gerrit-maven-sonar
      build-node: ubuntu1604-basebuild-4c-4g
 -    java-version: ''
      project: 'so'
      project-name: 'so'
      branch: 'master'