Commit 55f8f83c authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

MR for Release 2024Q4

See merge request !8
parents 07f5fe4c 54257eda

.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

pom.xml

+8 −2
Original line number Diff line number Diff line
@@ -3,12 +3,18 @@ 
	<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>