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

Merge branch 'develop' into 'main'

MR for Release 2024Q4

See merge request !10
parents a9ea4bef 807d1ee8
No related branches found
No related tags found
2 merge requests!11Merge branch 'main' into 'develop',!10MR for Release 2024Q4
Pipeline #11315 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
......
...@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk ...@@ -2,5 +2,5 @@ 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.bugzilla-1.0.0.jar /opt/openslice/lib/ COPY target/org.etsi.osl.bugzilla-1.0.1.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.0.jar"] CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.1.jar"]
\ No newline at end of file \ No newline at end of file
...@@ -5,15 +5,21 @@ ...@@ -5,15 +5,21 @@
<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>
<artifactId>org.etsi.osl.bugzilla</artifactId> <artifactId>org.etsi.osl.bugzilla</artifactId>
<name>org.etsi.osl.bugzilla</name> <name>org.etsi.osl.bugzilla</name>
<version>${org.etsi.osl.bugzilla.version}</version>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<organization>
<name>OpenSlice by ETSI</name>
<url>https://osl.etsi.org</url>
</organization>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
......
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