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

Merge branch '2024Q2_RC' into 'develop'

Merging 2024Q2_RC into develop

See merge request !7
parents 45bfc271 316e504c
No related branches found
No related tags found
1 merge request!7Merging 2024Q2_RC into develop
Pipeline #7211 passed
......@@ -15,13 +15,21 @@ include:
rules:
- 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
ref: develop
file:
- ci-templates/default.yml
- ci-templates/build_unprotected.yml
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:
extends: .maven_build
......
......@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
MAINTAINER openslice.io
RUN mkdir /opt/shareclasses
RUN mkdir -p /opt/openslice/lib/
COPY target/org.etsi.osl.bugzilla-1.0.0-SNAPSHOT.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.0-SNAPSHOT.jar"]
\ No newline at end of file
COPY target/org.etsi.osl.bugzilla-1.0.0.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.0.jar"]
\ No newline at end of file
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.etsi.osl.main</relativePath>
</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