Commit 16ae74fb authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

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

version per osl component from parent

See merge request !6
parents 0f36ed91 b43238bd

pom.xml

+6 −5
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>
@@ -206,22 +207,22 @@ 
		<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>

		<dependency>

		<dependency>

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

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

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

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

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

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

		</dependency>

		</dependency>

		<dependency>

		<dependency>

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

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

			<artifactId>org.etsi.osl.centrallog.client</artifactId>

			<artifactId>org.etsi.osl.centrallog.client</artifactId>

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

			<version>${org.etsi.osl.centrallog.client.version}</version>

		</dependency>

		</dependency>





		<!-- swagger -->

		<!-- swagger -->