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