diff --git a/gradle.properties b/gradle.properties index 218a7fabe..2a548c3d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,9 +23,6 @@ bulletUrl = https://storage.googleapis.com/google-code-archive-downloads/v2/code bulletFolder = bullet-2.82-r2704 bulletZipFile = bullet.zip -# Path for downloading NetBeans Base -netbeansUrl = http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-javase.zip - # POM settings POM_NAME=jMonkeyEngine POM_DESCRIPTION=jMonkeyEngine is a 3D game engine for adventurous Java developers diff --git a/version.gradle b/version.gradle index cd5b6b454..fd6970f8b 100644 --- a/version.gradle +++ b/version.gradle @@ -1,7 +1,7 @@ /* Version Info Examples ===================== - + Nightly Build Snapshot * git tag: * Full Version: 3.1-5124 @@ -22,14 +22,14 @@ * POM Version: 3.1.0-alpha1 * NBM Revision: 0 * NBM UC Suffix: stable/3.1/plugins - + Final Release * git tag: v3.1.0 * Full Version: 3.1 * POM Version: 3.1.0 * NBM Revision: 0 * NBM UC Suffix: stable/3.1/plugins - */ + */ import java.text.SimpleDateFormat import org.ajoberstar.grgit.* @@ -45,7 +45,6 @@ buildscript { ext { jmeRevision = 0 - jmeNbmRevision = 0 jmeGitHash = "" jmeGitTag = "" jmeShortGitHash = "" @@ -53,7 +52,6 @@ ext { jmeBranchName = "unknown" jmeFullVersion = "${jmeVersion}-UNKNOWN" jmePomVersion = "unknown" - jmeNbmUcSuffix = "unknown" } def getReleaseInfo(String tag) { @@ -122,7 +120,7 @@ task configureVersionInfo { jmeShortGitHash = head.abbreviatedId jmeBranchName = grgit.branch.current.name jmeGitTag = grgit.tag.list().find { it.commit == head } - + if (jmeGitTag != null) { jmeGitTag = jmeGitTag.name } else { @@ -133,8 +131,6 @@ task configureVersionInfo { if (releaseInfo != null) { jmeFullVersion = "${releaseInfo.baseVersion}${releaseInfo.releaseSuffix}" jmePomVersion = "${releaseInfo.mainVersion}${releaseInfo.releaseSuffix}" - jmeNbmRevision = "0" - jmeNbmUcSuffix = "stable/${releaseInfo.baseVersion}/plugins" } else { // SNAPSHOT jmeFullVersion = jmeMainVersion @@ -142,27 +138,20 @@ task configureVersionInfo { if (System.env.TRAVIS_BRANCH != null) { jmeBranchName = System.env.TRAVIS_BRANCH } - if (System.env.TRAVIS_PULL_REQUEST != null && + if (System.env.TRAVIS_PULL_REQUEST != null && System.env.TRAVIS_PULL_REQUEST != "false") { jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST } if (jmeBranchName != "v3.1") { jmeFullVersion += "-${jmeBranchName}" jmePomVersion += "-${jmeBranchName}" - jmeNbmUcSuffix = "${jmeBranchName}-" - } else { - jmeNbmUcSuffix = "" } - jmeNbmUcSuffix += "nightly/" + jmeMainVersion + "/plugins" jmeFullVersion += "-${jmeRevision}" jmePomVersion += "-SNAPSHOT" - jmeNbmRevision = jmeRevision } - + logger.warn("Full Version: ${jmeFullVersion}") logger.warn("POM Version: ${jmePomVersion}") - logger.warn("NBM Revision: ${jmeNbmRevision}") - logger.warn("NBM UC Suffix: ${jmeNbmUcSuffix}") } catch (ex) { // Failed to get repo info logger.warn("Failed to get repository info: " + ex.message + ". " + \