Produced by Araxis Merge on 5/8/2017 10:03:47 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | var-utility-web-Release-1.0.0-Branch.zip\var-utility-web-Release-1.0.0-Branch\gradle-builds | base-ui.gradle | Wed Jan 25 20:20:12 2017 UTC |
| 2 | var-utility-web-Release-1.0.0-Branch.zip\var-utility-web-Release-1.0.0-Branch\gradle-builds | base-ui.gradle | Mon May 8 13:55:12 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 5 | 276 |
| Changed | 4 | 8 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | String run Cmd(String cmd) { | |
| 2 | re turn cmd.e xecute().t ext.trim() | |
| 3 | } | |
| 4 | ||
| 5 | def getGit Branch = { -> | |
| 6 | de f stdout = new ByteA rrayOutput Stream() | |
| 7 | ex ec { | |
| 8 | comm andLine "b ash", "-c" , "git rev -parse HEA D | git br anch -a -- contains | grep remo tes | sed s/.*remote s.origin./ / | head - 1" | |
| 9 | stan dardOutput = stdout | |
| 10 | } | |
| 11 | re turn stdou t.toString ().trim() | |
| 12 | } | |
| 13 | ||
| 14 | def getGit Hash = { - > | |
| 15 | de f stdout = new ByteA rrayOutput Stream() | |
| 16 | ex ec { | |
| 17 | comm andLine 'g it', 'rev- parse', 'H EAD' | |
| 18 | stan dardOutput = stdout | |
| 19 | } | |
| 20 | re turn stdou t.toString ().trim() | |
| 21 | } | |
| 22 | ||
| 23 | def getGit BranchLoca l = { -> | |
| 24 | de f stdout = new ByteA rrayOutput Stream() | |
| 25 | ex ec { | |
| 26 | comm andLine "b ash", "-c" , "git rev -parse HEA D | git br anch -a -- contains" | |
| 27 | stan dardOutput = stdout | |
| 28 | } | |
| 29 | re turn stdou t.toString ().trim() | |
| 30 | } | |
| 31 | ||
| 32 | allproject s { | |
| 33 | ext { | |
| 34 | long RunningTim e = 1000; | |
| 35 | time stamp = ne w Date(); | |
| 36 | gitH ash = getG itHash().s ubstring(0 , 7); | |
| 37 | ||
| 38 | if(p roject.ext .propertie s.targetBr anch == nu ll) { | |
| 39 | //if n o branch s pecified, resolve br anch name based on m atching co mmit hash to remote | |
| 40 | commit Branch = g etGitBranc h() | |
| 41 | if (co mmitBranch == "") { | |
| 42 | //this c an happen when local head is a head of re mote branc h head, so attempt t o build ba sed on loc al branch name (usua lly on dev machine) | |
| 43 | commitBr anch = get GitBranchL ocal() | |
| 44 | } | |
| 45 | } | |
| 46 | else { //otherw ise attemp t to build based on parameter | |
| 47 | printl n "branch parameter found, for cing a bui ld on bran ch " + tar getBranch | |
| 48 | commit Branch = t argetBranc h | |
| 49 | } | |
| 50 | comm itRevision = runCmd "git rev-p arse --sho rt HEAD" | |
| 51 | comm itCount = runCmd "gi t rev-list HEAD --co unt" | |
| 52 | ||
| 53 | if(p roject.ext .propertie s.buildMod e == null) { | |
| 54 | def pa ttern = ~/ Release-[0 -9]+\.[0-9 ]+\.[0-9]+ -Branch/ | |
| 55 | def is ReleaseBra nch = patt ern.matche r(commitBr anch).matc hes() | |
| 56 | ||
| 57 | if(isR eleaseBran ch){ | |
| 58 | buildMod e = "RELEA SE" | |
| 59 | } | |
| 60 | else{ | |
| 61 | buildMod e = "SNAPS HOT" | |
| 62 | } | |
| 63 | printl n "autodet ect build mode: bran ch " + com mitBranch + " detect ed, perfor ming " + b uildMode + " build" | |
| 64 | } | |
| 65 | else { | |
| 66 | printl n "build m ode parame ter found, forcing a build on " + buildM ode | |
| 67 | } | |
| 68 | ||
| 69 | if ( buildMode == "RELEAS E") { | |
| 70 | if (pr oject.ext. properties .buildNumb er != null ){ //CI bu ild should pass this in, or it can be us ed as an o ptional pa rameter | |
| 71 | modifier String = " +${buildNu mber}.${co mmitRevisi on}" | |
| 72 | } | |
| 73 | else{ //use comm itCount on ly if no b uild numbe r is provi ded | |
| 74 | modifier String = " -${commitC ount}" | |
| 75 | } | |
| 76 | publis hRepo = "$ {baseRepo} -releases" | |
| 77 | } el se { | |
| 78 | modifi erString = "-SNAPSHO T" | |
| 79 | publis hRepo = "$ {baseRepo} -snapshots " | |
| 80 | } | |
| 81 | } | |
| 82 | ||
| 83 | versio n = "${bas eVersion}$ {modifierS tring}" | |
| 84 | ||
| 85 | apply plugin: 'm aven-publi sh' | |
| 86 | ||
| 87 | reposi tories { | |
| 88 | /* This repo sitory mir rors maven Central. * / | |
| 89 | ma ven { | |
| 90 | url "https :// DNS .
|
|
| 91 | credenti als { | |
| 92 | user name "${ne xusUser}" | |
| 93 | pass word "${ne xusPass}" | |
| 94 | } | |
| 95 | } | |
| 96 | /* Any requi red releas e reposito ries */ | |
| 97 | ma ven { | |
| 98 | url "https :// DNS .
|
|
| 99 | credenti als { | |
| 100 | user name "${ne xusUser}" | |
| 101 | pass word "${ne xusPass}" | |
| 102 | } | |
| 103 | } | |
| 104 | /* Any requi red snapsh ot reposit ories */ | |
| 105 | ma ven { | |
| 106 | url "https :// DNS .
|
|
| 107 | credenti als { | |
| 108 | user name "${ne xusUser}" | |
| 109 | pass word "${ne xusPass}" | |
| 110 | } | |
| 111 | } | |
| 112 | } | |
| 113 | ||
| 114 | publis hing { | |
| 115 | re positories { | |
| 116 | maven { | |
| 117 | url "https :// DNS .
|
|
| 118 | cred entials { | |
| 119 | username " ${nexusUse r}" | |
| 120 | password " ${nexusPas s}" | |
| 121 | } | |
| 122 | } | |
| 123 | } | |
| 124 | } | |
| 125 | } | |
| 126 | ||
| 127 | task wrapp er(type: W rapper) { | |
| 128 | gradle Version = '2.8' | |
| 129 | } | |
| 130 | ||
| 131 | def getFor mattedDate () { | |
| 132 | de f date = n ew Date() | |
| 133 | re turn date. format('EE E MMM dd y yyy hh:mm: ss') | |
| 134 | ||
| 135 | } | |
| 136 | ||
| 137 | task creat eVersionJs on() << { | |
| 138 | de f versionC ontent = " {\"version \":\"${bas eVersion}\ ",\"BuildI d\":\"${mo difierStri ng}\",\"Ch ecksum\":\ "${gitHash }\",\"date \":\"${get FormattedD ate()}\"}" | |
| 139 | de f messagin gJson = ne w File('.. /app/versi on.json') | |
| 140 | me ssagingJso n.newWrite r() | |
| 141 | me ssagingJso n << versi onContent | |
| 142 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.