Produced by Araxis Merge on 5/10/2018 8:40:56 AM Central 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 | MHED_APPS_CIF.zip\VATS v2.1.2\var-utility-web-2.1.2@c27506c69b7.zip\gradle-builds | base-ui.gradle | Fri Mar 9 16:50:58 2018 UTC |
2 | MHED_APPS_CIF.zip\VATS v2.1.2\var-utility-web-2.1.2@c27506c69b7.zip\gradle-builds | base-ui.gradle | Thu May 3 13:33:33 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 5 | 246 |
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 --a bbrev-ref HEAD" | |
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 | allproject s { | |
24 | ext { | |
25 | long RunningTim e = 1000; | |
26 | time stamp = ne w Date(); | |
27 | gitH ash = getG itHash().s ubstring(0 , 7); | |
28 | ||
29 | comm itBranch = getGitBra nch() | |
30 | if(c ommitBranc h == "" || commitBra nch == "HE AD") { | |
31 | //this can happe n when loc al head is ahead of remote bra nch head o r if in Je nkins, HEA D is detac hed | |
32 | // so attempt to build bas ed on buil d paramete r | |
33 | commit Branch = S ystem.prop erties["br anch"] | |
34 | } | |
35 | comm itRevision = runCmd "git rev-p arse --sho rt HEAD" | |
36 | comm itCount = runCmd "gi t rev-list HEAD --co unt" | |
37 | ||
38 | if(p roject.ext .propertie s.buildMod e == null) { | |
39 | def pa ttern = ~/ [Rr]elease \/[0-9]+\. [0-9]+/ | |
40 | def is ReleaseBra nch = patt ern.matche r(commitBr anch).matc hes() | |
41 | ||
42 | if(isR eleaseBran ch){ | |
43 | buildMod e = "RELEA SE" | |
44 | } | |
45 | else{ | |
46 | buildMod e = "SNAPS HOT" | |
47 | } | |
48 | printl n "autodet ect build mode: bran ch " + com mitBranch + " detect ed, perfor ming " + b uildMode + " build" | |
49 | } | |
50 | else { | |
51 | printl n "build m ode parame ter found, forcing a build on " + buildM ode | |
52 | } | |
53 | ||
54 | if ( buildMode == "RELEAS E") { | |
55 | 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 | |
56 | modifier String = " +${buildNu mber}.${co mmitRevisi on}" | |
57 | } | |
58 | else{ //use comm itCount on ly if no b uild numbe r is provi ded | |
59 | modifier String = " -${commitC ount}" | |
60 | } | |
61 | publis hRepo = "$ {baseRepo} -releases" | |
62 | } el se { | |
63 | modifi erString = "-SNAPSHO T" | |
64 | publis hRepo = "$ {baseRepo} -snapshots " | |
65 | } | |
66 | } | |
67 | ||
68 | versio n = "${bas eVersion}$ {modifierS tring}" | |
69 | ||
70 | apply plugin: 'm aven-publi sh' | |
71 | ||
72 | reposi tories { | |
73 | /* This repo sitory mir rors maven Central. * / | |
74 | ma ven { | |
75 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/central/ " | |
76 | credenti als { | |
77 | user name "${ne xusUser}" | |
78 | pass word "${ne xusPass}" | |
79 | } | |
80 | } | |
81 | /* Any requi red releas e reposito ries */ | |
82 | ma ven { | |
83 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-r eleases/" | |
84 | credenti als { | |
85 | user name "${ne xusUser}" | |
86 | pass word "${ne xusPass}" | |
87 | } | |
88 | } | |
89 | /* Any requi red snapsh ot reposit ories */ | |
90 | ma ven { | |
91 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-s napshots/" | |
92 | credenti als { | |
93 | user name "${ne xusUser}" | |
94 | pass word "${ne xusPass}" | |
95 | } | |
96 | } | |
97 | } | |
98 | ||
99 | publis hing { | |
100 | re positories { | |
101 | maven { | |
102 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/${publis hRepo}" | |
103 | cred entials { | |
104 | username " ${nexusUse r}" | |
105 | password " ${nexusPas s}" | |
106 | } | |
107 | } | |
108 | } | |
109 | } | |
110 | } | |
111 | ||
112 | task wrapp er(type: W rapper) { | |
113 | gradle Version = '2.8' | |
114 | } | |
115 | ||
116 | def getFor mattedDate () { | |
117 | de f date = n ew Date() | |
118 | re turn date. format('EE E MMM dd y yyy hh:mm: ss') | |
119 | ||
120 | } | |
121 | ||
122 | task creat eVersionJs on() << { | |
123 | de f versionC ontent = " {\"version \":\"${bas eVersion}\ ",\"BuildI d\":\"${mo difierStri ng}\",\"Ch ecksum\":\ "${gitHash }\",\"date \":\"${get FormattedD ate()}\"}" | |
124 | de f messagin gJson = ne w File('.. /app/versi on.json') | |
125 | me ssagingJso n.newWrite r() | |
126 | me ssagingJso n << versi onContent | |
127 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.