From 5dfe085f73e5f769d99506e0749a519187f81642 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Thu, 13 Jun 2024 12:52:20 +0000
Subject: [PATCH 1/4] feat: version 1.0.0

---
 Dockerfile | 4 ++--
 pom.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 16cb6ad..f8fcd55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,6 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
 MAINTAINER openslice.io
 RUN mkdir /opt/shareclasses
 RUN mkdir -p /opt/openslice/lib/
-COPY target/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar /opt/openslice/lib/
-CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar"]
+COPY target/org.etsi.osl.portal.api-1.0.0.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0.jar"]
 EXPOSE 13000
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3bee248..5fb311b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.etsi.osl</groupId>
 		<artifactId>org.etsi.osl.main</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../org.etsi.osl.main</relativePath>
 	</parent>
 
-- 
GitLab


From d3559a4a841d8f502497b4a10d173f73e410ff22 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 14 Jun 2024 11:43:21 +0000
Subject: [PATCH 2/4] fix: add protected run

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ea78d6..6b853e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ include:
       - ci-templates/default.yml
       - ci-templates/build.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME == "develop"'
+      - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'
 
   - project: osl/code/org.etsi.osl.main
     ref: develop
@@ -21,7 +21,7 @@ include:
       - ci-templates/default.yml
       - ci-templates/build_unprotected.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
 
 maven_build:
   extends: .maven_build
-- 
GitLab


From 68493d8d764ad95d27f63ba70249ed2b5554b4be Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 14 Jun 2024 13:03:51 +0000
Subject: [PATCH 3/4] fix: side branch references main's side branch

---
 .gitlab-ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b853e7..bb7d754 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,15 @@ include:
       - ci-templates/default.yml
       - ci-templates/build.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'
+      - if: '$CI_COMMIT_REF_NAME == "develop"'
+
+  - project: osl/code/org.etsi.osl.main
+    ref: $CI_COMMIT_REF_NAME
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
 
   - project: osl/code/org.etsi.osl.main
     ref: develop
-- 
GitLab


From b5ed529e92549681cbdb526ea63db7fd269b0a8c Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Fri, 28 Jun 2024 00:44:57 +0300
Subject: [PATCH 4/4] fix for
 https://labs.etsi.org/rep/osl/code/org.etsi.osl.portal.api/-/issues/9

---
 .../api/service/DeploymentDescriptorService.java       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/portal/api/service/DeploymentDescriptorService.java b/src/main/java/portal/api/service/DeploymentDescriptorService.java
index 7244d54..246c7b5 100644
--- a/src/main/java/portal/api/service/DeploymentDescriptorService.java
+++ b/src/main/java/portal/api/service/DeploymentDescriptorService.java
@@ -226,7 +226,15 @@ public class DeploymentDescriptorService {
 	        Hibernate.initialize(dd.getDeploymentDescriptorVxFInstanceInfo());
 	        Hibernate.initialize(dd.getMentor().getRoles());
 	        Hibernate.initialize(dd.getInfrastructureForAll().getRefSupportedImages());
-	        Hibernate.initialize(dd.getExperiment().getConstituentVxF());
+            Hibernate.initialize(dd.getExperiment().getConstituentVxF());
+            for (ConstituentVxF cvxf : dd.getExperiment().getConstituentVxF()) {
+              Hibernate.initialize( cvxf.getVxfref().getCategories());
+              Hibernate.initialize( cvxf.getVxfref().getExtensions() );
+              Hibernate.initialize( cvxf.getVxfref().getValidationJobs() );
+              Hibernate.initialize( cvxf.getVxfref().getSupportedMANOPlatforms() );
+              Hibernate.initialize( cvxf.getVxfref().getVxfOnBoardedDescriptors() );
+              Hibernate.initialize( cvxf.getVxfref().getVfimagesVDU() );
+            }
 	        Hibernate.initialize(dd.getExperimentFullDetails().getCategories());
 	        Hibernate.initialize(dd.getExperimentFullDetails().getExtensions());
 	        Hibernate.initialize(dd.getExperimentFullDetails().getValidationJobs());
-- 
GitLab