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

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d2c577a..ba95f4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,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 3a602ef54e9efc6e85ad25814a85e9f9d94e1e6b Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 14 Jun 2024 11:40:24 +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 49a3cd4..1e7d6e7 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 525d1160e386c50d437d73b649d2d6cf30f93ae9 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 14 Jun 2024 13:02:45 +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 1e7d6e7..3d872f6 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 6279486bbb36b13a9bc4a96050a8823efd74c63c Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Thu, 27 Jun 2024 11:29:21 +0300
Subject: [PATCH 4/4] fix for #9

---
 src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java b/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java
index e850680..4f477e6 100644
--- a/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java
+++ b/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java
@@ -52,7 +52,7 @@ public class ConstituentVxF {
 	@Basic()
 	private String vnfdidRef;
 	
-	@ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } )
+	@ManyToOne(cascade = { CascadeType.DETACH } )
 	@JoinColumn(name = "vxf_id")
 	private VxFMetadata vxfref;
 
-- 
GitLab