Commit b21b3467 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

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

version per osl component from parent

See merge request !5
parents bc3f28a8 b490c6ae

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 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.oas-1.2.0-SNAPSHOT.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.oas-1.2.0-SNAPSHOT.jar"]

COPY target/org.etsi.osl.oas-1.0.0-SNAPSHOT.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.oas-1.0.0-SNAPSHOT.jar"]

EXPOSE 13101
 
 No newline at end of file

pom.xml

+3 −3
Original line number Diff line number Diff line
@@ -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.oas</artifactId>



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

	<name>org.etsi.osl.oas</name>

	<url>http://openslice.io</url>
@@ -105,7 +105,7 @@ 
		<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>