diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb7d754baa751630b25598e182a30f062e9b6ebd..40be386b981d8564ef04539edebb44dc6a389d39 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/Dockerfile b/Dockerfile index 0f5e4340578f63d71b9d038926fdd4b2b4bf8ad7..d4cb49c072a8b07dc35a319a0bb03ff84eebde30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk MAINTAINER openslice.io RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ -COPY target/org.etsi.osl.bugzilla-1.0.0.jar /opt/openslice/lib/ -CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.0.jar"] \ No newline at end of file +COPY target/org.etsi.osl.bugzilla-1.0.1.jar /opt/openslice/lib/ +CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.1.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7a7f5c340371bb464d3a60138b17681e6e057e76..f9e666dee473eeeee7c3723f7c7bd6c3d6ad8e03 100644 --- a/pom.xml +++ b/pom.xml @@ -5,15 +5,21 @@ <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.bugzilla</artifactId> <name>org.etsi.osl.bugzilla</name> + <version>${org.etsi.osl.bugzilla.version}</version> <url>http://maven.apache.org</url> + <organization> + <name>OpenSlice by ETSI</name> + <url>https://osl.etsi.org</url> + </organization> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>