From 0894e2adfc5167e7d9a40b65e12e9f9b9ea22a93 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Thu, 26 Sep 2019 10:46:29 +0200
Subject: [PATCH] rename section Portal-Core to PortalCore update the Jenkins
 file with the new sections defined in gcube-4.15.0.yaml file

---
 Jenkinsfile                | 62 ++++++++++++++++++++++++++++++++++----
 releases/gcube-4.15.0.yaml |  6 ++--
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 68caf57..e4cfc6b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -103,14 +103,23 @@ pipeline {
                 echo "Done with maven-parent"
           }
         }
-        stage('build SmartGears components') {
+        stage('build Core components') {
           steps {
                 withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
-                    buildComponents items: jsonConfig.gCube_release.Components.SmartGears?.collect { "${it.name}" }
+                    buildComponents items: jsonConfig.gCube_release.Components.Core?.collect { "${it.name}" }
                 }
-                echo "Done with SmartGears components"
+                echo "Done with Core components"
           }
         }
+        stage('build PortalCore components') {
+          steps {
+                withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
+                    buildComponents items: jsonConfig.gCube_release.Components.PortalCore?.collect { "${it.name}" }
+                }
+                echo "Done with Portal-Core components"
+          }
+        }
+        
         stage('build Enabling components') {
            steps {
                 withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
@@ -119,14 +128,55 @@ pipeline {
                 echo "Done with Enabling components"
            }
         }
-        stage('build Data components') {
+        stage('build ClientLibraries components') {
            steps {
                 withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
-                    buildComponents items: jsonConfig.gCube_release.Components.Data?.collect { "${it?.name}" }
+                    buildComponents items: jsonConfig.gCube_release.Components.ClientLibraries?.collect { "${it?.name}" }
                 }
-                echo "Done with Data components"
+                echo "Done with ClientLibraries components"
            }
         }
+        stage('build Libraries components') {
+           steps {
+                withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
+                    buildComponents items: jsonConfig.gCube_release.Components.Libraries?.collect { "${it?.name}" }
+                }
+                echo "Done with Libraries components"
+           }
+        }
+        stage('build Plugins components') {
+           steps {
+                withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
+                    buildComponents items: jsonConfig.gCube_release.Components.Plugins?.collect { "${it?.name}" }
+                }
+                echo "Done with Plugins components"
+           }
+        }
+        stage('build Services components') {
+           steps {
+                withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
+                    buildComponents items: jsonConfig.gCube_release.Components.Services?.collect { "${it?.name}" }
+                }
+                echo "Done with Services components"
+           }
+        }
+        stage('build Widgets components') {
+           steps {
+                withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
+                    buildComponents items: jsonConfig.gCube_release.Components.Widgets?.collect { "${it?.name}" }
+                }
+                echo "Done with Widgets components"
+           }
+        }        
+        stage('build Portlets components') {
+           steps {
+                withMaven(jdk: "${maven_jdk}", mavenLocalRepo: "${maven_local_repo_path}", mavenSettingsFilePath: "${maven_settings_file}") {
+                    buildComponents items: jsonConfig.gCube_release.Components.Portlets?.collect { "${it?.name}" }
+                }
+                echo "Done with Portlets components"
+           }
+        }
+        
       }
 }
 
diff --git a/releases/gcube-4.15.0.yaml b/releases/gcube-4.15.0.yaml
index 5f06a6b..bf7cef0 100644
--- a/releases/gcube-4.15.0.yaml
+++ b/releases/gcube-4.15.0.yaml
@@ -11,7 +11,7 @@ gCube_release:
       - name: common-encryption
         version: 1.1.0 
 
-    Portal-Core:
+    PortalCore:
       - NONE 
 
     Enabling:
@@ -59,8 +59,8 @@ gCube_release:
         version: 1.2.0   
 
     Widgets:
-      -name: ckan-metadata-publisher-widget # ? dependency: HL, social-networking-library, dependant: ws-portlet, gcube-ckan-data-catalogue
-       version: 1.6.0
+      - name: ckan-metadata-publisher-widget # ? dependency: HL, social-networking-library, dependant: ws-portlet, gcube-ckan-data-catalogue
+        version: 1.6.0
 
     Portlets:
       - name: ws-thredds