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 5902de6bf64025c2f60cd57695ffb44ae4491034..7929724b0fc17bd65f8b0fdf5090e3d4e16c9d29 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</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>