Commit 8d4ef851 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

MR for Release 2024Q4

See merge request !10
parents a09eb034 92596d26

.gitlab-ci.yml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ include: 
      - ci-templates/default.yml

      - ci-templates/default.yml

      - ci-templates/build.yml

      - ci-templates/build.yml

    rules:

    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

  - project: osl/code/org.etsi.osl.main

    ref: develop

    ref: develop
@@ -29,7 +29,7 @@ include: 
      - ci-templates/default.yml

      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

      - ci-templates/build_unprotected.yml

    rules:

    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:

maven_build:

  extends: .maven_build
 
  extends: .maven_build

pom.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -4,13 +4,14 @@ 
	<parent>

	<parent>

		<groupId>org.etsi.osl</groupId>

		<groupId>org.etsi.osl</groupId>

		<artifactId>org.etsi.osl.main</artifactId>

		<artifactId>org.etsi.osl.main</artifactId>

		<version>1.0.0</version>

		<version>2024Q4</version>

		<relativePath>../org.etsi.osl.main</relativePath>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>

	</parent>





	<packaging>jar</packaging>

	<packaging>jar</packaging>





	<artifactId>org.etsi.osl.model.nfv</artifactId>

	<artifactId>org.etsi.osl.model.nfv</artifactId>

	<version>${org.etsi.osl.model.nfv.version}</version>

	<name>org.etsi.osl.model.nfv</name>

	<name>org.etsi.osl.model.nfv</name>

	<url>http://maven.apache.org</url>

	<url>http://maven.apache.org</url>