Commit e58d521c authored by Kostis Trantzas's avatar Kostis 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
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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.cridge-1.2.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"]
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.0.0-SNAPSHOT-exec.jar"]
+3 −3
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@
		<relativePath>../org.etsi.osl.main</relativePath>
	</parent>

	<artifactId>org.etsi.osl.cridge</artifactId>

	<artifactId>org.etsi.osl.cridge</artifactId>
	<name>org.etsi.osl.cridge</name>
	<url>http://openslice.io</url>

@@ -103,12 +103,12 @@
		<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.k8s</artifactId>
			<version>${project.version}</version>
			<version>${org.etsi.osl.model.k8s.version}</version>
		</dependency>