Produced by Araxis Merge on 7/6/2017 8:23:27 PM 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 | OSCIF_CTT_v4_build 1.zip\rails_prisme\config\service | jenkins_job_config.xml.erb | Wed May 31 03:59:08 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\rails_prisme\config\service | jenkins_job_config.xml.erb | Mon Jul 3 23:24:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 218 |
| Changed | 1 | 2 |
| 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 | <?xml vers ion='1.0' encoding=' UTF-8'?> | |
| 2 | <maven2-mo duleset pl ugin="mave n-plugin@2 .12.1"> | |
| 3 | <actions /> | |
| 4 | <descrip tion></des cription> | |
| 5 | <keepDep endencies> false</kee pDependenc ies> | |
| 6 | <propert ies> | |
| 7 | <jenki ns.model.B uildDiscar derPropert y> | |
| 8 | <str ategy clas s="hudson. tasks.LogR otator"> | |
| 9 | <d aysToKeep> -1</daysTo Keep> | |
| 10 | <n umToKeep>2 </numToKee p> | |
| 11 | <a rtifactDay sToKeep>-1 </artifact DaysToKeep > | |
| 12 | <a rtifactNum ToKeep>-1< /artifactN umToKeep> | |
| 13 | </st rategy> | |
| 14 | </jenk ins.model. BuildDisca rderProper ty> | |
| 15 | <org.j enkinsci.p lugins.mav enrepoclea ner.MavenR epoCleaner Property p lugin="mav en-repo-cl eaner@1.2" > | |
| 16 | <not OnThisProj ect>false< /notOnThis Project> | |
| 17 | </org. jenkinsci. plugins.ma venrepocle aner.Maven RepoCleane rProperty> | |
| 18 | <% if developmen t %> | |
| 19 | <jen kins.plugi ns.slack.S lackNotifi er_-SlackJ obProperty plugin="s lack@1.8.1 "> | |
| 20 | <t eamDomain> </teamDoma in> | |
| 21 | <t oken></tok en> | |
| 22 | <r oom></room > | |
| 23 | <s tartNotifi cation>fal se</startN otificatio n> | |
| 24 | <n otifySucce ss>true</n otifySucce ss> | |
| 25 | <n otifyAbort ed>false</ notifyAbor ted> | |
| 26 | <n otifyNotBu ilt>false< /notifyNot Built> | |
| 27 | <n otifyUnsta ble>false< /notifyUns table> | |
| 28 | <n otifyFailu re>true</n otifyFailu re> | |
| 29 | <n otifyBackT oNormal>fa lse</notif yBackToNor mal> | |
| 30 | <n otifyRepea tedFailure >false</no tifyRepeat edFailure> | |
| 31 | <i ncludeTest Summary>fa lse</inclu deTestSumm ary> | |
| 32 | <s howCommitL ist>false< /showCommi tList> | |
| 33 | <i ncludeCust omMessage> false</inc ludeCustom Message> | |
| 34 | <c ustomMessa ge></custo mMessage> | |
| 35 | </je nkins.plug ins.slack. SlackNotif ier_-Slack JobPropert y> | |
| 36 | <% end %> | |
| 37 | </proper ties> | |
| 38 | <scm cla ss="hudson .plugins.g it.GitSCM" plugin="g it@2.4.2"> | |
| 39 | <confi gVersion>2 </configVe rsion> | |
| 40 | <userR emoteConfi gs> | |
| 41 | <hud son.plugin s.git.User RemoteConf ig> | |
| 42 | <u rl><%= git _content_u rl %></url > | |
| 43 | </hu dson.plugi ns.git.Use rRemoteCon fig> | |
| 44 | </user RemoteConf igs> | |
| 45 | <branc hes> | |
| 46 | <hud son.plugin s.git.Bran chSpec> | |
| 47 | <n ame><%= ta g_name %>< /name> | |
| 48 | </hu dson.plugi ns.git.Bra nchSpec> | |
| 49 | </bran ches> | |
| 50 | <doGen erateSubmo duleConfig urations>f alse</doGe nerateSubm oduleConfi gurations> | |
| 51 | <submo duleCfg cl ass="list" /> | |
| 52 | <exten sions/> | |
| 53 | </scm> | |
| 54 | <canRoam >true</can Roam> | |
| 55 | <disable d>false</d isabled> | |
| 56 | <blockBu ildWhenDow nstreamBui lding>fals e</blockBu ildWhenDow nstreamBui lding> | |
| 57 | <blockBu ildWhenUps treamBuild ing>false< /blockBuil dWhenUpstr eamBuildin g> | |
| 58 | <trigger s> | |
| 59 | <com.c loudbees.j enkins.Git HubPushTri gger plugi n="github@ 1.17.1"> | |
| 60 | <spe c></spec> | |
| 61 | </com. cloudbees. jenkins.Gi tHubPushTr igger> | |
| 62 | </trigge rs> | |
| 63 | <concurr entBuild>f alse</conc urrentBuil d> | |
| 64 | <!-- | |
| 65 | <rootMod ule> | |
| 66 | <group Id>gov.vha .isaac.ter minology.c onverted</ groupId> | |
| 67 | <artif actId><%#= artifact_ id %></art ifactId> | |
| 68 | </rootMo dule> | |
| 69 | <rootPOM ><%#= root _pom %></r ootPOM> | |
| 70 | --> | |
| 71 | <goals>- U -e -B cl ean deploy -DaltDepl oymentRepo sitory=nex us::defaul t::<%=nexu s_publicat ion_url%>< /goals> | |
| 72 | <aggrega torStyleBu ild>true</ aggregator StyleBuild > | |
| 73 | <increme ntalBuild> false</inc rementalBu ild> | |
| 74 | <ignoreU pstremChan ges>true</ ignoreUpst remChanges > | |
| 75 | <archivi ngDisabled >false</ar chivingDis abled> | |
| 76 | <siteArc hivingDisa bled>false </siteArch ivingDisab led> | |
| 77 | <fingerp rintingDis abled>fals e</fingerp rintingDis abled> | |
| 78 | <resolve Dependenci es>false</ resolveDep endencies> | |
| 79 | <process Plugins>fa lse</proce ssPlugins> | |
| 80 | <mavenVa lidationLe vel>-1</ma venValidat ionLevel> | |
| 81 | <runHead less>false </runHeadl ess> | |
| 82 | <disable TriggerDow nstreamPro jects>fals e</disable TriggerDow nstreamPro jects> | |
| 83 | <blockTr iggerWhenB uilding>tr ue</blockT riggerWhen Building> | |
| 84 | <!-- | |
| 85 | <setting s class="o rg.jenkins ci.plugins .configfil es.maven.j ob.MvnSett ingsProvid er" plugin ="config-f ile-provid er@2.10.0" > | |
| 86 | <setti ngsConfigI d>37ea891c -8e56-4e66 -b666-e183 599fce3a</ settingsCo nfigId> | |
| 87 | </settin gs> | |
| 88 | --> | |
| 89 | <globalS ettings cl ass="jenki ns.mvn.Def aultGlobal SettingsPr ovider"/> | |
| 90 | <reporte rs/> | |
| 91 | <publish ers> | |
| 92 | <% if developmen t %> | |
| 93 | <jen kins.plugi ns.slack.S lackNotifi er plugin= "slack@1.8 .1"> | |
| 94 | <t eamDomain> va-ctt</te amDomain> | |
| 95 | <a uthToken>x h2P0bvOWOV bAxmchWzsd Z42</authT oken><!-- todo erb t his line? --> | |
| 96 | <b uildServer Url>http:/ /URL.DNS:P ORT | |
| 97 | <r oom>#jenki ns</room> | |
| 98 | </je nkins.plug ins.slack. SlackNotif ier> | |
| 99 | <% end %> | |
| 100 | </publis hers> | |
| 101 | <buildWr appers/> | |
| 102 | <prebuil ders/> | |
| 103 | <postbui lders/> | |
| 104 | <runPost StepsIfRes ult> | |
| 105 | <name> FAILURE</n ame> | |
| 106 | <ordin al>2</ordi nal> | |
| 107 | <color >RED</colo r> | |
| 108 | <compl eteBuild>t rue</compl eteBuild> | |
| 109 | </runPos tStepsIfRe sult> | |
| 110 | </maven2-m oduleset> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.