Commit 8dd9a599 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 77ec5c4b ebe2cca5
Loading
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -5,7 +5,8 @@
	<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>




@@ -46,7 +47,7 @@
		<dependency>
		<dependency>
			<groupId>org.etsi.osl</groupId>
			<groupId>org.etsi.osl</groupId>
			<artifactId>org.etsi.osl.model.tmf</artifactId>
			<artifactId>org.etsi.osl.model.tmf</artifactId>
			<version>${project.version}</version>
			<version>${org.etsi.osl.model.tmf.version}</version>
		</dependency>
		</dependency>
	</dependencies>
	</dependencies>
</project>
</project>
 No newline at end of file