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

Merge branch '7-internal-component-versioning-1-0-0-snapshot' into 'develop'

version per osl component from parent

See merge request !6
parents 9ceb63c1 e172b97d
No related branches found
No related tags found
2 merge requests!8Merging 2024Q2_RC into main, creating 2024Q2 Release,!6version per osl component from parent
Pipeline #4216 passed
...@@ -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.cridge-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/ COPY target/org.etsi.osl.cridge-1.0.0-SNAPSHOT-exec.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.2.0-SNAPSHOT-exec.jar"] CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.0.0-SNAPSHOT-exec.jar"]
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<relativePath>../org.etsi.osl.main</relativePath> <relativePath>../org.etsi.osl.main</relativePath>
</parent> </parent>
<artifactId>org.etsi.osl.cridge</artifactId>
<artifactId>org.etsi.osl.cridge</artifactId>
<name>org.etsi.osl.cridge</name> <name>org.etsi.osl.cridge</name>
<url>http://openslice.io</url> <url>http://openslice.io</url>
...@@ -103,12 +103,12 @@ ...@@ -103,12 +103,12 @@
<dependency> <dependency>
<groupId>org.etsi.osl</groupId> <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model.tmf</artifactId> <artifactId>org.etsi.osl.model.tmf</artifactId>
<version>${project.version}</version> <version>${org.etsi.osl.model.tmf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.etsi.osl</groupId> <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model.k8s</artifactId> <artifactId>org.etsi.osl.model.k8s</artifactId>
<version>${project.version}</version> <version>${org.etsi.osl.model.k8s.version}</version>
</dependency> </dependency>
......
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