141. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 5/8/2017 10:03:28 PM Eastern 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.

141.1 Files compared

#	Location	File	Last Modified
1	var-utility-web-Release-1.0.0-Branch.zip\var-utility-resources-Release-1.0.0-Branch	base.gradle	Wed Nov 30 02:21:40 2016 UTC
2	var-utility-web-Release-1.0.0-Branch.zip\var-utility-resources-Release-1.0.0-Branch	base.gradle	Tue May 9 01:37:26 2017 UTC

141.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	11	228
Changed	10	30
Inserted	0	0
Removed	0	0

141.3 Comparison options

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

141.4 Active regular expressions

No regular expressions were active.

141.5 Comparison detail

	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"
	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 "
	18	st andardOutp ut = stdou t
	19	}
	20	return stdout.to String().t rim()
	21	}
	22
	23
	24	allproject s {
	25	ext {
	26	lo ngRunningT ime = 1000 ;
	27	ti mestamp = new Date() ;
	28
	29	// resolve br anch name based on m atching co mmit hash to remote
	30	co mmitBranch = getGitB ranch()
	31	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)
	32	commitBr anch = get GitBranchL ocal()
	33	}
	34	co mmitRevisi on = runCm d "git rev -parse --s hort HEAD"
	35	co mmitCount = runCmd " git rev-li st HEAD -- count"
	36
	37	if (project.e xt.propert ies.buildM ode == nul l){
	38	def patt ern = ~/Re lease-[0-9 ]+\.[0-9]+ \.[0-9]+-B ranch/
	39	def isRe leaseBranc h = patter n.matcher( commitBran ch).matche s()
	40
	41	if(isRel easeBranch ){
	42	buil dMode = "R ELEASE"
	43	prin tln "branc h " + comm itBranch + " detecte d, perform ing releas e build"
	44	}
	45	else{
	46	buil dMode = "S NAPSHOT"
	47	prin tln "branc h " + comm itBranch + " detecte d, perform ing snapsh ot build"
	48	}
	49	}
	50
	51	if (buildMod e == "RELE ASE") {
	52	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
	53	modi fierString = "+${bui ldNumber}. ${commitRe vision}"
	54	}
	55	else{ // use commit Count only if no bui ld number is provide d
	56	modi fierString = "-${com mitCount}"
	57	}
	58	publishR epo = "${b aseRepo}-r eleases"
	59	} else {
	60	modifier String = " -SNAPSHOT"
	61	publishR epo = "${b aseRepo}-s napshots"
	62	}
	63	}
	64
	65	versio n = "${bas eVersion}$ {modifierS tring}"
	66
	67	config urations.a ll {
	68	re solutionSt rategy.cac heDynamicV ersionsFor 1, 'minut es'
	69	}
	70
	71	config urations.a ll {
	72	re solutionSt rategy.cac heChanging ModulesFor 1, 'minut es'
	73	}
	74	}
	75
	76	task wrapp er(type: W rapper) {
	77	gradle Version = '2.8'
	78	}
	79
	80	subproject s {
	81	apply plugin: 'j ava'
	82	apply plugin: 'i dea'
	83	apply plugin: 'e clipse'
	84	apply plugin: 'm aven-publi sh'
	85
	86	reposi tories {
	87	ma ven {
	88	url "https :// DNS . DNS /content/r epositorie s/central/ "
	89	credenti als {
	90	username " ${ DNS }"
	91	password " ${ DNS }"
	92	}
	93	}
	94	ma ven {
	95	url "https :// DNS . DNS /content/r epositorie s/jasperso ft/"
	96	credenti als {
	97	username " ${ DNS }"
	98	password " ${ DNS }"
	99	}
	100	}
	101	ma ven {
	102	url "https :// DNS . DNS /content/r epositorie s/agilex-r eleases/"
	103	credenti als {
	104	username " ${ DNS }"
	105	password " ${ DNS }"
	106	}
	107	}
	108	ma ven {
	109	url "https :// DNS . DNS /content/r epositorie s/agilex-s napshots/"
	110	credenti als {
	111	username " ${ DNS }"
	112	password " ${ DNS }"
	113	}
	114	}
	115	ma ven { url { 'http:// maven.spri ngframewor k.org/snap shot/' } }
	116	}
	117
	118	publis hing {
	119	re positories {
	120	maven {
	121	url "https :// DNS . DNS /content/r epositorie s/${publis hRepo}"
	122	cred entials {
	123	username " ${ DNS }"
	124	password " ${ DNS }"
	125	}
	126	}
	127	}
	128	}
	129	}