Produced by Araxis Merge on 5/10/2018 8:40:51 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\VAR v4.2.7\var-resources-4.2.7@54bdc2933ef.zip | base.gradle | Thu Apr 19 17:52:30 2018 UTC |
2 | MHED_APPS_CIF.zip\VAR v4.2.7\var-resources-4.2.7@54bdc2933ef.zip | base.gradle | Thu May 3 13:06:21 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 7 | 254 |
Changed | 6 | 12 |
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 H EAD | git branch -a --contains | grep re motes | se d s/.*remo tes.origin .// | head -1 |tr -d '\\n'" | |
9 | st andardOutp ut = stdou t | |
10 | } | |
11 | return stdout.to String().t rim() | |
12 | } | |
13 | ||
14 | def getGit BranchLoca l = { -> | |
15 | def st dout = new ByteArray OutputStre am() | |
16 | exec { | |
17 | co mmandLine "bash", "- c", "git r ev-parse H EAD | git branch -a --contains | tr -d ' \\n'" | |
18 | st andardOutp ut = stdou t | |
19 | } | |
20 | return stdout.to String().t rim() | |
21 | } | |
22 | ||
23 | ||
24 | allproject s { | |
25 | apply plugin: 'j ava' | |
26 | source Compatibil ity = 1.8 | |
27 | target Compatibil ity = 1.8 | |
28 | ||
29 | ext { | |
30 | lo ngRunningT ime = 1000 ; | |
31 | ti mestamp = new Date() ; | |
32 | ||
33 | // resolve br anch name based on m atching co mmit hash to remote | |
34 | co mmitBranch = getGitB ranch() | |
35 | if (commitBra nch == "") { //this can happen when loca l head is ahead of r emote bran ch head, s o attempt to build b ased on lo cal branch name (usu ally on de v machine) | |
36 | commitBr anch = get GitBranchL ocal() | |
37 | } | |
38 | co mmitRevisi on = runCm d "git rev -parse --s hort HEAD" | |
39 | co mmitCount = runCmd " git rev-li st HEAD -- count" | |
40 | ||
41 | if (project.e xt.propert ies.buildM ode == nul l){ | |
42 | def patt ern = ~/Re lease-[0-9 ]+\.[0-9]+ \.[0-9]+-B ranch/ | |
43 | def isRe leaseBranc h = patter n.matcher( commitBran ch).matche s() | |
44 | ||
45 | if(isRel easeBranch ){ | |
46 | buil dMode = "R ELEASE" | |
47 | prin tln "branc h " + comm itBranch + " detecte d, perform ing releas e build" | |
48 | } | |
49 | else{ | |
50 | buil dMode = "S NAPSHOT" | |
51 | prin tln "branc h " + comm itBranch + " detecte d, perform ing snapsh ot build" | |
52 | } | |
53 | } | |
54 | ||
55 | if (buildMod e == "RELE ASE") { | |
56 | 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 | |
57 | modi fierString = "+${bui ldNumber}. ${commitRe vision}" | |
58 | } | |
59 | else{ // use commit Count only if no bui ld number is provide d | |
60 | modi fierString = "-${com mitCount}" | |
61 | } | |
62 | } else { | |
63 | modifier String = " -SNAPSHOT" | |
64 | } | |
65 | } | |
66 | ||
67 | versio n = "${bas eVersion}$ {modifierS tring}" | |
68 | ||
69 | config urations.a ll { | |
70 | re solutionSt rategy.cac heDynamicV ersionsFor 1, 'minut es' | |
71 | } | |
72 | ||
73 | config urations.a ll { | |
74 | re solutionSt rategy.cac heChanging ModulesFor 1, 'minut es' | |
75 | } | |
76 | } | |
77 | ||
78 | task wrapp er(type: W rapper) { | |
79 | gradle Version = '2.8' | |
80 | } | |
81 | ||
82 | subproject s { | |
83 | apply plugin: 'j ava' | |
84 | apply plugin: 'i dea' | |
85 | apply plugin: 'e clipse' | |
86 | ||
87 | reposi tories { | |
88 | ma ven { | |
89 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/central/ " | |
90 | credenti als { | |
91 | user name "${ne xusUser}" | |
92 | pass word "${ne xusPass}" | |
93 | } | |
94 | } | |
95 | ma ven { | |
96 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/jasperso ft/" | |
97 | credenti als { | |
98 | user name "${ne xusUser}" | |
99 | pass word "${ne xusPass}" | |
100 | } | |
101 | } | |
102 | ma ven { | |
103 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-r eleases/" | |
104 | credenti als { | |
105 | user name "${ne xusUser}" | |
106 | pass word "${ne xusPass}" | |
107 | } | |
108 | } | |
109 | ma ven { | |
110 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-s napshots/" | |
111 | credenti als { | |
112 | user name "${ne xusUser}" | |
113 | pass word "${ne xusPass}" | |
114 | } | |
115 | } | |
116 | ma ven { | |
117 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/ckm-rele ases/" | |
118 | credenti als { | |
119 | user name "${ne xusUser}" | |
120 | pass word "${ne xusPass}" | |
121 | } | |
122 | } | |
123 | ma ven { | |
124 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/thirdpar ty/" | |
125 | credenti als { | |
126 | user name "${ne xusUser}" | |
127 | pass word "${ne xusPass}" | |
128 | } | |
129 | } | |
130 | ||
131 | ma ven { url { 'http:// maven.spri ngframewor k.org/snap shot/' } } | |
132 | } | |
133 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.