From 710fa9a0260c6585a2901d1ea0354e9b06bff721 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Fri, 30 Aug 2024 13:54:08 +0000
Subject: [PATCH 1/3] 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 1dec154590a943dfad5ecefb5405e10a11ab7613 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Tue, 17 Sep 2024 18:53:49 +0000
Subject: [PATCH 2/3] Development preparation for release 2024Q4
---
pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5902de6..8db1a7b 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</version>
+ <version>2024Q4-SNAPSHOT</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
@@ -12,10 +12,11 @@
<artifactId>org.etsi.osl.sol005nbi.osm</artifactId>
<name>org.etsi.osl.sol005nbi.osm</name>
+ <version>${org.etsi.osl.sol005nbi.osm.version}</version>
<organization>
- <name>openslice.io</name>
- <url>http://openslice.io</url>
+ <name>OpenSlice by ETSI</name>
+ <url>https://osl.etsi.org</url>
</organization>
<inceptionYear>2019</inceptionYear>
--
GitLab
From 9d7ba161840f960db19ae5087eab37d258049bbe Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Tue, 14 Jan 2025 12:18:47 +0000
Subject: [PATCH 3/3] 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 8db1a7b..7929724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
- <version>2024Q4-SNAPSHOT</version>
+ <version>2024Q4</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
--
GitLab