Skip to content
Snippets Groups Projects
Commit ade395f3 authored by tranoris's avatar tranoris
Browse files

Merge branch 'develop' into parent-child-characteristics

parents d56cb81a 60c6bf81
No related branches found
No related tags found
2 merge requests!12Merging 2024Q2_RC into main, creating 2024Q2 Release,!10Parent child characteristics
Pipeline #4341 failed
......@@ -2,7 +2,7 @@ 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.osom-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
COPY target/org.etsi.osl.osom-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/
COPY target/org.etsi.osl.osom-1.0.0-SNAPSHOT.jar /opt/openslice/lib/
COPY target/org.etsi.osl.osom-1.0.0-SNAPSHOT-exec.jar /opt/openslice/lib/
COPY . /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.2.0-SNAPSHOT-exec.jar"]
\ No newline at end of file
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.0.0-SNAPSHOT-exec.jar"]
\ No newline at end of file
......@@ -5,12 +5,12 @@
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
<artifactId>org.etsi.osl.osom</artifactId>
<artifactId>org.etsi.osl.osom</artifactId>
<name>org.etsi.osl.osom</name>
<url>http://maven.apache.org</url>
......@@ -86,13 +86,13 @@
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model.tmf</artifactId>
<version>${project.version}</version>
<version>${org.etsi.osl.model.tmf.version}</version>
</dependency>
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model.nfv</artifactId>
<version>${project.version}</version>
<version>${org.etsi.osl.model.nfv.version}</version>
</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