Browse Source

Try to fix stable builds: They also carry the nbmVersion as opposed to our design to enable comparison by netbeans

MeFisto94 9 years ago
parent
commit
43aeb32bfc
2 changed files with 2 additions and 1 deletions
  1. 1 0
      .travis.yml
  2. 1 1
      version.gradle

+ 1 - 0
.travis.yml

@@ -42,6 +42,7 @@ install:
 
 
 before_deploy:
 before_deploy:
   # In case of STABLE (see hudson-stable target)
   # In case of STABLE (see hudson-stable target)
+  # the above gradlew already sets the correct ant properties to build
   - ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version suite.nbms build-installers unset-spec-version | awk '{printf("."); fflush(stdout)}'
   - ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version suite.nbms build-installers unset-spec-version | awk '{printf("."); fflush(stdout)}'
   
   
   # Has to be done before deploy (due to the rm command)
   # Has to be done before deploy (due to the rm command)

+ 1 - 1
version.gradle

@@ -143,7 +143,7 @@ task configureVersionInfo {
         if (releaseInfo != null) {
         if (releaseInfo != null) {
             jmeFullVersion = "${releaseInfo.baseVersion}${releaseInfo.releaseSuffix}"
             jmeFullVersion = "${releaseInfo.baseVersion}${releaseInfo.releaseSuffix}"
             jmePomVersion = "${releaseInfo.mainVersion}${releaseInfo.releaseSuffix}"
             jmePomVersion = "${releaseInfo.mainVersion}${releaseInfo.releaseSuffix}"
-            jmeNbmRevision = "0"
+            jmeNbmRevision = jmeRevision
             jmeNbmUcSuffix = "stable/${releaseInfo.baseVersion}/plugins"
             jmeNbmUcSuffix = "stable/${releaseInfo.baseVersion}/plugins"
         } else {
         } else {
             // SNAPSHOT
             // SNAPSHOT