Skip to content
Snippets Groups Projects
Commit 8d4ef851 authored by trantzas's avatar trantzas
Browse files

Merge branch 'develop' into 'main'

MR for Release 2024Q4

See merge request !10
parents a09eb034 92596d26
Branches main
Tags 2024Q4
1 merge request!10MR for Release 2024Q4
Pipeline #11307 passed
......@@ -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
......@@ -4,13 +4,14 @@
<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>
<packaging>jar</packaging>
<artifactId>org.etsi.osl.model.nfv</artifactId>
<version>${org.etsi.osl.model.nfv.version}</version>
<name>org.etsi.osl.model.nfv</name>
<url>http://maven.apache.org</url>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment