Commit 20739d4a authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

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

version per osl component from parent

See merge request !6
parents c9c6ebd9 0becd360

pom.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -2,15 +2,15 @@ 
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	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.bugzilla</artifactId>





	<artifactId>org.etsi.osl.bugzilla</artifactId>

	<name>org.etsi.osl.bugzilla</name>

	<name>org.etsi.osl.bugzilla</name>

	<url>http://maven.apache.org</url>

	<url>http://maven.apache.org</url>
@@ -180,12 +180,12 @@ 
		<dependency>

		<dependency>

			<groupId>org.etsi.osl</groupId>

			<groupId>org.etsi.osl</groupId>

			<artifactId>org.etsi.osl.model.nfv</artifactId>

			<artifactId>org.etsi.osl.model.nfv</artifactId>

			<version>${project.version}</version>

			<version>${org.etsi.osl.model.nfv.version}</version>

		</dependency>

		</dependency>

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