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 68aefbc7f20e13c9ec0b1d461e0b71382edd58af..c861b1263475642adc3d0a74ba46283496164e74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ 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.osom-1.0.0.jar /opt/openslice/lib/ -COPY target/org.etsi.osl.osom-1.0.0-exec.jar /opt/openslice/lib/ +COPY target/org.etsi.osl.osom-1.0.1-SNAPSHOT.jar /opt/openslice/lib/ +COPY target/org.etsi.osl.osom-1.0.1-SNAPSHOT-exec.jar /opt/openslice/lib/ COPY . /opt/openslice/lib/ -CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.0.0-exec.jar"] \ No newline at end of file +CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.0.1-SNAPSHOT-exec.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9a6a469ef3b67959b07a1863ee7a726fc425c92e..949684c7ffa5ec848c202680e2123c3f24d48e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,16 +5,20 @@ <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> <artifactId>org.etsi.osl.osom</artifactId> <name>org.etsi.osl.osom</name> + <version>${org.etsi.osl.osom.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> @@ -82,6 +86,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> + <version>2.3.232</version> </dependency> <dependency> <groupId>org.etsi.osl</groupId> diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fd9ed495e9e7ac6aac458ce40f605294166ee911..26208b42b49ab255e0c0af52e626a91996dc700c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,9 @@ server: port: 13689 +flowable: + history-level: none + spring: application: name: openslice-osom @@ -103,7 +106,7 @@ CATALOG_ADD_RESOURCESPEC: "jms:queue:CATALOG.ADD.RESOURCESPEC" CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC" CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC" CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID" -CATALOG_GET_RESOURCESPEC_BY_ÎAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ÎAME_CATEGORY" +CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_NAME_CATEGORY" #CRD ACTIONS CRD_DEPLOY_CR_REQ: "jms:queue:CRD.DEPLOY.CR_REQ"