diff options
author | Bogumil Zebek <bogumil.zebek@nokia.com> | 2020-04-10 07:26:27 +0200 |
---|---|---|
committer | Zebek Bogumil <bogumil.zebek@nokia.com> | 2020-04-10 07:27:33 +0200 |
commit | f6690490a30513c629db3f61378073786d8267dc (patch) | |
tree | 3ec54ccba208b0730b5bdeb2b1bf8a7e76370a0e | |
parent | c41bc9ec829ac6c597614912af79fdd0111e9840 (diff) |
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
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | deployment/pom.xml | 4 | ||||
-rw-r--r-- | netconfsimulator/pom.xml | 8 | ||||
-rw-r--r-- | pnfsimulator/pom.xml | 8 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | version.properties | 6 |
6 files changed, 19 insertions, 12 deletions
@@ -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 --- 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 --- 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 --- 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> @@ -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 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 |