From f5877dcb3470eb2648210758490c7f4ce8c7c610 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Mon, 22 Jan 2024 12:01:01 +0000
Subject: [PATCH] version per osl component from parent
---
Dockerfile | 4 ++--
pom.xml | 17 ++++++++---------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 614f44a..16cb6ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,6 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
MAINTAINER openslice.io
RUN mkdir /opt/shareclasses
RUN mkdir -p /opt/openslice/lib/
-COPY target/org.etsi.osl.portal.api-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
-CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.2.0-SNAPSHOT.jar"]
+COPY target/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0-SNAPSHOT.jar"]
EXPOSE 13000
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dd0a262..3bee248 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,16 +2,15 @@
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">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.etsi.osl</groupId>
<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>
- <artifactId>org.etsi.osl.portal.api</artifactId>
+ <artifactId>org.etsi.osl.portal.api</artifactId>
<name>org.etsi.osl.portal.api</name>
<url>http://maven.apache.org</url>
@@ -224,23 +223,23 @@
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model.nfv</artifactId>
- <version>${project.version}</version>
+ <version>${org.etsi.osl.model.nfv.version}</version>
</dependency>
<dependency>
- <groupId>org.etsi.osl.sol005nbi</groupId>
+ <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.sol005nbi.osm</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${org.etsi.osl.sol005nbi.osm.version}</version>
</dependency>
<dependency>
- <groupId>org.etsi.osl.sol005nbi</groupId>
+ <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.sol005nbi.osm10</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${org.etsi.osl.sol005nbi.osm10.version}</version>
</dependency>
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.centrallog.client</artifactId>
- <version>${project.version}</version>
+ <version>${org.etsi.osl.centrallog.client.version}</version>
</dependency>
--
GitLab