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

version per osl component from parent

See merge request !6

Dockerfile

@@ -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.portal.api-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
-CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.2.0-SNAPSHOT.jar"]
+COPY target/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar"]
 EXPOSE 13000
\ No newline at end of file

pom.xml

@@ -2,16 +2,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
 	<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.portal.api</artifactId>
 
+	<artifactId>org.etsi.osl.portal.api</artifactId>
 	<name>org.etsi.osl.portal.api</name>
 	<url>http://maven.apache.org</url>
 
@@ -224,23 +223,23 @@
 		<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.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>org.etsi.osl</groupId>
 			<artifactId>org.etsi.osl.centrallog.client</artifactId>
-			<version>${project.version}</version>
+			<version>${org.etsi.osl.centrallog.client.version}</version>
 		</dependency>