Produced by Araxis Merge on 5/10/2018 8:40:53 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-resources-2.1.2@a4dc9287108.zip | base.gradle | Fri Mar 9 16:50:49 2018 UTC |
2 | MHED_APPS_CIF.zip\VATS v2.1.2\var-utility-resources-2.1.2@a4dc9287108.zip | base.gradle | Thu May 3 13:11:03 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 6 | 238 |
Changed | 5 | 10 |
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 | apply plugin: 'j ava' | |
16 | source Compatibil ity = 1.7 | |
17 | target Compatibil ity = 1.7 | |
18 | ||
19 | ext { | |
20 | lo ngRunningT ime = 1000 ; | |
21 | ti mestamp = new Date() ; | |
22 | ||
23 | co mmitBranch = getGitB ranch() | |
24 | if (commitBra nch == "" || commitB ranch == " HEAD") { | |
25 | //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 | |
26 | // so at tempt to b uild based on build parameter | |
27 | commitBr anch = Sys tem.proper ties["bran ch"] | |
28 | } | |
29 | co mmitRevisi on = runCm d "git rev -parse --s hort HEAD" | |
30 | co mmitCount = runCmd " git rev-li st HEAD -- count" | |
31 | ||
32 | if (project.e xt.propert ies.buildM ode == nul l){ | |
33 | def patt ern = ~/[R r]elease\/ [0-9]+\.[0 -9]+/ | |
34 | def isRe leaseBranc h = patter n.matcher( commitBran ch).matche s() | |
35 | ||
36 | if(isRel easeBranch ){ | |
37 | buil dMode = "R ELEASE" | |
38 | prin tln "branc h " + comm itBranch + " detecte d, perform ing releas e build" | |
39 | } | |
40 | else{ | |
41 | buil dMode = "S NAPSHOT" | |
42 | prin tln "branc h " + comm itBranch + " detecte d, perform ing snapsh ot build" | |
43 | } | |
44 | } | |
45 | ||
46 | if (buildMod e == "RELE ASE") { | |
47 | 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 | |
48 | modi fierString = "+${bui ldNumber}. ${commitRe vision}" | |
49 | } | |
50 | else{ // use commit Count only if no bui ld number is provide d | |
51 | modi fierString = "-${com mitCount}" | |
52 | } | |
53 | publishR epo = "${b aseRepo}-r eleases" | |
54 | } else { | |
55 | modifier String = " -SNAPSHOT" | |
56 | publishR epo = "${b aseRepo}-s napshots" | |
57 | } | |
58 | } | |
59 | ||
60 | versio n = "${bas eVersion}$ {modifierS tring}" | |
61 | ||
62 | config urations.a ll { | |
63 | re solutionSt rategy.cac heDynamicV ersionsFor 1, 'minut es' | |
64 | } | |
65 | ||
66 | config urations.a ll { | |
67 | re solutionSt rategy.cac heChanging ModulesFor 1, 'minut es' | |
68 | } | |
69 | } | |
70 | ||
71 | task wrapp er(type: W rapper) { | |
72 | gradle Version = '2.8' | |
73 | } | |
74 | ||
75 | subproject s { | |
76 | apply plugin: 'j ava' | |
77 | apply plugin: 'i dea' | |
78 | apply plugin: 'e clipse' | |
79 | apply plugin: 'm aven-publi sh' | |
80 | ||
81 | reposi tories { | |
82 | ma ven { | |
83 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/central/ " | |
84 | credenti als { | |
85 | user name "${ne xusUser}" | |
86 | pass word "${ne xusPass}" | |
87 | } | |
88 | } | |
89 | ma ven { | |
90 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/jasperso ft/" | |
91 | credenti als { | |
92 | user name "${ne xusUser}" | |
93 | pass word "${ne xusPass}" | |
94 | } | |
95 | } | |
96 | ma ven { | |
97 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-r eleases/" | |
98 | credenti als { | |
99 | user name "${ne xusUser}" | |
100 | pass word "${ne xusPass}" | |
101 | } | |
102 | } | |
103 | ma ven { | |
104 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/agilex-s napshots/" | |
105 | credenti als { | |
106 | user name "${ne xusUser}" | |
107 | pass word "${ne xusPass}" | |
108 | } | |
109 | } | |
110 | ma ven { url { 'http:// maven.spri ngframewor k.org/snap shot/' } } | |
111 | } | |
112 | ||
113 | publis hing { | |
114 | re positories { | |
115 | maven { | |
116 | url "https ://nexus.m obilehealt h. DNS /content/r epositorie s/${publis hRepo}" | |
117 | cred entials { | |
118 | username " ${nexusUse r}" | |
119 | password " ${nexusPas s}" | |
120 | } | |
121 | } | |
122 | } | |
123 | } | |
124 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.