diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-05-01 14:26:23 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-05-01 14:26:23 -0400 |
| commit | 6b1320519eb99e3d929a6780163a0ebbaeea14ed (patch) | |
| tree | ff5ee8c606bd5a7e0c75ca608550d9f14f064373 | |
| parent | 273c1c6817247bd3e87f865e3d80f548d84138ff (diff) | |
Fix versions1.5.1
Versions were set inconsistently in sdnc/apps - entire repo needs
to have the same version number.
Change-Id: I69cf0dd73cfaf2762f5fce7d0e9ff43fffd14709
Issue-ID: CCSDK-1222
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
| -rw-r--r-- | client/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | pomba/network-discovery-api/pom.xml | 54 | ||||
| -rw-r--r-- | pomba/network-discovery/pom.xml | 2 | ||||
| -rw-r--r-- | pomba/pom.xml | 2 | ||||
| -rw-r--r-- | pomba/service-decomposition/pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 11 |
7 files changed, 38 insertions, 37 deletions
diff --git a/client/pom.xml b/client/pom.xml index 996e046..592f5d9 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ <packaging>jar</packaging> <groupId>org.onap.sdnc.apps</groupId> <artifactId>client</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> <url>http://wiki.onap.org</url> @@ -6,7 +6,7 @@ <packaging>pom</packaging> <groupId>org.onap.sdnc</groupId> <artifactId>apps</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <parent> <groupId>org.onap.ccsdk.parent</groupId> diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml index d3db665..6a8ea24 100644 --- a/pomba/network-discovery-api/pom.xml +++ b/pomba/network-discovery-api/pom.xml @@ -28,7 +28,7 @@ limitations under the License. <groupId>org.onap.sdnc.apps.pomba</groupId> <artifactId>network-discovery-api</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <name>Network Discovery API</name> <dependencies> @@ -49,31 +49,31 @@ limitations under the License. <version>2.9.6</version> <scope>test</scope> </dependency> - </dependencies> - <profiles> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </dependencies> + <profiles> + <profile> + <id>nexus-staging</id> + <activation> + <property> + <name>!altDeploymentRepository</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>https://nexus.onap.org</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml index 2b5a2fc..a5d831c 100644 --- a/pomba/network-discovery/pom.xml +++ b/pomba/network-discovery/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <parent> <groupId>org.onap.sdnc.apps.pomba</groupId> <artifactId>pomba</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/pomba/pom.xml b/pomba/pom.xml index 23e9d8c..8b82df1 100644 --- a/pomba/pom.xml +++ b/pomba/pom.xml @@ -28,7 +28,7 @@ limitations under the License. <groupId>org.onap.sdnc.apps.pomba</groupId> <artifactId>pomba</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml index 131d639..1159451 100644 --- a/pomba/service-decomposition/pom.xml +++ b/pomba/service-decomposition/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <parent> <groupId>org.onap.sdnc.apps.pomba</groupId> <artifactId>pomba</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/version.properties b/version.properties index eff345c..423a329 100644 --- a/version.properties +++ b/version.properties @@ -1,13 +1,14 @@ +########################################################### # Versioning variables # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=1 -minor=4 -patch=1 +release_name=1 +sprint_number=5 +feature_revision=1 -base_version=${major}.${minor}.${patch} +base_version=${release_name}.${sprint_number}.${feature_revision} -# Release must be completed with git revision # in Jenkins release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT + |