Commit 7bfe8bbf 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 16156fd5 a28ccfe9
Loading
Loading
Loading
Loading
Loading
+3 −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"
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
	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>
	<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.nfv</artifactId>

	<packaging>jar</packaging>
	<packaging>jar</packaging>


	<artifactId>org.etsi.osl.model.nfv</artifactId>
	<name>org.etsi.osl.model.nfv</name>
	<name>org.etsi.osl.model.nfv</name>
	<url>http://maven.apache.org</url>
	<url>http://maven.apache.org</url>