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

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

version per osl component from parent

See merge request !4
parents 8177511c 13e0e6b8
Loading
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
	<modelVersion>4.0.0</modelVersion>
	<modelVersion>4.0.0</modelVersion>

	<parent>
	<parent>
		<groupId>org.etsi.osl</groupId>
		<groupId>org.etsi.osl</groupId>
		<artifactId>org.etsi.osl.main</artifactId>
		<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>
	</parent>
	
	
  	<artifactId>org.etsi.osl.model.tmf</artifactId>
  	<artifactId>org.etsi.osl.model.tmf</artifactId>