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 e59e6ef43f4f97b921375525b17dbf9af6081a6c..780f54ec9cddd2faf1b9e9d763a744c30ed9b3e6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,19 @@ <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> <artifactId>org.etsi.osl.centrallog.client</artifactId> <name>org.etsi.osl.centrallog.client</name> - + <version>${org.etsi.osl.centrallog.client.version}</version> + + <organization> + <name>OpenSlice by ETSI</name> + <url>https://osl.etsi.org</url> + </organization> + <repositories> <repository> <id>gitlab-maven</id>