Skip to content
Snippets Groups Projects
Commit 16ae74fb authored by trantzas's avatar 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
No related branches found
No related tags found
2 merge requests!36Merging 2024Q2_RC into main, creating 2024Q2 Release,!6version per osl component from parent
Pipeline #4181 failed
...@@ -5,7 +5,8 @@ ...@@ -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 @@ ...@@ -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 -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment