From 6223e4663177edb898d9f503cd4fd3d9b950edd2 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 30 Aug 2024 13:54:22 +0000 Subject: [PATCH 1/5] fix: strictly compare between strings --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d872f6..3f669e2 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 -- GitLab From 6532ce076199b1078d1b7f22dfd83dd448380f25 Mon Sep 17 00:00:00 2001 From: trantzas Date: Mon, 9 Sep 2024 10:48:10 +0000 Subject: [PATCH 2/5] Development preparation for release 2024Q4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba95f4f..e127f87 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.etsi.osl org.etsi.osl.main - 1.0.0 + 2.0.0-SNAPSHOT ../org.etsi.osl.main -- GitLab From 7ac374d88784eb86cbec9adf2fd336cc095af351 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Wed, 11 Sep 2024 07:32:04 +0000 Subject: [PATCH 3/5] fix: overwrite parent version with component's --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index e127f87..36b0dac 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ jar org.etsi.osl.model.nfv + ${org.etsi.osl.model.nfv.version} org.etsi.osl.model.nfv http://maven.apache.org -- GitLab From e11f32b81392ac4f321c64eb3a734fd0ad55a46d Mon Sep 17 00:00:00 2001 From: trantzas Date: Mon, 16 Sep 2024 14:05:57 +0000 Subject: [PATCH 4/5] Development preparation for release 2024Q4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36b0dac..f3b6b33 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.etsi.osl org.etsi.osl.main - 2.0.0-SNAPSHOT + 2024Q4-SNAPSHOT ../org.etsi.osl.main -- GitLab From a3933532d08164b0e65c8d4d3149d825976731cd Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 14 Jan 2025 12:30:37 +0000 Subject: [PATCH 5/5] Preparing the 2024Q4_RC: - Remove -SNAPSHOT from parent's version at pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3b6b33..ba559c8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.etsi.osl org.etsi.osl.main - 2024Q4-SNAPSHOT + 2024Q4 ../org.etsi.osl.main -- GitLab