Produced by Araxis Merge on 12/5/2017 12:06:45 PM Central Standard 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 | IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ImagingRoot | project.xml | Mon Dec 4 21:33:44 2017 UTC |
| 2 | IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ImagingRoot | project.xml | Mon Dec 4 22:03:25 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 5 | 1474 |
| Changed | 4 | 8 |
| 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 | ||
| 7 | <pomVersio n> | |
| 8 | 1 | |
| 9 | </pomVersi on> | |
| 10 | ||
| 11 | <groupId> | |
| 12 | Imaging | |
| 13 | </groupId> | |
| 14 | ||
| 15 | <name> | |
| 16 | ImagingRoo t | |
| 17 | </name> | |
| 18 | ||
| 19 | <artifactI d> | |
| 20 | ImagingRoo t | |
| 21 | </artifact Id> | |
| 22 | ||
| 23 | <currentVe rsion> | |
| 24 | 0.1 | |
| 25 | </currentV ersion> | |
| 26 | ||
| 27 | <organizat ion> | |
| 28 | ||
| 29 | <name> | |
| 30 | United Sta tes Vetera ns Health Administra tion | |
| 31 | </name> | |
| 32 | ||
| 33 | </organiza tion> | |
| 34 | ||
| 35 | <inception Year> | |
| 36 | 2006 | |
| 37 | </inceptio nYear> | |
| 38 | ||
| 39 | <package> | |
| 40 | gov.va.med .imaging | |
| 41 | </package> | |
| 42 | ||
| 43 | <shortDesc ription> | |
| 44 | Root proje ct for all the Excha nge builds | |
| 45 | </shortDes cription> | |
| 46 | ||
| 47 | ||
| 48 | <!-- devel opers have commit pr iveleges t o source c ontrol --> | |
| 49 | ||
| 50 | <developer s> | |
| 51 | ||
| 52 | <developer > | |
| 53 | ||
| 54 | <id> | |
| 55 | vhaiswbuck d | |
| 56 | </id> | |
| 57 | ||
| 58 | <name> | |
| 59 | Keith Buck | |
| 60 | </name> | |
| 61 | ||
| 62 | <email> | |
| 63 | PII | |
| 64 | </email> | |
| 65 | ||
| 66 | <organizat ion> | |
| 67 | VHA | |
| 68 | </organiza tion> | |
| 69 | ||
| 70 | </develope r> | |
| 71 | ||
| 72 | <developer > | |
| 73 | ||
| 74 | <id> | |
| 75 | vhaiswwerf ej | |
| 76 | </id> | |
| 77 | ||
| 78 | <name> | |
| 79 | Julian Wer fel | |
| 80 | </name> | |
| 81 | ||
| 82 | <email> | |
| 83 | PII | |
| 84 | </email> | |
| 85 | ||
| 86 | <organizat ion> | |
| 87 | VHA | |
| 88 | </organiza tion> | |
| 89 | ||
| 90 | </develope r> | |
| 91 | ||
| 92 | <developer > | |
| 93 | ||
| 94 | <id> | |
| 95 | vhaiswtitt oc | |
| 96 | </id> | |
| 97 | ||
| 98 | <name> | |
| 99 | Csaba Titt on | |
| 100 | </name> | |
| 101 | ||
| 102 | <email> | |
| 103 | PII | |
| 104 | </email> | |
| 105 | ||
| 106 | <organizat ion> | |
| 107 | VHA | |
| 108 | </organiza tion> | |
| 109 | ||
| 110 | </develope r> | |
| 111 | ||
| 112 | <developer > | |
| 113 | ||
| 114 | <id> | |
| 115 | vhaiswbeck ec | |
| 116 | </id> | |
| 117 | ||
| 118 | <name> | |
| 119 | Chris Beck ey | |
| 120 | </name> | |
| 121 | ||
| 122 | <email> | |
| 123 | PII | |
| 124 | </email> | |
| 125 | ||
| 126 | <organizat ion> | |
| 127 | VHA | |
| 128 | </organiza tion> | |
| 129 | ||
| 130 | </develope r> | |
| 131 | ||
| 132 | </develope rs> | |
| 133 | ||
| 134 | ||
| 135 | <!-- Add o nly what w e are usin g... --> | |
| 136 | ||
| 137 | <dependenc ies> | |
| 138 | ||
| 139 | <dependenc y> | |
| 140 | ||
| 141 | <groupId> | |
| 142 | springfram ework | |
| 143 | </groupId> | |
| 144 | ||
| 145 | <artifactI d> | |
| 146 | spring | |
| 147 | </artifact Id> | |
| 148 | ||
| 149 | <version> | |
| 150 | 1.2.9 | |
| 151 | </version> | |
| 152 | ||
| 153 | <type> | |
| 154 | jar | |
| 155 | </type> | |
| 156 | ||
| 157 | </dependen cy> | |
| 158 | ||
| 159 | <dependenc y> | |
| 160 | ||
| 161 | <groupId> | |
| 162 | junit | |
| 163 | </groupId> | |
| 164 | ||
| 165 | <artifactI d> | |
| 166 | junit | |
| 167 | </artifact Id> | |
| 168 | ||
| 169 | <version> | |
| 170 | 3.8.1 | |
| 171 | </version> | |
| 172 | ||
| 173 | <type> | |
| 174 | jar | |
| 175 | </type> | |
| 176 | ||
| 177 | </dependen cy> | |
| 178 | ||
| 179 | <dependenc y> | |
| 180 | ||
| 181 | <groupId> | |
| 182 | commons-lo gging | |
| 183 | </groupId> | |
| 184 | ||
| 185 | <artifactI d> | |
| 186 | commons-lo gging | |
| 187 | </artifact Id> | |
| 188 | ||
| 189 | <version> | |
| 190 | 1.1 | |
| 191 | </version> | |
| 192 | ||
| 193 | <type> | |
| 194 | jar | |
| 195 | </type> | |
| 196 | ||
| 197 | </dependen cy> | |
| 198 | ||
| 199 | ||
| 200 | <dependenc y> | |
| 201 | ||
| 202 | <groupId> | |
| 203 | org.apache .logging.l og4j | |
| 204 | </groupId> | |
| 205 | ||
| 206 | <artifactI d> | |
| 207 | log4j-api | |
| 208 | </artifact Id> | |
| 209 | ||
| 210 | <version> | |
| 211 | 2.9.0 | |
| 212 | </version> | |
| 213 | ||
| 214 | </dependen cy> | |
| 215 | ||
| 216 | <dependenc y> | |
| 217 | ||
| 218 | <groupId> | |
| 219 | org.apache .logging.l og4j | |
| 220 | </groupId> | |
| 221 | ||
| 222 | <artifactI d> | |
| 223 | log4j-core | |
| 224 | </artifact Id> | |
| 225 | ||
| 226 | <version> | |
| 227 | 2.9.0 | |
| 228 | </version> | |
| 229 | ||
| 230 | </dependen cy> | |
| 231 | ||
| 232 | ||
| 233 | <!-- Axis dependenci es --> | |
| 234 | ||
| 235 | <dependenc y> | |
| 236 | ||
| 237 | <groupId> | |
| 238 | javamail | |
| 239 | </groupId> | |
| 240 | ||
| 241 | <artifactI d> | |
| 242 | javamail | |
| 243 | </artifact Id> | |
| 244 | ||
| 245 | <version> | |
| 246 | 1.4 | |
| 247 | </version> | |
| 248 | ||
| 249 | <type> | |
| 250 | jar | |
| 251 | </type> | |
| 252 | ||
| 253 | </dependen cy> | |
| 254 | ||
| 255 | <dependenc y> | |
| 256 | ||
| 257 | <groupId> | |
| 258 | jaf | |
| 259 | </groupId> | |
| 260 | ||
| 261 | <artifactI d> | |
| 262 | activation | |
| 263 | </artifact Id> | |
| 264 | ||
| 265 | <version> | |
| 266 | 1.1 | |
| 267 | </version> | |
| 268 | ||
| 269 | <type> | |
| 270 | jar | |
| 271 | </type> | |
| 272 | ||
| 273 | </dependen cy> | |
| 274 | ||
| 275 | <dependenc y> | |
| 276 | ||
| 277 | <groupId> | |
| 278 | xml-securi ty | |
| 279 | </groupId> | |
| 280 | ||
| 281 | <artifactI d> | |
| 282 | xmlsec | |
| 283 | </artifact Id> | |
| 284 | ||
| 285 | <version> | |
| 286 | 1.3.0 | |
| 287 | </version> | |
| 288 | ||
| 289 | <type> | |
| 290 | jar | |
| 291 | </type> | |
| 292 | ||
| 293 | </dependen cy> | |
| 294 | ||
| 295 | <dependenc y> | |
| 296 | ||
| 297 | <groupId> | |
| 298 | wsdl4j | |
| 299 | </groupId> | |
| 300 | ||
| 301 | <artifactI d> | |
| 302 | wsdl4j | |
| 303 | </artifact Id> | |
| 304 | ||
| 305 | <version> | |
| 306 | 1.5.2 | |
| 307 | </version> | |
| 308 | ||
| 309 | <type> | |
| 310 | jar | |
| 311 | </type> | |
| 312 | ||
| 313 | </dependen cy> | |
| 314 | ||
| 315 | <dependenc y> | |
| 316 | ||
| 317 | <groupId> | |
| 318 | axis | |
| 319 | </groupId> | |
| 320 | ||
| 321 | <artifactI d> | |
| 322 | axis | |
| 323 | </artifact Id> | |
| 324 | ||
| 325 | <version> | |
| 326 | 1.4 | |
| 327 | </version> | |
| 328 | ||
| 329 | <type> | |
| 330 | jar | |
| 331 | </type> | |
| 332 | ||
| 333 | </dependen cy> | |
| 334 | ||
| 335 | <dependenc y> | |
| 336 | ||
| 337 | <groupId> | |
| 338 | axis-ant | |
| 339 | </groupId> | |
| 340 | ||
| 341 | <artifactI d> | |
| 342 | axis-ant | |
| 343 | </artifact Id> | |
| 344 | ||
| 345 | <version> | |
| 346 | 1.4 | |
| 347 | </version> | |
| 348 | ||
| 349 | <type> | |
| 350 | jar | |
| 351 | </type> | |
| 352 | ||
| 353 | </dependen cy> | |
| 354 | ||
| 355 | <dependenc y> | |
| 356 | ||
| 357 | <groupId> | |
| 358 | commons-di scovery | |
| 359 | </groupId> | |
| 360 | ||
| 361 | <artifactI d> | |
| 362 | commons-di scovery | |
| 363 | </artifact Id> | |
| 364 | ||
| 365 | <version> | |
| 366 | 0.2 | |
| 367 | </version> | |
| 368 | ||
| 369 | <type> | |
| 370 | jar | |
| 371 | </type> | |
| 372 | ||
| 373 | </dependen cy> | |
| 374 | ||
| 375 | <!-- This is a new f ile in the repositor y which ca me with Ax is 1.4. Ot her versio ns of jaxr pc that I located | |
| 376 | did not c ontain the same set of files - DKB --> | |
| 377 | ||
| 378 | <dependenc y> | |
| 379 | ||
| 380 | <groupId> | |
| 381 | jaxrpc | |
| 382 | </groupId> | |
| 383 | ||
| 384 | <artifactI d> | |
| 385 | jaxrpc | |
| 386 | </artifact Id> | |
| 387 | ||
| 388 | <version> | |
| 389 | 1.1 | |
| 390 | </version> | |
| 391 | ||
| 392 | <type> | |
| 393 | jar | |
| 394 | </type> | |
| 395 | ||
| 396 | </dependen cy> | |
| 397 | ||
| 398 | <dependenc y> | |
| 399 | ||
| 400 | <groupId> | |
| 401 | saaj | |
| 402 | </groupId> | |
| 403 | ||
| 404 | <artifactI d> | |
| 405 | saaj-api | |
| 406 | </artifact Id> | |
| 407 | ||
| 408 | <version> | |
| 409 | 1.2 | |
| 410 | </version> | |
| 411 | ||
| 412 | <type> | |
| 413 | jar | |
| 414 | </type> | |
| 415 | ||
| 416 | </dependen cy> | |
| 417 | ||
| 418 | <dependenc y> | |
| 419 | ||
| 420 | <groupId> | |
| 421 | aware | |
| 422 | </groupId> | |
| 423 | ||
| 424 | <artifactI d> | |
| 425 | aware-j2k | |
| 426 | </artifact Id> | |
| 427 | ||
| 428 | <version> | |
| 429 | 2.3 | |
| 430 | </version> | |
| 431 | ||
| 432 | <type> | |
| 433 | jar | |
| 434 | </type> | |
| 435 | ||
| 436 | </dependen cy> | |
| 437 | ||
| 438 | <dependenc y> | |
| 439 | ||
| 440 | <groupId> | |
| 441 | dcf | |
| 442 | </groupId> | |
| 443 | ||
| 444 | <artifactI d> | |
| 445 | LaurelBrid ge | |
| 446 | </artifact Id> | |
| 447 | ||
| 448 | <version> | |
| 449 | 3.3.22c | |
| 450 | </version> | |
| 451 | ||
| 452 | <type> | |
| 453 | jar | |
| 454 | </type> | |
| 455 | ||
| 456 | </dependen cy> | |
| 457 | ||
| 458 | <dependenc y> | |
| 459 | ||
| 460 | <groupId> | |
| 461 | aopallianc e | |
| 462 | </groupId> | |
| 463 | ||
| 464 | <artifactI d> | |
| 465 | aopallianc e | |
| 466 | </artifact Id> | |
| 467 | ||
| 468 | <version> | |
| 469 | 1.0 | |
| 470 | </version> | |
| 471 | ||
| 472 | <type> | |
| 473 | jar | |
| 474 | </type> | |
| 475 | ||
| 476 | </dependen cy> | |
| 477 | ||
| 478 | <!-- The J 2EE specif ication fo r JSP --> | |
| 479 | ||
| 480 | <dependenc y> | |
| 481 | ||
| 482 | <groupId> | |
| 483 | j2ee | |
| 484 | </groupId> | |
| 485 | ||
| 486 | <artifactI d> | |
| 487 | jsp-api | |
| 488 | </artifact Id> | |
| 489 | ||
| 490 | <version> | |
| 491 | 2.0 | |
| 492 | </version> | |
| 493 | ||
| 494 | <type> | |
| 495 | jar | |
| 496 | </type> | |
| 497 | ||
| 498 | <propertie s> | |
| 499 | ||
| 500 | <war.manif est.classp ath> | |
| 501 | true | |
| 502 | </war.mani fest.class path> | |
| 503 | ||
| 504 | <war.bundl e> | |
| 505 | false | |
| 506 | </war.bund le> | |
| 507 | ||
| 508 | </properti es> | |
| 509 | ||
| 510 | </dependen cy> | |
| 511 | ||
| 512 | <!-- The J 2EE specif ication fo r servlets --> | |
| 513 | ||
| 514 | <dependenc y> | |
| 515 | ||
| 516 | <groupId> | |
| 517 | j2ee | |
| 518 | </groupId> | |
| 519 | ||
| 520 | <artifactI d> | |
| 521 | servlet-ap i | |
| 522 | </artifact Id> | |
| 523 | ||
| 524 | <version> | |
| 525 | 2.4 | |
| 526 | </version> | |
| 527 | ||
| 528 | <type> | |
| 529 | jar | |
| 530 | </type> | |
| 531 | ||
| 532 | <propertie s> | |
| 533 | ||
| 534 | <war.manif est.classp ath> | |
| 535 | true | |
| 536 | </war.mani fest.class path> | |
| 537 | ||
| 538 | <war.bundl e> | |
| 539 | false | |
| 540 | </war.bund le> | |
| 541 | ||
| 542 | </properti es> | |
| 543 | ||
| 544 | </dependen cy> | |
| 545 | ||
| 546 | <!-- | |
| 547 | je.j ar is the Oracle Ber keleyDB, i nitially u sed for lo g files on ly | |
| 548 | --> | |
| 549 | ||
| 550 | <dependenc y> | |
| 551 | ||
| 552 | <groupId> | |
| 553 | je | |
| 554 | </groupId> | |
| 555 | ||
| 556 | <artifactI d> | |
| 557 | je | |
| 558 | </artifact Id> | |
| 559 | ||
| 560 | <version> | |
| 561 | 3.2.76 | |
| 562 | </version> | |
| 563 | ||
| 564 | <type> | |
| 565 | jar | |
| 566 | </type> | |
| 567 | ||
| 568 | <propertie s> | |
| 569 | ||
| 570 | <war.manif est.classp ath> | |
| 571 | true | |
| 572 | </war.mani fest.class path> | |
| 573 | ||
| 574 | <war.bundl e> | |
| 575 | false | |
| 576 | </war.bund le> | |
| 577 | ||
| 578 | </properti es> | |
| 579 | ||
| 580 | </dependen cy> | |
| 581 | ||
| 582 | <!-- | |
| 583 | comm ons-httpcl ient provi de client side HTTP functional ity. | |
| 584 | i.e. handles h eaders, bo dy as stre am, retrie s for auth orization and redire cts, etc.. . | |
| 585 | comm ons-httpcl ient-3.0.1 .jar repla ced with c ommons-htt pclient-cu stom-3.0.1 .jar 12/31 /2008 | |
| 586 | --> | |
| 587 | ||
| 588 | <dependenc y> | |
| 589 | ||
| 590 | <groupId> | |
| 591 | commons-ht tpclient | |
| 592 | </groupId> | |
| 593 | ||
| 594 | <artifactI d> | |
| 595 | commons-ht tpclient-c ustom | |
| 596 | </artifact Id> | |
| 597 | ||
| 598 | <version> | |
| 599 | 3.0.1 | |
| 600 | </version> | |
| 601 | ||
| 602 | <type> | |
| 603 | jar | |
| 604 | </type> | |
| 605 | ||
| 606 | </dependen cy> | |
| 607 | ||
| 608 | <!-- | |
| 609 | comm ons-codec provide co ding/decod ing of bas ic image s tream type s, JPG, TI FF, etc, | |
| 610 | no D ICOM thoug h | |
| 611 | --> | |
| 612 | ||
| 613 | <dependenc y> | |
| 614 | ||
| 615 | <groupId> | |
| 616 | commons-co dec | |
| 617 | </groupId> | |
| 618 | ||
| 619 | <artifactI d> | |
| 620 | commons-co dec | |
| 621 | </artifact Id> | |
| 622 | ||
| 623 | <version> | |
| 624 | 1.3 | |
| 625 | </version> | |
| 626 | ||
| 627 | <type> | |
| 628 | jar | |
| 629 | </type> | |
| 630 | ||
| 631 | </dependen cy> | |
| 632 | ||
| 633 | <!-- Tomca t jars --> | |
| 634 | ||
| 635 | <dependenc y> | |
| 636 | ||
| 637 | <groupId> | |
| 638 | catalina | |
| 639 | </groupId> | |
| 640 | ||
| 641 | <artifactI d> | |
| 642 | catalina | |
| 643 | </artifact Id> | |
| 644 | ||
| 645 | <version> | |
| 646 | 5.5.17 | |
| 647 | </version> | |
| 648 | ||
| 649 | <type> | |
| 650 | jar | |
| 651 | </type> | |
| 652 | ||
| 653 | </dependen cy> | |
| 654 | ||
| 655 | <dependenc y> | |
| 656 | ||
| 657 | <groupId> | |
| 658 | catalina | |
| 659 | </groupId> | |
| 660 | ||
| 661 | <artifactI d> | |
| 662 | catalina-o ptional | |
| 663 | </artifact Id> | |
| 664 | ||
| 665 | <version> | |
| 666 | 5.5.17 | |
| 667 | </version> | |
| 668 | ||
| 669 | <type> | |
| 670 | jar | |
| 671 | </type> | |
| 672 | ||
| 673 | </dependen cy> | |
| 674 | ||
| 675 | <!-- Googl e Web Tool kit --> | |
| 676 | ||
| 677 | <dependenc y> | |
| 678 | ||
| 679 | <groupId> | |
| 680 | gwt | |
| 681 | </groupId> | |
| 682 | ||
| 683 | <artifactI d> | |
| 684 | gwt-servle t | |
| 685 | </artifact Id> | |
| 686 | ||
| 687 | <version> | |
| 688 | 1.33 | |
| 689 | </version> | |
| 690 | ||
| 691 | <type> | |
| 692 | jar | |
| 693 | </type> | |
| 694 | ||
| 695 | </dependen cy> | |
| 696 | ||
| 697 | <dependenc y> | |
| 698 | ||
| 699 | <groupId> | |
| 700 | jcifs | |
| 701 | </groupId> | |
| 702 | ||
| 703 | <artifactI d> | |
| 704 | jcifs | |
| 705 | </artifact Id> | |
| 706 | ||
| 707 | <version> | |
| 708 | 1.2.17 | |
| 709 | </version> | |
| 710 | ||
| 711 | <type> | |
| 712 | jar | |
| 713 | </type> | |
| 714 | ||
| 715 | </dependen cy> | |
| 716 | ||
| 717 | <!-- Java Excel gene ration --> | |
| 718 | ||
| 719 | <dependenc y> | |
| 720 | ||
| 721 | <groupId> | |
| 722 | jxl | |
| 723 | </groupId> | |
| 724 | ||
| 725 | <artifactI d> | |
| 726 | jxl | |
| 727 | </artifact Id> | |
| 728 | ||
| 729 | <version> | |
| 730 | 2.0.0 | |
| 731 | </version> | |
| 732 | ||
| 733 | <type> | |
| 734 | jar | |
| 735 | </type> | |
| 736 | ||
| 737 | </dependen cy> | |
| 738 | ||
| 739 | </dependen cies> | |
| 740 | </project> | |
| 741 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.