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

Merge branch 'develop' into 'main'

MR for Release 2024Q4

See merge request !9
parents 39c7f91d e124d240
No related branches found
No related tags found
2 merge requests!10Merge branch 'main' into 'develop',!9MR for Release 2024Q4
Pipeline #11305 passed
...@@ -21,7 +21,7 @@ include: ...@@ -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: ...@@ -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
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<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>
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
<artifactId>org.etsi.osl.sol005nbi.osm</artifactId> <artifactId>org.etsi.osl.sol005nbi.osm</artifactId>
<name>org.etsi.osl.sol005nbi.osm</name> <name>org.etsi.osl.sol005nbi.osm</name>
<version>${org.etsi.osl.sol005nbi.osm.version}</version>
<organization> <organization>
<name>openslice.io</name> <name>OpenSlice by ETSI</name>
<url>http://openslice.io</url> <url>https://osl.etsi.org</url>
</organization> </organization>
<inceptionYear>2019</inceptionYear> <inceptionYear>2019</inceptionYear>
......
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