Produced by Araxis Merge on 7/20/2018 12:56:40 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 | CTT_Release_8_June_2018.zip\CTT_ISAAC\integration-tests | pom.xml | Tue Jul 17 16:27:21 2018 UTC |
| 2 | CTT_Release_8_June_2018.zip\CTT_ISAAC\integration-tests | pom.xml | Wed Jul 18 14:57:30 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 1510 |
| 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 | <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/xs d/maven-4. 0.0.xsd" | |
| 9 | > | |
| 10 | ||
| 11 | <modelVers ion> | |
| 12 | 4.0.0 | |
| 13 | </modelVer sion> | |
| 14 | ||
| 15 | <parent> | |
| 16 | ||
| 17 | <groupId> | |
| 18 | gov.vha.is aac.ochre | |
| 19 | </groupId> | |
| 20 | ||
| 21 | <artifactI d> | |
| 22 | isaac-pare nt | |
| 23 | </artifact Id> | |
| 24 | ||
| 25 | <version> | |
| 26 | 8.0.3 | |
| 27 | </version> | |
| 28 | ||
| 29 | </parent> | |
| 30 | ||
| 31 | <groupId> | |
| 32 | gov.vha.is aac.ochre. modules | |
| 33 | </groupId> | |
| 34 | ||
| 35 | <artifactI d> | |
| 36 | integratio n-tests | |
| 37 | </artifact Id> | |
| 38 | ||
| 39 | <packaging > | |
| 40 | jar | |
| 41 | </packagin g> | |
| 42 | ||
| 43 | ||
| 44 | <!-- Setti ng for XML tests, us e this VHA T loader I BDF --> | |
| 45 | ||
| 46 | <propertie s> | |
| 47 | ||
| 48 | <vhat-load er-version > | |
| 49 | 2017.09.07 -198-loade r-4.15 | |
| 50 | </vhat-loa der-versio n> | |
| 51 | ||
| 52 | </properti es> | |
| 53 | ||
| 54 | ||
| 55 | <name> | |
| 56 | OCHRE: Int egration t ests | |
| 57 | </name> | |
| 58 | ||
| 59 | <dependenc ies> | |
| 60 | ||
| 61 | <dependenc y> | |
| 62 | ||
| 63 | <groupId> | |
| 64 | gov.vha.is aac.ochre. modules | |
| 65 | </groupId> | |
| 66 | ||
| 67 | <artifactI d> | |
| 68 | ochre-meta data | |
| 69 | </artifact Id> | |
| 70 | ||
| 71 | <version> | |
| 72 | ${project. version} | |
| 73 | </version> | |
| 74 | ||
| 75 | <scope> | |
| 76 | test | |
| 77 | </scope> | |
| 78 | ||
| 79 | </dependen cy> | |
| 80 | ||
| 81 | <dependenc y> | |
| 82 | ||
| 83 | <groupId> | |
| 84 | org.glassf ish.hk2 | |
| 85 | </groupId> | |
| 86 | ||
| 87 | <artifactI d> | |
| 88 | hk2-testng | |
| 89 | </artifact Id> | |
| 90 | ||
| 91 | <scope> | |
| 92 | test | |
| 93 | </scope> | |
| 94 | ||
| 95 | </dependen cy> | |
| 96 | ||
| 97 | <dependenc y> | |
| 98 | ||
| 99 | <groupId> | |
| 100 | org.testng | |
| 101 | </groupId> | |
| 102 | ||
| 103 | <artifactI d> | |
| 104 | testng | |
| 105 | </artifact Id> | |
| 106 | ||
| 107 | </dependen cy> | |
| 108 | ||
| 109 | <dependenc y> | |
| 110 | ||
| 111 | <groupId> | |
| 112 | gov.vha.is aac.ochre. modules | |
| 113 | </groupId> | |
| 114 | ||
| 115 | <artifactI d> | |
| 116 | ibdf-provi der | |
| 117 | </artifact Id> | |
| 118 | ||
| 119 | <version> | |
| 120 | ${project. version} | |
| 121 | </version> | |
| 122 | ||
| 123 | <scope> | |
| 124 | test | |
| 125 | </scope> | |
| 126 | ||
| 127 | </dependen cy> | |
| 128 | ||
| 129 | <dependenc y> | |
| 130 | ||
| 131 | <groupId> | |
| 132 | gov.vha.is aac.ochre. modules | |
| 133 | </groupId> | |
| 134 | ||
| 135 | <artifactI d> | |
| 136 | commit-pro vider | |
| 137 | </artifact Id> | |
| 138 | ||
| 139 | <version> | |
| 140 | ${project. version} | |
| 141 | </version> | |
| 142 | ||
| 143 | <scope> | |
| 144 | test | |
| 145 | </scope> | |
| 146 | ||
| 147 | </dependen cy> | |
| 148 | ||
| 149 | <dependenc y> | |
| 150 | ||
| 151 | <groupId> | |
| 152 | gov.vha.is aac.ochre. modules | |
| 153 | </groupId> | |
| 154 | ||
| 155 | <artifactI d> | |
| 156 | stamp-prov ider | |
| 157 | </artifact Id> | |
| 158 | ||
| 159 | <version> | |
| 160 | ${project. version} | |
| 161 | </version> | |
| 162 | ||
| 163 | <scope> | |
| 164 | test | |
| 165 | </scope> | |
| 166 | ||
| 167 | </dependen cy> | |
| 168 | ||
| 169 | <dependenc y> | |
| 170 | ||
| 171 | <groupId> | |
| 172 | gov.vha.is aac.ochre. modules | |
| 173 | </groupId> | |
| 174 | ||
| 175 | <artifactI d> | |
| 176 | identifier -provider | |
| 177 | </artifact Id> | |
| 178 | ||
| 179 | <version> | |
| 180 | ${project. version} | |
| 181 | </version> | |
| 182 | ||
| 183 | <scope> | |
| 184 | test | |
| 185 | </scope> | |
| 186 | ||
| 187 | </dependen cy> | |
| 188 | ||
| 189 | <dependenc y> | |
| 190 | ||
| 191 | <groupId> | |
| 192 | gov.vha.is aac.ochre. modules | |
| 193 | </groupId> | |
| 194 | ||
| 195 | <artifactI d> | |
| 196 | concept-pr ovider | |
| 197 | </artifact Id> | |
| 198 | ||
| 199 | <version> | |
| 200 | ${project. version} | |
| 201 | </version> | |
| 202 | ||
| 203 | <scope> | |
| 204 | test | |
| 205 | </scope> | |
| 206 | ||
| 207 | </dependen cy> | |
| 208 | ||
| 209 | <dependenc y> | |
| 210 | ||
| 211 | <groupId> | |
| 212 | gov.vha.is aac.ochre. modules | |
| 213 | </groupId> | |
| 214 | ||
| 215 | <artifactI d> | |
| 216 | sememe-pro vider | |
| 217 | </artifact Id> | |
| 218 | ||
| 219 | <version> | |
| 220 | ${project. version} | |
| 221 | </version> | |
| 222 | ||
| 223 | <scope> | |
| 224 | test | |
| 225 | </scope> | |
| 226 | ||
| 227 | </dependen cy> | |
| 228 | ||
| 229 | <dependenc y> | |
| 230 | ||
| 231 | <groupId> | |
| 232 | gov.vha.is aac.ochre. modules | |
| 233 | </groupId> | |
| 234 | ||
| 235 | <artifactI d> | |
| 236 | taxonomy-p rovider | |
| 237 | </artifact Id> | |
| 238 | ||
| 239 | <version> | |
| 240 | ${project. version} | |
| 241 | </version> | |
| 242 | ||
| 243 | <scope> | |
| 244 | test | |
| 245 | </scope> | |
| 246 | ||
| 247 | </dependen cy> | |
| 248 | ||
| 249 | <dependenc y> | |
| 250 | ||
| 251 | <groupId> | |
| 252 | gov.vha.is aac.ochre. modules | |
| 253 | </groupId> | |
| 254 | ||
| 255 | <artifactI d> | |
| 256 | logic-prov ider | |
| 257 | </artifact Id> | |
| 258 | ||
| 259 | <version> | |
| 260 | ${project. version} | |
| 261 | </version> | |
| 262 | ||
| 263 | <scope> | |
| 264 | test | |
| 265 | </scope> | |
| 266 | ||
| 267 | </dependen cy> | |
| 268 | ||
| 269 | <dependenc y> | |
| 270 | ||
| 271 | <groupId> | |
| 272 | gov.vha.is aac.ochre. modules | |
| 273 | </groupId> | |
| 274 | ||
| 275 | <artifactI d> | |
| 276 | progress-p rovider | |
| 277 | </artifact Id> | |
| 278 | ||
| 279 | <version> | |
| 280 | ${project. version} | |
| 281 | </version> | |
| 282 | ||
| 283 | <scope> | |
| 284 | test | |
| 285 | </scope> | |
| 286 | ||
| 287 | </dependen cy> | |
| 288 | ||
| 289 | <dependenc y> | |
| 290 | ||
| 291 | <groupId> | |
| 292 | gov.vha.is aac.ochre. modules | |
| 293 | </groupId> | |
| 294 | ||
| 295 | <artifactI d> | |
| 296 | coordinate -provider | |
| 297 | </artifact Id> | |
| 298 | ||
| 299 | <version> | |
| 300 | ${project. version} | |
| 301 | </version> | |
| 302 | ||
| 303 | <scope> | |
| 304 | test | |
| 305 | </scope> | |
| 306 | ||
| 307 | </dependen cy> | |
| 308 | ||
| 309 | <dependenc y> | |
| 310 | ||
| 311 | <groupId> | |
| 312 | gov.vha.is aac.ochre. modules | |
| 313 | </groupId> | |
| 314 | ||
| 315 | <artifactI d> | |
| 316 | path-provi der | |
| 317 | </artifact Id> | |
| 318 | ||
| 319 | <version> | |
| 320 | ${project. version} | |
| 321 | </version> | |
| 322 | ||
| 323 | <scope> | |
| 324 | test | |
| 325 | </scope> | |
| 326 | ||
| 327 | </dependen cy> | |
| 328 | ||
| 329 | <dependenc y> | |
| 330 | ||
| 331 | <groupId> | |
| 332 | gov.vha.is aac.ochre. modules | |
| 333 | </groupId> | |
| 334 | ||
| 335 | <artifactI d> | |
| 336 | workflow-p rovider | |
| 337 | </artifact Id> | |
| 338 | ||
| 339 | <version> | |
| 340 | ${project. version} | |
| 341 | </version> | |
| 342 | ||
| 343 | <scope> | |
| 344 | test | |
| 345 | </scope> | |
| 346 | ||
| 347 | </dependen cy> | |
| 348 | ||
| 349 | <dependenc y> | |
| 350 | ||
| 351 | <groupId> | |
| 352 | gov.vha.is aac.ochre. modules | |
| 353 | </groupId> | |
| 354 | ||
| 355 | <artifactI d> | |
| 356 | ochre-impo rters | |
| 357 | </artifact Id> | |
| 358 | ||
| 359 | <version> | |
| 360 | ${project. version} | |
| 361 | </version> | |
| 362 | ||
| 363 | <scope> | |
| 364 | test | |
| 365 | </scope> | |
| 366 | ||
| 367 | </dependen cy> | |
| 368 | ||
| 369 | <dependenc y> | |
| 370 | ||
| 371 | <groupId> | |
| 372 | gov.vha.is aac.ochre. modules | |
| 373 | </groupId> | |
| 374 | ||
| 375 | <artifactI d> | |
| 376 | ochre-expo rters | |
| 377 | </artifact Id> | |
| 378 | ||
| 379 | <version> | |
| 380 | ${project. version} | |
| 381 | </version> | |
| 382 | ||
| 383 | <scope> | |
| 384 | test | |
| 385 | </scope> | |
| 386 | ||
| 387 | </dependen cy> | |
| 388 | ||
| 389 | <dependenc y> | |
| 390 | ||
| 391 | <groupId> | |
| 392 | gov.vha.is aac.ochre. modules | |
| 393 | </groupId> | |
| 394 | ||
| 395 | <artifactI d> | |
| 396 | hl7-messag ing | |
| 397 | </artifact Id> | |
| 398 | ||
| 399 | <version> | |
| 400 | ${project. version} | |
| 401 | </version> | |
| 402 | ||
| 403 | <scope> | |
| 404 | test | |
| 405 | </scope> | |
| 406 | ||
| 407 | </dependen cy> | |
| 408 | ||
| 409 | </dependen cies> | |
| 410 | ||
| 411 | <profiles> | |
| 412 | ||
| 413 | <profile> | |
| 414 | ||
| 415 | <id> | |
| 416 | checkin | |
| 417 | </id> | |
| 418 | ||
| 419 | <activatio n> | |
| 420 | ||
| 421 | <activeByD efault> | |
| 422 | true | |
| 423 | </activeBy Default> | |
| 424 | ||
| 425 | </activati on> | |
| 426 | ||
| 427 | <build> | |
| 428 | ||
| 429 | <plugins> | |
| 430 | ||
| 431 | <plugin> | |
| 432 | ||
| 433 | <groupId> | |
| 434 | org.apache .maven.plu gins | |
| 435 | </groupId> | |
| 436 | ||
| 437 | <artifactI d> | |
| 438 | maven-depe ndency-plu gin | |
| 439 | </artifact Id> | |
| 440 | ||
| 441 | <execution s> | |
| 442 | ||
| 443 | <execution > | |
| 444 | ||
| 445 | <id> | |
| 446 | extract-te st-depende ncies | |
| 447 | </id> | |
| 448 | ||
| 449 | <phase> | |
| 450 | generate-t est-resour ces | |
| 451 | </phase> | |
| 452 | ||
| 453 | <goals> | |
| 454 | ||
| 455 | <goal> | |
| 456 | unpack | |
| 457 | </goal> | |
| 458 | ||
| 459 | </goals> | |
| 460 | ||
| 461 | <configura tion> | |
| 462 | ||
| 463 | <skip> | |
| 464 | ${skipTest s} | |
| 465 | </skip> | |
| 466 | ||
| 467 | <artifactI tems> | |
| 468 | ||
| 469 | <artifact> | |
| 470 | ||
| 471 | <groupId> | |
| 472 | gov.vha.is aac.ochre. modules | |
| 473 | </groupId> | |
| 474 | ||
| 475 | <artifactI d> | |
| 476 | ochre-meta data | |
| 477 | </artifact Id> | |
| 478 | ||
| 479 | <version> | |
| 480 | ${project. version} | |
| 481 | </version> | |
| 482 | ||
| 483 | <classifie r> | |
| 484 | all | |
| 485 | </classifi er> | |
| 486 | ||
| 487 | <type> | |
| 488 | ibdf.zip | |
| 489 | </type> | |
| 490 | ||
| 491 | </artifact > | |
| 492 | ||
| 493 | </artifact Items> | |
| 494 | ||
| 495 | <outputDir ectory> | |
| 496 | ${project. build.dire ctory}/dat a | |
| 497 | </outputDi rectory> | |
| 498 | ||
| 499 | </configur ation> | |
| 500 | ||
| 501 | </executio n> | |
| 502 | ||
| 503 | </executio ns> | |
| 504 | ||
| 505 | </plugin> | |
| 506 | ||
| 507 | <plugin> | |
| 508 | ||
| 509 | <groupId> | |
| 510 | org.apache .maven.plu gins | |
| 511 | </groupId> | |
| 512 | ||
| 513 | <artifactI d> | |
| 514 | maven-sure fire-plugi n | |
| 515 | </artifact Id> | |
| 516 | ||
| 517 | <configura tion> | |
| 518 | ||
| 519 | <forkCount > | |
| 520 | 1 | |
| 521 | </forkCoun t> | |
| 522 | ||
| 523 | <reuseFork s> | |
| 524 | true | |
| 525 | </reuseFor ks> | |
| 526 | ||
| 527 | <parallel> | |
| 528 | false | |
| 529 | </parallel > | |
| 530 | ||
| 531 | <useSystem ClassLoade r> | |
| 532 | true | |
| 533 | </useSyste mClassLoad er> | |
| 534 | ||
| 535 | <useManife stOnlyJar> | |
| 536 | false | |
| 537 | </useManif estOnlyJar > | |
| 538 | ||
| 539 | <argLine> | |
| 540 | -ea -d64 - Xmx12g -Dj ava.awt.he adless=tru e | |
| 541 | </argLine> | |
| 542 | ||
| 543 | <!--<argLi ne>-Xmx8g -Xms8g -Dj ava.awt.he adless=tru e -agentpa th:/Applic ations/jpr ofiler8/bi n/macos/li bjprofiler ti.jnilib= PORT = PORT </argLine> --> | |
| 544 | ||
| 545 | <!-- debug ForkedProc ess>true</ debugForke dProcess - -> | |
| 546 | ||
| 547 | <includes> | |
| 548 | ||
| 549 | <!-- Let J Unit annot ations dec ide --> | |
| 550 | ||
| 551 | <include> | |
| 552 | **/*.class | |
| 553 | </include> | |
| 554 | ||
| 555 | </includes > | |
| 556 | ||
| 557 | <excludes> | |
| 558 | ||
| 559 | <exclude> | |
| 560 | **/VhatXml Tests.java | |
| 561 | </exclude> | |
| 562 | ||
| 563 | <exclude> | |
| 564 | **/HL7Test s.java | |
| 565 | </exclude> | |
| 566 | ||
| 567 | </excludes > | |
| 568 | ||
| 569 | <!--system PropertyVa riables> | |
| 570 | <org.i htsdo.otf. tcc.query. lucene-roo t-location >${project .build.dir ectory}</o rg.ihtsdo. otf.tcc.qu ery.lucene -root-loca tion> | |
| 571 | </sy stemProper tyVariable s--> | |
| 572 | ||
| 573 | </configur ation> | |
| 574 | ||
| 575 | </plugin> | |
| 576 | ||
| 577 | </plugins> | |
| 578 | ||
| 579 | </build> | |
| 580 | ||
| 581 | </profile> | |
| 582 | ||
| 583 | <profile> | |
| 584 | ||
| 585 | <id> | |
| 586 | vhat-xml-t ests | |
| 587 | </id> | |
| 588 | ||
| 589 | <activatio n> | |
| 590 | ||
| 591 | <activeByD efault> | |
| 592 | false | |
| 593 | </activeBy Default> | |
| 594 | ||
| 595 | </activati on> | |
| 596 | ||
| 597 | <build> | |
| 598 | ||
| 599 | <plugins> | |
| 600 | ||
| 601 | <plugin> | |
| 602 | ||
| 603 | <groupId> | |
| 604 | org.apache .maven.plu gins | |
| 605 | </groupId> | |
| 606 | ||
| 607 | <artifactI d> | |
| 608 | maven-depe ndency-plu gin | |
| 609 | </artifact Id> | |
| 610 | ||
| 611 | <execution s> | |
| 612 | ||
| 613 | <execution > | |
| 614 | ||
| 615 | <id> | |
| 616 | extract-vh at-depende ncies | |
| 617 | </id> | |
| 618 | ||
| 619 | <goals> | |
| 620 | ||
| 621 | <goal> | |
| 622 | unpack | |
| 623 | </goal> | |
| 624 | ||
| 625 | </goals> | |
| 626 | ||
| 627 | <configura tion> | |
| 628 | ||
| 629 | <skip> | |
| 630 | ${skipTest s} | |
| 631 | </skip> | |
| 632 | ||
| 633 | <artifactI tems> | |
| 634 | ||
| 635 | <artifact> | |
| 636 | ||
| 637 | <groupId> | |
| 638 | gov.vha.is aac.ochre. modules | |
| 639 | </groupId> | |
| 640 | ||
| 641 | <artifactI d> | |
| 642 | ochre-meta data | |
| 643 | </artifact Id> | |
| 644 | ||
| 645 | <version> | |
| 646 | ${project. version} | |
| 647 | </version> | |
| 648 | ||
| 649 | <classifie r> | |
| 650 | all | |
| 651 | </classifi er> | |
| 652 | ||
| 653 | <type> | |
| 654 | ibdf.zip | |
| 655 | </type> | |
| 656 | ||
| 657 | </artifact > | |
| 658 | ||
| 659 | <artifact> | |
| 660 | ||
| 661 | <groupId> | |
| 662 | gov.vha.is aac.termin ology.conv erted | |
| 663 | </groupId> | |
| 664 | ||
| 665 | <artifactI d> | |
| 666 | vhat-ibdf | |
| 667 | </artifact Id> | |
| 668 | ||
| 669 | <version> | |
| 670 | ${vhat-loa der-versio n} | |
| 671 | </version> | |
| 672 | ||
| 673 | <type> | |
| 674 | ibdf.zip | |
| 675 | </type> | |
| 676 | ||
| 677 | </artifact > | |
| 678 | ||
| 679 | </artifact Items> | |
| 680 | ||
| 681 | <outputDir ectory> | |
| 682 | ${project. build.dire ctory}/dat a | |
| 683 | </outputDi rectory> | |
| 684 | ||
| 685 | </configur ation> | |
| 686 | ||
| 687 | </executio n> | |
| 688 | ||
| 689 | </executio ns> | |
| 690 | ||
| 691 | </plugin> | |
| 692 | ||
| 693 | <plugin> | |
| 694 | ||
| 695 | <groupId> | |
| 696 | org.apache .maven.plu gins | |
| 697 | </groupId> | |
| 698 | ||
| 699 | <artifactI d> | |
| 700 | maven-sure fire-plugi n | |
| 701 | </artifact Id> | |
| 702 | ||
| 703 | <configura tion> | |
| 704 | ||
| 705 | <systemPro pertyVaria bles> | |
| 706 | ||
| 707 | <vhat-ibdf -file> | |
| 708 | vhat-ibdf- ${vhat-loa der-versio n}.ibdf | |
| 709 | </vhat-ibd f-file> | |
| 710 | ||
| 711 | </systemPr opertyVari ables> | |
| 712 | ||
| 713 | <forkCount > | |
| 714 | 1 | |
| 715 | </forkCoun t> | |
| 716 | ||
| 717 | <reuseFork s> | |
| 718 | true | |
| 719 | </reuseFor ks> | |
| 720 | ||
| 721 | <parallel> | |
| 722 | false | |
| 723 | </parallel > | |
| 724 | ||
| 725 | <useSystem ClassLoade r> | |
| 726 | true | |
| 727 | </useSyste mClassLoad er> | |
| 728 | ||
| 729 | <useManife stOnlyJar> | |
| 730 | false | |
| 731 | </useManif estOnlyJar > | |
| 732 | ||
| 733 | <argLine> | |
| 734 | -ea -d64 - Xmx12g -Dj ava.awt.he adless=tru e | |
| 735 | </argLine> | |
| 736 | ||
| 737 | <includes> | |
| 738 | ||
| 739 | <include> | |
| 740 | **/*.class | |
| 741 | </include> | |
| 742 | ||
| 743 | </includes > | |
| 744 | ||
| 745 | </configur ation> | |
| 746 | ||
| 747 | </plugin> | |
| 748 | ||
| 749 | </plugins> | |
| 750 | ||
| 751 | </build> | |
| 752 | ||
| 753 | </profile> | |
| 754 | ||
| 755 | </profiles > | |
| 756 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.