Produced by Araxis Merge on 7/6/2017 8:22:50 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\ISAAC-developer-docs\resources | settings.xml | Wed May 31 03:55:50 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\ISAAC-developer-docs\resources | settings.xml | Mon Jul 3 21:28:37 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 360 |
| 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 | |
| 2 | version="1 .0" | |
| 3 | encoding=" UTF-8" | |
| 4 | ?> | |
| 5 | <settings | |
| 6 | xmlns="htt p://maven. apache.org /SETTINGS/ 1.0.0" | |
| 7 | ||
| 8 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 9 | ||
| 10 | xsi:schema Location=" http://mav en.apache. org/SETTIN GS/1.0.0 h ttp://mave n.apache.o rg/xsd/set tings-1.0. 0.xsd" | |
| 11 | > | |
| 12 | ||
| 13 | <mirrors> | |
| 14 | ||
| 15 | <mirror> | |
| 16 | ||
| 17 | <!--This s ends every thing else to /publi c --> | |
| 18 | ||
| 19 | <id> | |
| 20 | vadev | |
| 21 | </id> | |
| 22 | ||
| 23 | <mirrorOf> | |
| 24 | * | |
| 25 | </mirrorOf > | |
| 26 | ||
| 27 | <url> | |
| 28 | https://DN S :PORT | |
| 29 | </url> | |
| 30 | ||
| 31 | </mirror> | |
| 32 | ||
| 33 | </mirrors> | |
| 34 | ||
| 35 | ||
| 36 | <servers> | |
| 37 | ||
| 38 | <server> | |
| 39 | ||
| 40 | <id> | |
| 41 | vadev | |
| 42 | </id> | |
| 43 | ||
| 44 | <username> | |
| 45 | ***USERNAM E*** | |
| 46 | </username > | |
| 47 | ||
| 48 | <password> | |
| 49 | ***PASSWOR D*** | |
| 50 | </password > | |
| 51 | ||
| 52 | <!-- Preve nt infinit e hangs wh en the ser ver is dow n --> | |
| 53 | ||
| 54 | <configura tion> | |
| 55 | ||
| 56 | <httpConfi guration> | |
| 57 | ||
| 58 | <all> | |
| 59 | ||
| 60 | <connectio nTimeout> | |
| 61 | 3000 | |
| 62 | </connecti onTimeout> | |
| 63 | ||
| 64 | </all> | |
| 65 | ||
| 66 | </httpConf iguration> | |
| 67 | ||
| 68 | </configur ation> | |
| 69 | ||
| 70 | </server> | |
| 71 | ||
| 72 | </servers> | |
| 73 | ||
| 74 | ||
| 75 | <profiles> | |
| 76 | ||
| 77 | <profile> | |
| 78 | ||
| 79 | <id> | |
| 80 | vadev | |
| 81 | </id> | |
| 82 | ||
| 83 | <!--Enable snapshots for the b uilt in ce ntral repo to direct --> | |
| 84 | ||
| 85 | <!--all re quests to nexus via the mirror --> | |
| 86 | ||
| 87 | <repositor ies> | |
| 88 | ||
| 89 | <repositor y> | |
| 90 | ||
| 91 | <id> | |
| 92 | central | |
| 93 | </id> | |
| 94 | ||
| 95 | <url> | |
| 96 | http://cen tral | |
| 97 | </url> | |
| 98 | ||
| 99 | <releases> | |
| 100 | ||
| 101 | <enabled> | |
| 102 | true | |
| 103 | </enabled> | |
| 104 | ||
| 105 | <updatePol icy> | |
| 106 | never | |
| 107 | </updatePo licy> | |
| 108 | ||
| 109 | </releases > | |
| 110 | ||
| 111 | <snapshots > | |
| 112 | ||
| 113 | <enabled> | |
| 114 | true | |
| 115 | </enabled> | |
| 116 | ||
| 117 | <updatePol icy> | |
| 118 | daily | |
| 119 | </updatePo licy> | |
| 120 | ||
| 121 | </snapshot s> | |
| 122 | ||
| 123 | </reposito ry> | |
| 124 | ||
| 125 | </reposito ries> | |
| 126 | ||
| 127 | <pluginRep ositories> | |
| 128 | ||
| 129 | <pluginRep ository> | |
| 130 | ||
| 131 | <id> | |
| 132 | central | |
| 133 | </id> | |
| 134 | ||
| 135 | <url> | |
| 136 | http://cen tral | |
| 137 | </url> | |
| 138 | ||
| 139 | <releases> | |
| 140 | ||
| 141 | <enabled> | |
| 142 | true | |
| 143 | </enabled> | |
| 144 | ||
| 145 | <updatePol icy> | |
| 146 | never | |
| 147 | </updatePo licy> | |
| 148 | ||
| 149 | </releases > | |
| 150 | ||
| 151 | <snapshots > | |
| 152 | ||
| 153 | <enabled> | |
| 154 | true | |
| 155 | </enabled> | |
| 156 | ||
| 157 | <updatePol icy> | |
| 158 | daily | |
| 159 | </updatePo licy> | |
| 160 | ||
| 161 | </snapshot s> | |
| 162 | ||
| 163 | </pluginRe pository> | |
| 164 | ||
| 165 | </pluginRe positories > | |
| 166 | ||
| 167 | </profile> | |
| 168 | ||
| 169 | </profiles > | |
| 170 | ||
| 171 | ||
| 172 | <activePro files> | |
| 173 | ||
| 174 | <!--make t he profile active al l the time --> | |
| 175 | ||
| 176 | <activePro file> | |
| 177 | vadev | |
| 178 | </activePr ofile> | |
| 179 | ||
| 180 | </activePr ofiles> | |
| 181 | </settings > |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.