Skip to content

Commit 440e493

Browse files
authored
Merge pull request #82 from atlassian/HEIMDALL-12404-incorrect-version-information-in-jsm-opsview-plugin-for-opsview-on-debian-based-systems
Fix release scripts causing "unspecified" version on deb packages for…
2 parents 342f2b8 + 075f9f8 commit 440e493

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

release/integration-builder/oem/oem.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ def buildDebForOEM(String sourceDir, String name, String descrpt, Map fileMappin
8585
def controlDir = "${project.buildDir}/debian_tmp/${sourceDir}/control"
8686

8787
def controlTarget = "${project.buildDir}/deb/control"
88-
def debVersion = version.toString().replace("-", ".")
8988

9089
//CONTROL
9190
copy {
@@ -98,7 +97,7 @@ def buildDebForOEM(String sourceDir, String name, String descrpt, Map fileMappin
9897
from "${project.projectDir}/oem/native/control_deb"
9998
filter {
10099
it.replace('[description]', "'jsm client files'")
101-
.replace('[version]', debVersion)
100+
.replace('[version]', packageVersion)
102101
.replace('[package-name]', "jsm-oem")
103102
}
104103
into controlDir

release/integration-builder/opsview/opsview.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,12 @@ def buildDebForOpsviewV6(String sourceDir, String name, String descrpt, Map file
6868
def controlDir = "${project.buildDir}/debian_tmp/${sourceDir}/control"
6969

7070
def controlTarget = "${project.buildDir}/deb/control"
71-
def debVersion = version.toString().replace("-", ".")
7271

7372
copy {
7473
from "${project.projectDir}/opsview/native/control_deb"
7574
filter {
7675
it.replace('[description]', "'Jsm client files'")
77-
.replace('[version]', debVersion)
76+
.replace('[version]', packageVersion)
7877
.replace('[package-name]', "jsm-opsview")
7978
}
8079
into controlDir

0 commit comments

Comments
 (0)