Commit fb0c07e6 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

MR for Release 2024Q4
parents 618da3c3 a4e39aa5

.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

+2 −2
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 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.oas-1.0.0.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.oas-1.0.0.jar"]

COPY target/org.etsi.osl.oas-1.0.1.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.oas-1.0.1.jar"]

EXPOSE 13101
 
 No newline at end of file

pom.xml

+7 −3
Original line number Diff line number Diff line
@@ -5,15 +5,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.oas</artifactId>

	<name>org.etsi.osl.oas</name>

	<url>http://openslice.io</url>

	<version>${org.etsi.osl.oas.version}</version>

	

	<organization>

		<name>OpenSlice by ETSI</name>

		<url>https://osl.etsi.org</url>

	</organization>





	<properties>