Merge branch 'develop' into parent-child-characteristics

Dockerfile

@@ -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"]
+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

pom.xml

@@ -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>