Update project structure

Fix groupId, version and docker tag.

Issue-ID: INT-1517
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Change-Id: I6a20e816fb53c2b50e58ca5680dd886cea8fc6b2

diff --git a/.gitignore b/.gitignore
index 8d81d9f..3ec4b09 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 **/*.iml
 **/.idea
 **/target
+deployment/pnf-pnp-simulators-resources.zip

diff --git a/deployment/pom.xml b/deployment/pom.xml
index 25fe08b..af84a18 100644 (file)
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.simulator</groupId>
+        <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
         <artifactId>simulator-parent</artifactId>
-        <version>5.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>onboarding-package</artifactId>
     <build>

diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml
index 23b7592..1d8bb58 100644 (file)
--- a/netconfsimulator/pom.xml
+++ b/netconfsimulator/pom.xml
@@ -25,13 +25,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.onap.simulator</groupId>
+    <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
     <artifactId>simulator-parent</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>netconfsimulator</artifactId>
-  <version>5.0.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -288,7 +288,7 @@
                                         <contextDir>${project.basedir}</contextDir>
                                         <dockerFile>${project.basedir}/Dockerfile_app</dockerFile>
                                         <tags>
-                                            <tag>${project.version}-${maven.build.timestamp}Z</tag>
+                                            <tag>${project.version}-STAGE-${maven.build.timestamp}Z</tag>
                                         </tags>
                                     </build>
                                 </image>

diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml
index af797de..29ca352 100644 (file)
--- a/pnfsimulator/pom.xml
+++ b/pnfsimulator/pom.xml
@@ -25,13 +25,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.simulator</groupId>
+        <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
         <artifactId>simulator-parent</artifactId>
-        <version>5.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pnfsimulator</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <name>pnfsimulator</name>
 
@@ -389,7 +389,7 @@
                                     <build>
                                         <dockerFileDir>${project.basedir}</dockerFileDir>
                                         <tags>
-                                            <tag>${project.version}-${maven.build.timestamp}Z</tag>
+                                            <tag>${project.version}-STAGE-${maven.build.timestamp}Z</tag>
                                         </tags>
                                     </build>
                                 </image>

diff --git a/pom.xml b/pom.xml
index 00eda50..fa18b56 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -31,9 +31,9 @@
         <version>2.0.0</version>
     </parent>
 
-    <groupId>org.onap.simulator</groupId>
+    <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
     <artifactId>simulator-parent</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <modules>
         <module>pnfsimulator</module>
            <module>netconfsimulator</module>

diff --git a/version.properties b/version.properties
new file mode 100644 (file)
index 0000000..2ddebb3
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,6 @@
+major=1
+minor=0
+patch=0
+base_version=${major}.${minor}.${patch}
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT