diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d872f628da12898f872b41465d9794dfc5c0684..3f669e27a7079fdd5a208bcb1fa754ba00491cc4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ include:
- ci-templates/default.yml
- ci-templates/build.yml
rules:
- - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+ - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
- project: osl/code/org.etsi.osl.main
ref: develop
@@ -29,7 +29,7 @@ include:
- ci-templates/default.yml
- ci-templates/build_unprotected.yml
rules:
- - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
+ - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'
maven_build:
extends: .maven_build
diff --git a/pom.xml b/pom.xml
index ba95f4f6387e0a18f39c78612ede7a31a1c56007..ba559c8a25bc85a425e49038ff3710e899daafe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,14 @@
org.etsi.osl
org.etsi.osl.main
- 1.0.0
+ 2024Q4
../org.etsi.osl.main
jar
org.etsi.osl.model.nfv
+ ${org.etsi.osl.model.nfv.version}
org.etsi.osl.model.nfv
http://maven.apache.org