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

Merge branch '2024Q2_RC' into 'develop'

Merging 2024Q2_RC into develop

See merge request !6
parents b21b3467 58d64186
No related branches found
No related tags found
1 merge request!6Merging 2024Q2_RC into develop
Pipeline #7213 passed
...@@ -15,13 +15,21 @@ include: ...@@ -15,13 +15,21 @@ include:
rules: rules:
- if: '$CI_COMMIT_REF_NAME == "develop"' - if: '$CI_COMMIT_REF_NAME == "develop"'
- project: osl/code/org.etsi.osl.main
ref: $CI_COMMIT_REF_NAME
file:
- ci-templates/default.yml
- ci-templates/build.yml
rules:
- if: '$CI_COMMIT_REF_PROTECTED && $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
file: file:
- 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"' - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
maven_build: maven_build:
extends: .maven_build extends: .maven_build
......
...@@ -2,6 +2,6 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk ...@@ -2,6 +2,6 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
MAINTAINER openslice.io MAINTAINER openslice.io
RUN mkdir /opt/shareclasses RUN mkdir /opt/shareclasses
RUN mkdir -p /opt/openslice/lib/ RUN mkdir -p /opt/openslice/lib/
COPY target/org.etsi.osl.oas-1.0.0-SNAPSHOT.jar /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-SNAPSHOT.jar"] CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.oas-1.0.0.jar"]
EXPOSE 13101 EXPOSE 13101
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,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-SNAPSHOT</version> <version>1.0.0</version>
<relativePath>../org.etsi.osl.main</relativePath> <relativePath>../org.etsi.osl.main</relativePath>
</parent> </parent>
......
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