Produced by Araxis Merge on 3/13/2019 2:49:45 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 | C:\AraxisMergeCompare\Pri_un\DSM\Direct Implementation\java | pom.xml | Tue Mar 12 21:52:16 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\DSM-scrubbed\Direct Implementation\java | pom.xml | Wed Mar 13 18:05:44 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 724 |
| Changed | 2 | 4 |
| 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 | <project | |
| 6 | xmlns="htt p://maven. apache.org /POM/4.0.0 " | |
| 7 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 8 | xsi:schema Location=" http://mav en.apache. org/POM/4. 0.0 http:/ /maven.apa che.org/ma ven-v4_0_0 .xsd " | |
| 9 | > | |
| 10 | ||
| 11 | <groupId> | |
| 12 | org.nhind | |
| 13 | </groupId> | |
| 14 | ||
| 15 | <modelVers ion> | |
| 16 | 4.0.0 | |
| 17 | </modelVer sion> | |
| 18 | ||
| 19 | <artifactI d> | |
| 20 | parent | |
| 21 | </artifact Id> | |
| 22 | ||
| 23 | <packaging > | |
| 24 | pom | |
| 25 | </packagin g> | |
| 26 | ||
| 27 | <version> | |
| 28 | 1.1-SNAPSH OT | |
| 29 | </version> | |
| 30 | ||
| 31 | <name> | |
| 32 | NHIN Direc t referenc e implemen tation com ponents | |
| 33 | </name> | |
| 34 | ||
| 35 | <descripti on> | |
| 36 | NHIN Direc t parent p roject for java refe rence impl ementation component s. | |
| 37 | </descript ion> | |
| 38 | ||
| 39 | <!--<scm> | |
| 40 | <url >https://n hin-d.goog lecode.com /hg/java</ url> | |
| 41 | <con nection>sc m:hg:https ://nhin-d. googlecode .com/hg/nh in-d/java< /connectio n> | |
| 42 | </ scm>--> | |
| 43 | ||
| 44 | <licenses> | |
| 45 | ||
| 46 | <license> | |
| 47 | ||
| 48 | <name> | |
| 49 | New BSD Li cense | |
| 50 | </name> | |
| 51 | ||
| 52 | <url> | |
| 53 | http://nhi ndirect.or g/BSDLicen se | |
| 54 | </url> | |
| 55 | ||
| 56 | </license> | |
| 57 | ||
| 58 | </licenses > | |
| 59 | ||
| 60 | <issueMana gement> | |
| 61 | ||
| 62 | <system> | |
| 63 | Google Cod e | |
| 64 | </system> | |
| 65 | ||
| 66 | <url> | |
| 67 | http://cod e.google.c om/p/nhin- d/issues/l ist | |
| 68 | </url> | |
| 69 | ||
| 70 | </issueMan agement> | |
| 71 | ||
| 72 | <modules> | |
| 73 | ||
| 74 | <module> | |
| 75 | ./direct-u tils | |
| 76 | </module> | |
| 77 | ||
| 78 | <module> | |
| 79 | ./direct-c ommon | |
| 80 | </module> | |
| 81 | ||
| 82 | <module> | |
| 83 | ./direct-j ce-provide rs | |
| 84 | </module> | |
| 85 | ||
| 86 | <module> | |
| 87 | ./direct-c ommon-audi t | |
| 88 | </module> | |
| 89 | ||
| 90 | <module> | |
| 91 | ./direct-p olicy | |
| 92 | </module> | |
| 93 | ||
| 94 | <module> | |
| 95 | ./config | |
| 96 | </module> | |
| 97 | ||
| 98 | <module> | |
| 99 | ./dsm-conf ig | |
| 100 | </module> | |
| 101 | ||
| 102 | <module> | |
| 103 | ./agent | |
| 104 | </module> | |
| 105 | ||
| 106 | <module> | |
| 107 | ./gateway | |
| 108 | </module> | |
| 109 | ||
| 110 | <module> | |
| 111 | ./dsm | |
| 112 | </module> | |
| 113 | ||
| 114 | <module> | |
| 115 | ./xd-commo n | |
| 116 | </module> | |
| 117 | ||
| 118 | <module> | |
| 119 | ./xdmail | |
| 120 | </module> | |
| 121 | ||
| 122 | <module> | |
| 123 | ./xd | |
| 124 | </module> | |
| 125 | ||
| 126 | <module> | |
| 127 | ./dns | |
| 128 | </module> | |
| 129 | ||
| 130 | <module> | |
| 131 | ./direct-m sg-monitor | |
| 132 | </module> | |
| 133 | ||
| 134 | <module> | |
| 135 | ./direct-m sg-monitor -web | |
| 136 | </module> | |
| 137 | ||
| 138 | </modules> | |
| 139 | ||
| 140 | <developer s> | |
| 141 | ||
| 142 | <developer > | |
| 143 | ||
| 144 | <name> | |
| 145 | Greg Meyer | |
| 146 | </name> | |
| 147 | ||
| 148 | <id> | |
| 149 | GM2552 | |
| 150 | </id> | |
| 151 | ||
| 152 | <email> | |
| 153 | gm2552@cer ner.com | |
| 154 | </email> | |
| 155 | ||
| 156 | <roles> | |
| 157 | ||
| 158 | <role> | |
| 159 | owner | |
| 160 | </role> | |
| 161 | ||
| 162 | </roles> | |
| 163 | ||
| 164 | </develope r> | |
| 165 | ||
| 166 | </develope rs> | |
| 167 | ||
| 168 | <prerequis ites> | |
| 169 | ||
| 170 | <maven> | |
| 171 | 2.0.4 | |
| 172 | </maven> | |
| 173 | ||
| 174 | </prerequi sites> | |
| 175 | ||
| 176 | <build> | |
| 177 | ||
| 178 | <pluginMan agement> | |
| 179 | ||
| 180 | <plugins> | |
| 181 | ||
| 182 | <plugin> | |
| 183 | ||
| 184 | <groupId> | |
| 185 | org.apache .maven.plu gins | |
| 186 | </groupId> | |
| 187 | ||
| 188 | <artifactI d> | |
| 189 | maven-rele ase-plugin | |
| 190 | </artifact Id> | |
| 191 | ||
| 192 | <version> | |
| 193 | 2.0 | |
| 194 | </version> | |
| 195 | ||
| 196 | <configura tion> | |
| 197 | ||
| 198 | <tagBase> | |
| 199 | scm:hg:htt ps://nhin- d.googleco de.com/hg/ nhin-d/jav a/tags | |
| 200 | </tagBase> | |
| 201 | ||
| 202 | </configur ation> | |
| 203 | ||
| 204 | <!-- See h ttps://jir a.codehaus .org/brows e/WAGON-39 3 --> | |
| 205 | ||
| 206 | <dependenc ies> | |
| 207 | ||
| 208 | <dependenc y> | |
| 209 | ||
| 210 | <groupId> | |
| 211 | org.apache .maven.wag on | |
| 212 | </groupId> | |
| 213 | ||
| 214 | <artifactI d> | |
| 215 | wagon-ssh | |
| 216 | </artifact Id> | |
| 217 | ||
| 218 | <version> | |
| 219 | 2.5 | |
| 220 | </version> | |
| 221 | ||
| 222 | </dependen cy> | |
| 223 | ||
| 224 | </dependen cies> | |
| 225 | ||
| 226 | </plugin> | |
| 227 | <plugin> | |
| 228 | <groupId> | |
| 229 | org.apache .maven.plu gins | |
| 230 | </groupId> | |
| 231 | <artifactI d> | |
| 232 | maven-depl oy-plugin | |
| 233 | </artifact Id> | |
| 234 | <version> | |
| 235 | 2.5 | |
| 236 | </version> | |
| 237 | </plugin> | |
| 238 | ||
| 239 | </plugins> | |
| 240 | ||
| 241 | </pluginMa nagement> | |
| 242 | ||
| 243 | </build> | |
| 244 | ||
| 245 | <propertie s> | |
| 246 | ||
| 247 | <project.b uild.sourc eEncoding> | |
| 248 | UTF-8 | |
| 249 | </project. build.sour ceEncoding > | |
| 250 | ||
| 251 | <maven.com piler.sour ce> | |
| 252 | 1.8 | |
| 253 | </maven.co mpiler.sou rce> | |
| 254 | ||
| 255 | <maven.com piler.targ et> | |
| 256 | 1.8 | |
| 257 | </maven.co mpiler.tar get> | |
| 258 | ||
| 259 | <!-- <m aster.base dir>${proj ect.basedi r}</master .basedir> | |
| 260 | <l ibdir>${ma ster.based ir}\lib</l ibdir> --> | |
| 261 | ||
| 262 | <skipTests > | |
| 263 | true | |
| 264 | </skipTest s> | |
| 265 | ||
| 266 | <maven.tes t.skip> | |
| 267 | true | |
| 268 | </maven.te st.skip> | |
| 269 | ||
| 270 | </properti es> | |
| 271 | ||
| 272 | <!--<distr ibutionMan agement> | |
| 273 | <s napshotRep ository> | |
| 274 | <id>sona type-snaps hot</id> | |
| 275 | <name>So natype OSS Maven SNA PSHOT Repo sitory</na me> | |
| 276 | <url>htt ps://oss.s onatype.or g/content/ repositori es/snapsho ts/</url> | |
| 277 | <uniqueV ersion>fal se</unique Version> | |
| 278 | < /snapshotR epository> | |
| 279 | < repository > | |
| 280 | <id>sona type-relea se</id> | |
| 281 | <name>So natype OSS Maven Rel ease Repos itor</name > | |
| 282 | <url>htt ps://oss.s onatype.or g/service/ local/stag ing/deploy /maven2/</ url> | |
| 283 | <uniqueV ersion>fal se</unique Version> | |
| 284 | < /repositor y> | |
| 285 | ||
| 286 | </ distributi onManageme nt> --> | |
| 287 | <distribut ionManagem ent> | |
| 288 | ||
| 289 | <snapshotR epository> | |
| 290 | ||
| 291 | <id> | |
| 292 | nexus | |
| 293 | </id> | |
| 294 | ||
| 295 | <name> | |
| 296 | DSM | |
| 297 | </name> | |
| 298 | ||
| 299 | <url> | |
| 300 | https://ne xus.vetsez .net/repos itory/mave n-snapshot s | |
| 301 | </url> | |
| 302 | ||
| 303 | </snapshot Repository > | |
| 304 | ||
| 305 | <repositor y> | |
| 306 | ||
| 307 | <id> | |
| 308 | nexus | |
| 309 | </id> | |
| 310 | ||
| 311 | <name> | |
| 312 | DSM | |
| 313 | </name> | |
| 314 | ||
| 315 | <url> | |
| 316 | https://ne xus.vetsez .net/repos itory/mave n-releases | |
| 317 | </url> | |
| 318 | ||
| 319 | </reposito ry> | |
| 320 | ||
| 321 | ||
| 322 | </distribu tionManage ment> | |
| 323 | ||
| 324 | <!-- <rep ositories> | |
| 325 | <r epository> | |
| 326 | <id>lib< /id> | |
| 327 | <name>Lo cal Maven Repository </name> | |
| 328 | <url>http: // SERVER . DOMAIN . EXT : PORT /nexus/con tent/group s/public/< /url> | |
| 329 | <url>fil e://${libd ir}</url> | |
| 330 | <snapsho ts> | |
| 331 | <ena bled>true< /enabled> | |
| 332 | </snapsh ots> | |
| 333 | <release s> | |
| 334 | <ena bled>true< /enabled> | |
| 335 | </releas es> | |
| 336 | </ repository > | |
| 337 | </repo sitories> --> | |
| 338 | ||
| 339 | <!-- <plu ginReposit ories> | |
| 340 | <p luginRepos itory> | |
| 341 | <id>lib< /id> | |
| 342 | <name>Lo cal Maven Repository </name> | |
| 343 | <<url>http :// SERVER . DOMAIN . EXT : PORT /nexus/con tent/group s/public/< /url> | |
| 344 | <url>fi le://${lib dir}</url> | |
| 345 | <snapsho ts> | |
| 346 | <ena bled>true< /enabled> | |
| 347 | </snapsh ots> | |
| 348 | <release s> | |
| 349 | <ena bled>true< /enabled> | |
| 350 | </releas es> | |
| 351 | </ pluginRepo sitory> | |
| 352 | </plug inReposito ries> --> | |
| 353 | <scm> | |
| 354 | ||
| 355 | ||
| 356 | <connectio n> | |
| 357 | scm:git:ht tps://bitb ucket.vets ez.net/scm /dsm/direc t-implemen tation.git | |
| 358 | </connecti on> | |
| 359 | <developer Connection > | |
| 360 | scm:git:ht tps://bitb ucket.vets ez.net/scm /dsm/direc t-implemen tation.git | |
| 361 | </develope rConnectio n> | |
| 362 | ||
| 363 | </scm> | |
| 364 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.