Commit 37a1be09 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/osl/code/org.etsi.osl.osom into develop

parents ac9e937a 3baf54b4

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -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

Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -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

pom.xml

+7 −2
Original line number Diff line number Diff line
@@ -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>

src/main/resources/application.yml

+4 −1
Original line number Diff line number Diff line 
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"