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

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

version per osl component from parent

See merge request !5
parents f69f2bf4 e6629b6d
No related branches found
No related tags found
2 merge requests!7Merging 2024Q2_RC into main, creating 2024Q2 Release,!5version per osl component from parent
Pipeline #4217 passed
......@@ -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.manoclient-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.2.0-SNAPSHOT.jar"]
\ No newline at end of file
COPY target/org.etsi.osl.manoclient-1.0.0-SNAPSHOT.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.0.0-SNAPSHOT.jar"]
\ No newline at end of file
......@@ -3,12 +3,11 @@
<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.manoclient</artifactId>
<name>org.etsi.osl.manoclient</name>
<url>http://maven.apache.org</url>
......@@ -154,31 +153,31 @@
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.tmf.api</artifactId>
<version>${project.version}</version>
<version>${org.etsi.osl.tmf.api.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>
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.centrallog.client</artifactId>
<version>${project.version}</version>
<version>${org.etsi.osl.centrallog.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.etsi.osl.sol005nbi</groupId>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.sol005nbi.osm</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>${org.etsi.osl.sol005nbi.osm.version}</version>
</dependency>
<dependency>
<groupId>org.etsi.osl.sol005nbi</groupId>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.sol005nbi.osm10</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>${org.etsi.osl.sol005nbi.osm10.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
......
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