1 files changed, 41 insertions, 80 deletions
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 4232dfad5..22c560628 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,121 +1,82 @@
 ---
 - project:
     name: ccsdk-cds-java17
-    project-name: 'ccsdk-cds'
+    project-name: "ccsdk-cds"
     jobs:
       - gerrit-maven-verify:
-          mvn-params: '-Ddocker.skip.push=true -Pdocker'
+          mvn-params: "-Ddocker.skip.push=true -Pdocker"
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Pdocker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
           maven-versions-plugin: true
-          cron: '@daily'
-      - '{project-name}-gerrit-release-jobs':
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/cds'
+    project: "ccsdk/cds"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk17
-      - 'kohn':
-          branch: 'kohn'
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-cds-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
     # in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-#- project:
-#    name: ccsdk-cds-java8
-#    project-name: 'ccsdk-cds'
-#    jobs:
-#      - gerrit-maven-verify:
-#          mvn-params: '-Ddocker.skip.push=true -P docker'
-#      - gerrit-maven-merge:
-#          cron: '@daily'
-#          mvn-params: '-Ddocker.skip.push=true -P docker'
-#      - gerrit-maven-stage:
-#          build-node: centos8-builder-4c-4g
-#          sign-artifacts: true
-#          mvn-params: '-Dmaven.test.skip=true'
-#          cron: ''
-#      - gerrit-maven-docker-stage:
-#          container-public-registry: 'nexus3.onap.org:10001'
-#          container-staging-registry: 'nexus3.onap.org:10003'
-#          mvn-params: '-Dmaven.test.skip=true -P docker'
-#          maven-versions-plugin: true
-#          cron: '@daily'
-
-#    project: 'ccsdk/cds'
-#    stream:
-#      - 'frankfurt':
-#          branch: 'frankfurt'
-#    java-version: openjdk8
-#    mvn-version: 'mvn38'
-#    mvn-settings: 'ccsdk-cds-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
-    # in the job
-#    maven-deploy-properties: |
-#      deployAtEnd=true
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: centos7-docker-2c-1g
-#    mvn-snapshot-id: 'ecomp-snapshots'
-#    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: ccsdk-cds-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-builder-4c-4g
-    project: 'ccsdk/cds'
-    project-name: 'ccsdk-cds'
-    branch: 'master'
+    project: "ccsdk/cds"
+    project-name: "ccsdk-cds"
+    branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-cds-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: ccsdk-cds-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/cds'
-    project-name: 'ccsdk-cds'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/cds"
+    project-name: "ccsdk-cds"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
-    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-cds-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-builder-4c-4g
 
 - project: