Produced by Araxis Merge on 5/10/2018 8:40:02 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\SM v2.2.5\scheduling-manager-web-2.2.5@30ba13bb3af.zip | base-ui.gradle | Sat Apr 7 11:28:42 2018 UTC |
2 | MHED_APPS_CIF.zip\SM v2.2.5\scheduling-manager-web-2.2.5@30ba13bb3af.zip | base-ui.gradle | Thu May 3 13:00:23 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 5 | 194 |
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 | return cmd.execu te().text. trim() | |
3 | } | |
4 | ||
5 | def getGit Branch = { -> | |
6 | def st dout = new ByteArray OutputStre am() | |
7 | exec { | |
8 | co mmandLine "bash", "- c", "git r ev-parse - -abbrev-re f HEAD" | |
9 | st andardOutp ut = stdou t | |
10 | } | |
11 | return stdout.to String().t rim() | |
12 | } | |
13 | ||
14 | allproject s { | |
15 | ext { | |
16 | lo ngRunningT ime = 1000 ; | |
17 | ti mestamp = new Date() ; | |
18 | ||
19 | // resolve br anch name based on m atching co mmit hash to remote | |
20 | co mmitBranch = getGitB ranch() | |
21 | if (commitBra nch == "" || commitB ranch == " HEAD") { | |
22 | //this c an happen when local head is a head of re mote branc h head or if in Jenk ins, HEAD is detache d | |
23 | // so at tempt to b uild based on build parameter | |
24 | commitBr anch = Sys tem.proper ties["bran ch"] | |
25 | } | |
26 | co mmitRevisi on = runCm d "git rev -parse --s hort HEAD" | |
27 | co mmitCount = runCmd " git rev-li st HEAD -- count" | |
28 | ||
29 | if (project.e xt.propert ies.buildM ode == nul l){ | |
30 | def patt ern = ~/[R r]elease\/ [0-9]+\.[0 -9]+/ | |
31 | def isRe leaseBranc h = patter n.matcher( commitBran ch).matche s() | |
32 | ||
33 | if(isRel easeBranch ){ | |
34 | buil dMode = "R ELEASE" | |
35 | } | |
36 | else{ | |
37 | buil dMode = "S NAPSHOT" | |
38 | } | |
39 | println "autodetec t build mo de: branch " + commi tBranch + " detected , performi ng " + bui ldMode + " build" | |
40 | } | |
41 | el se{ | |
42 | println "build mod e paramete r found, f orcing a b uild on " + buildMod e | |
43 | } | |
44 | ||
45 | if (buildMod e == "RELE ASE") { | |
46 | if (proj ect.ext.pr operties.b uildNumber != null){ //CI buil d should p ass this i n, or it c an be used as an opt ional para meter | |
47 | modi fierString = "+${bui ldNumber}. ${commitRe vision}" | |
48 | } | |
49 | else{ // use commit Count only if no bui ld number is provide d | |
50 | modi fierString = "-${com mitCount}" | |
51 | } | |
52 | publishR epo = "${b aseRepo}-r eleases" | |
53 | } else { | |
54 | modifier String = " -SNAPSHOT" | |
55 | publishR epo = "${b aseRepo}-s napshots" | |
56 | } | |
57 | } | |
58 | ||
59 | versio n = "${bas eVersion}$ {modifierS tring}" | |
60 | ||
61 | apply plugin: 'm aven-publi sh' | |
62 | ||
63 | reposi tories { | |
64 | /* This repo sitory mir rors maven Central. * / | |
65 | ma ven { | |
66 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/central/ " | |
67 | credenti als { | |
68 | user name "${ne xusUser}" | |
69 | pass word "${ne xusPass}" | |
70 | } | |
71 | } | |
72 | /* Any requi red releas e reposito ries */ | |
73 | ma ven { | |
74 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-r eleases/" | |
75 | credenti als { | |
76 | user name "${ne xusUser}" | |
77 | pass word "${ne xusPass}" | |
78 | } | |
79 | } | |
80 | /* Any requi red snapsh ot reposit ories */ | |
81 | ma ven { | |
82 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-s napshots/" | |
83 | credenti als { | |
84 | user name "${ne xusUser}" | |
85 | pass word "${ne xusPass}" | |
86 | } | |
87 | } | |
88 | } | |
89 | ||
90 | publis hing { | |
91 | re positories { | |
92 | maven { | |
93 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/${publis hRepo}" | |
94 | cred entials { | |
95 | username " ${nexusUse r}" | |
96 | password " ${nexusPas s}" | |
97 | } | |
98 | } | |
99 | } | |
100 | } | |
101 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.