Produced by Araxis Merge on 8/7/2018 11:46:01 AM 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 | HDR II v_322_iter 2_July_2018.zip\fpds-ear-12.0.5.ear\APP-INF\lib\common-ws-9.0.5.jar\META-INF\maven\gov.va.med.cds.ws\common-ws | pom.xml | Tue Jul 3 15:27:00 2018 UTC |
| 2 | HDR II v_322_iter 2_July_2018.zip\fpds-ear-12.0.5.ear\APP-INF\lib\common-ws-9.0.5.jar\META-INF\maven\gov.va.med.cds.ws\common-ws | pom.xml | Tue Jul 31 19:10:38 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 7 | 1244 |
| Changed | 6 | 12 |
| 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 | <project | |
| 2 | xmlns="htt p://maven. apache.org /POM/4.0.0 " | |
| 3 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 4 | xsi:schema Location=" http://mav en.apache. org/POM/4. 0.0 http:/ /maven.apa che.org/xs d/maven-4. 0.0.xsd" | |
| 5 | > | |
| 6 | ||
| 7 | <modelVers ion> | |
| 8 | 4.0.0 | |
| 9 | </modelVer sion> | |
| 10 | ||
| 11 | ||
| 12 | <groupId> | |
| 13 | gov.va.med .cds.ws | |
| 14 | </groupId> | |
| 15 | ||
| 16 | <artifactI d> | |
| 17 | common-ws | |
| 18 | </artifact Id> | |
| 19 | ||
| 20 | <version> | |
| 21 | 9.0.5 | |
| 22 | </version> | |
| 23 | ||
| 24 | <descripti on> | |
| 25 | Contains c ommon clas ses used a cross the Repositori es Web Ser vice proje cts and is meant to be include inside an ear that PROVIDES m ost of the the depen dencies co ntained in the depen dency sect ion | |
| 26 | </descript ion> | |
| 27 | ||
| 28 | <packaging > | |
| 29 | jar | |
| 30 | </packagin g> | |
| 31 | ||
| 32 | ||
| 33 | <scm> | |
| 34 | ||
| 35 | <url> | |
| 36 | ${env.SCM_ URL}:commo n-ws-9.0.5 | |
| 37 | </url> | |
| 38 | ||
| 39 | <connectio n> | |
| 40 | scm:jazz:$ {env.SCM_U RL}:common -ws-9.0.5 | |
| 41 | </connecti on> | |
| 42 | ||
| 43 | <developer Connection > | |
| 44 | scm:jazz:$ {env.SCM_U RL}:common -ws-9.0.5 | |
| 45 | </develope rConnectio n> | |
| 46 | ||
| 47 | </scm> | |
| 48 | ||
| 49 | <propertie s> | |
| 50 | ||
| 51 | <modules.t est.groups > | |
| 52 | checkintes t | |
| 53 | </modules. test.group s> | |
| 54 | ||
| 55 | <powermock .version> | |
| 56 | 1.6.6 | |
| 57 | </powermoc k.version> | |
| 58 | ||
| 59 | <repos.lib .groupid> | |
| 60 | gov.va.med .repos.lib | |
| 61 | </repos.li b.groupid> | |
| 62 | ||
| 63 | <apache.cx f.version> | |
| 64 | 3.1.3 | |
| 65 | </apache.c xf.version > | |
| 66 | ||
| 67 | <build.rep orts.outpu tsite> | |
| 68 | file:// DNS apphdrci01 . DNS DOMAIN . EXT :/usr/shar e/tomcat6/ webapps/si teReport | |
| 69 | </build.re ports.outp utsite> | |
| 70 | ||
| 71 | <build.rep orts.url> | |
| 72 | http:// DNS apphdrci01 . DNS DOMAIN . EXT :8080/site Report/ | |
| 73 | </build.re ports.url> | |
| 74 | ||
| 75 | ||
| 76 | <!-- modul e and clie nt depende ncies --> | |
| 77 | ||
| 78 | <junit-ext .version> | |
| 79 | 8.0.0 | |
| 80 | </junit-ex t.version> | |
| 81 | ||
| 82 | <common.ve rsion> | |
| 83 | 12.0.4 | |
| 84 | </common.v ersion> | |
| 85 | ||
| 86 | <testharne ss.version > | |
| 87 | 12.0.5 | |
| 88 | </testharn ess.versio n> | |
| 89 | ||
| 90 | </properti es> | |
| 91 | ||
| 92 | <dependenc ies> | |
| 93 | ||
| 94 | <dependenc y> | |
| 95 | ||
| 96 | <groupId> | |
| 97 | ${repos.li b.groupid} | |
| 98 | </groupId> | |
| 99 | ||
| 100 | <artifactI d> | |
| 101 | common | |
| 102 | </artifact Id> | |
| 103 | ||
| 104 | <version> | |
| 105 | ${common.v ersion} | |
| 106 | </version> | |
| 107 | ||
| 108 | </dependen cy> | |
| 109 | ||
| 110 | <dependenc y> | |
| 111 | ||
| 112 | <groupId> | |
| 113 | ${repos.li b.groupid} | |
| 114 | </groupId> | |
| 115 | ||
| 116 | <artifactI d> | |
| 117 | testharnes s | |
| 118 | </artifact Id> | |
| 119 | ||
| 120 | <version> | |
| 121 | ${testharn ess.versio n} | |
| 122 | </version> | |
| 123 | ||
| 124 | <classifie r> | |
| 125 | tests | |
| 126 | </classifi er> | |
| 127 | ||
| 128 | </dependen cy> | |
| 129 | ||
| 130 | <dependenc y> | |
| 131 | ||
| 132 | <groupId> | |
| 133 | ${repos.li b.groupid} | |
| 134 | </groupId> | |
| 135 | ||
| 136 | <artifactI d> | |
| 137 | junit-ext | |
| 138 | </artifact Id> | |
| 139 | ||
| 140 | <version> | |
| 141 | ${junit-ex t.version} | |
| 142 | </version> | |
| 143 | ||
| 144 | <scope> | |
| 145 | test | |
| 146 | </scope> | |
| 147 | ||
| 148 | </dependen cy> | |
| 149 | ||
| 150 | <dependenc y> | |
| 151 | ||
| 152 | <groupId> | |
| 153 | org.easymo ck | |
| 154 | </groupId> | |
| 155 | ||
| 156 | <artifactI d> | |
| 157 | easymock | |
| 158 | </artifact Id> | |
| 159 | ||
| 160 | <version> | |
| 161 | 3.4 | |
| 162 | </version> | |
| 163 | ||
| 164 | <scope> | |
| 165 | test | |
| 166 | </scope> | |
| 167 | ||
| 168 | </dependen cy> | |
| 169 | ||
| 170 | <dependenc y> | |
| 171 | ||
| 172 | <groupId> | |
| 173 | org.easymo ck | |
| 174 | </groupId> | |
| 175 | ||
| 176 | <artifactI d> | |
| 177 | easymockcl assextensi on | |
| 178 | </artifact Id> | |
| 179 | ||
| 180 | <version> | |
| 181 | 2.4 | |
| 182 | </version> | |
| 183 | ||
| 184 | <scope> | |
| 185 | test | |
| 186 | </scope> | |
| 187 | ||
| 188 | </dependen cy> | |
| 189 | ||
| 190 | <dependenc y> | |
| 191 | ||
| 192 | <groupId> | |
| 193 | org.apache .cxf | |
| 194 | </groupId> | |
| 195 | ||
| 196 | <artifactI d> | |
| 197 | cxf-core | |
| 198 | </artifact Id> | |
| 199 | ||
| 200 | <version> | |
| 201 | ${apache.c xf.version } | |
| 202 | </version> | |
| 203 | ||
| 204 | <scope> | |
| 205 | provided | |
| 206 | </scope> | |
| 207 | ||
| 208 | </dependen cy> | |
| 209 | ||
| 210 | <dependenc y> | |
| 211 | ||
| 212 | <groupId> | |
| 213 | org.apache .cxf | |
| 214 | </groupId> | |
| 215 | ||
| 216 | <artifactI d> | |
| 217 | cxf-rt-ws- security | |
| 218 | </artifact Id> | |
| 219 | ||
| 220 | <version> | |
| 221 | ${apache.c xf.version } | |
| 222 | </version> | |
| 223 | ||
| 224 | <scope> | |
| 225 | provided | |
| 226 | </scope> | |
| 227 | ||
| 228 | </dependen cy> | |
| 229 | ||
| 230 | <dependenc y> | |
| 231 | ||
| 232 | <groupId> | |
| 233 | org.apache .cxf | |
| 234 | </groupId> | |
| 235 | ||
| 236 | <artifactI d> | |
| 237 | cxf-rt-rs- security-x ml | |
| 238 | </artifact Id> | |
| 239 | ||
| 240 | <version> | |
| 241 | ${apache.c xf.version } | |
| 242 | </version> | |
| 243 | ||
| 244 | <scope> | |
| 245 | provided | |
| 246 | </scope> | |
| 247 | ||
| 248 | </dependen cy> | |
| 249 | ||
| 250 | <!-- <depe ndency> <g roupId>org .apache.cx f</groupId > <artifac tId>cxf-rt -bindings- xml</artif actId> <ve rsion>${ap ache.cxf.v ersion}</v ersion> <s cope>provi ded</scope > </depend ency> --> | |
| 251 | ||
| 252 | <dependenc y> | |
| 253 | ||
| 254 | <groupId> | |
| 255 | javax.ws.r s | |
| 256 | </groupId> | |
| 257 | ||
| 258 | <artifactI d> | |
| 259 | javax.ws.r s-api | |
| 260 | </artifact Id> | |
| 261 | ||
| 262 | <version> | |
| 263 | 2.0.1 | |
| 264 | </version> | |
| 265 | ||
| 266 | <scope> | |
| 267 | provided | |
| 268 | </scope> | |
| 269 | ||
| 270 | </dependen cy> | |
| 271 | ||
| 272 | </dependen cies> | |
| 273 | ||
| 274 | <profiles> | |
| 275 | ||
| 276 | <profile> | |
| 277 | ||
| 278 | <id> | |
| 279 | clover | |
| 280 | </id> | |
| 281 | ||
| 282 | <build> | |
| 283 | ||
| 284 | <plugins> | |
| 285 | ||
| 286 | <plugin> | |
| 287 | ||
| 288 | <groupId> | |
| 289 | com.atlass ian.maven. plugins | |
| 290 | </groupId> | |
| 291 | ||
| 292 | <artifactI d> | |
| 293 | maven-clov er2-plugin | |
| 294 | </artifact Id> | |
| 295 | ||
| 296 | <configura tion> | |
| 297 | ||
| 298 | <excludes> | |
| 299 | ||
| 300 | <exclude> | |
| 301 | **/*Test.j ava | |
| 302 | </exclude> | |
| 303 | ||
| 304 | <exclude> | |
| 305 | **/*TestCa se.java | |
| 306 | </exclude> | |
| 307 | ||
| 308 | </excludes > | |
| 309 | ||
| 310 | </configur ation> | |
| 311 | ||
| 312 | <execution s> | |
| 313 | ||
| 314 | <execution > | |
| 315 | ||
| 316 | <phase> | |
| 317 | pre-site | |
| 318 | </phase> | |
| 319 | ||
| 320 | <goals> | |
| 321 | ||
| 322 | <goal> | |
| 323 | instrument | |
| 324 | </goal> | |
| 325 | ||
| 326 | <goal> | |
| 327 | aggregate | |
| 328 | </goal> | |
| 329 | ||
| 330 | </goals> | |
| 331 | ||
| 332 | </executio n> | |
| 333 | ||
| 334 | </executio ns> | |
| 335 | ||
| 336 | </plugin> | |
| 337 | ||
| 338 | </plugins> | |
| 339 | ||
| 340 | </build> | |
| 341 | ||
| 342 | </profile> | |
| 343 | ||
| 344 | </profiles > | |
| 345 | ||
| 346 | <build> | |
| 347 | ||
| 348 | <plugins> | |
| 349 | ||
| 350 | <plugin> | |
| 351 | ||
| 352 | <groupId> | |
| 353 | org.apache .maven.plu gins | |
| 354 | </groupId> | |
| 355 | ||
| 356 | <artifactI d> | |
| 357 | maven-jar- plugin | |
| 358 | </artifact Id> | |
| 359 | ||
| 360 | <execution s> | |
| 361 | ||
| 362 | <execution > | |
| 363 | ||
| 364 | <goals> | |
| 365 | ||
| 366 | <goal> | |
| 367 | test-jar | |
| 368 | </goal> | |
| 369 | ||
| 370 | </goals> | |
| 371 | ||
| 372 | </executio n> | |
| 373 | ||
| 374 | </executio ns> | |
| 375 | ||
| 376 | </plugin> | |
| 377 | ||
| 378 | ||
| 379 | <plugin> | |
| 380 | ||
| 381 | <groupId> | |
| 382 | org.apache .maven.plu gins | |
| 383 | </groupId> | |
| 384 | ||
| 385 | <artifactI d> | |
| 386 | maven-scm- plugin | |
| 387 | </artifact Id> | |
| 388 | ||
| 389 | <version> | |
| 390 | 1.9.1 | |
| 391 | </version> | |
| 392 | ||
| 393 | <dependenc ies> | |
| 394 | ||
| 395 | <dependenc y> | |
| 396 | ||
| 397 | <groupId> | |
| 398 | org.apache .maven.scm | |
| 399 | </groupId> | |
| 400 | ||
| 401 | <artifactI d> | |
| 402 | maven-scm- provider-j azz | |
| 403 | </artifact Id> | |
| 404 | ||
| 405 | <version> | |
| 406 | 1.9.1 | |
| 407 | </version> | |
| 408 | ||
| 409 | </dependen cy> | |
| 410 | ||
| 411 | <dependenc y> | |
| 412 | ||
| 413 | <groupId> | |
| 414 | org.apache .maven.scm | |
| 415 | </groupId> | |
| 416 | ||
| 417 | <artifactI d> | |
| 418 | maven-scm- api | |
| 419 | </artifact Id> | |
| 420 | ||
| 421 | <version> | |
| 422 | 1.9.1 | |
| 423 | </version> | |
| 424 | ||
| 425 | </dependen cy> | |
| 426 | ||
| 427 | <dependenc y> | |
| 428 | ||
| 429 | <groupId> | |
| 430 | org.apache .maven.scm | |
| 431 | </groupId> | |
| 432 | ||
| 433 | <artifactI d> | |
| 434 | maven-scm- client | |
| 435 | </artifact Id> | |
| 436 | ||
| 437 | <version> | |
| 438 | 1.9.1 | |
| 439 | </version> | |
| 440 | ||
| 441 | </dependen cy> | |
| 442 | ||
| 443 | </dependen cies> | |
| 444 | ||
| 445 | </plugin> | |
| 446 | ||
| 447 | ||
| 448 | <plugin> | |
| 449 | ||
| 450 | <groupId> | |
| 451 | org.apache .maven.plu gins | |
| 452 | </groupId> | |
| 453 | ||
| 454 | <artifactI d> | |
| 455 | maven-rele ase-plugin | |
| 456 | </artifact Id> | |
| 457 | ||
| 458 | <version> | |
| 459 | 2.5 | |
| 460 | </version> | |
| 461 | ||
| 462 | </plugin> | |
| 463 | ||
| 464 | ||
| 465 | <plugin> | |
| 466 | ||
| 467 | <groupId> | |
| 468 | com.fortif y.ps.maven .plugin | |
| 469 | </groupId> | |
| 470 | ||
| 471 | <artifactI d> | |
| 472 | sca-maven- plugin | |
| 473 | </artifact Id> | |
| 474 | ||
| 475 | <version> | |
| 476 | 4.30 | |
| 477 | </version> | |
| 478 | ||
| 479 | </plugin> | |
| 480 | ||
| 481 | ||
| 482 | </plugins> | |
| 483 | ||
| 484 | <resources > | |
| 485 | ||
| 486 | <resource> | |
| 487 | ||
| 488 | <directory > | |
| 489 | src/main/j ava | |
| 490 | </director y> | |
| 491 | ||
| 492 | <excludes> | |
| 493 | ||
| 494 | <exclude> | |
| 495 | **/*.java | |
| 496 | </exclude> | |
| 497 | ||
| 498 | </excludes > | |
| 499 | ||
| 500 | </resource > | |
| 501 | ||
| 502 | </resource s> | |
| 503 | ||
| 504 | <testResou rces> | |
| 505 | ||
| 506 | <testResou rce> | |
| 507 | ||
| 508 | <directory > | |
| 509 | src/test/j ava | |
| 510 | </director y> | |
| 511 | ||
| 512 | <excludes> | |
| 513 | ||
| 514 | <exclude> | |
| 515 | **/*.java | |
| 516 | </exclude> | |
| 517 | ||
| 518 | </excludes > | |
| 519 | ||
| 520 | <filtering > | |
| 521 | true | |
| 522 | </filterin g> | |
| 523 | ||
| 524 | </testReso urce> | |
| 525 | ||
| 526 | </testReso urces> | |
| 527 | ||
| 528 | </build> | |
| 529 | ||
| 530 | <distribut ionManagem ent> | |
| 531 | ||
| 532 | <repositor y> | |
| 533 | ||
| 534 | <id> | |
| 535 | internal | |
| 536 | </id> | |
| 537 | ||
| 538 | <url> | |
| 539 | http:// DNS apphdrrb01 . DNS DOMAIN . EXT :8081/repo sitory/int ernal | |
| 540 | </url> | |
| 541 | ||
| 542 | </reposito ry> | |
| 543 | ||
| 544 | <snapshotR epository> | |
| 545 | ||
| 546 | <id> | |
| 547 | snapshots | |
| 548 | </id> | |
| 549 | ||
| 550 | <url> | |
| 551 | http:// DNS apphdrrb01 . DNS DOMAIN . EXT :8081/repo sitory/sna pshots | |
| 552 | </url> | |
| 553 | ||
| 554 | </snapshot Repository > | |
| 555 | ||
| 556 | <!-- <site > <id>bob- website</i d> <url> $ {build.rep orts.outpu tsite}/${p roject.ver sion} </ur l> </site> --> | |
| 557 | ||
| 558 | </distribu tionManage ment> | |
| 559 | ||
| 560 | <repositor ies> | |
| 561 | ||
| 562 | <repositor y> | |
| 563 | ||
| 564 | <id> | |
| 565 | internal | |
| 566 | </id> | |
| 567 | ||
| 568 | <name> | |
| 569 | Internal R epository | |
| 570 | </name> | |
| 571 | ||
| 572 | <url> | |
| 573 | http:// DNS apphdrrb01 . DNS DOMAIN . EXT :8081/repo sitory/int ernal | |
| 574 | </url> | |
| 575 | ||
| 576 | <releases> | |
| 577 | ||
| 578 | <enabled> | |
| 579 | true | |
| 580 | </enabled> | |
| 581 | ||
| 582 | </releases > | |
| 583 | ||
| 584 | <snapshots > | |
| 585 | ||
| 586 | <enabled> | |
| 587 | false | |
| 588 | </enabled> | |
| 589 | ||
| 590 | </snapshot s> | |
| 591 | ||
| 592 | </reposito ry> | |
| 593 | ||
| 594 | <repositor y> | |
| 595 | ||
| 596 | <id> | |
| 597 | snapshots | |
| 598 | </id> | |
| 599 | ||
| 600 | <name> | |
| 601 | Snapshots | |
| 602 | </name> | |
| 603 | ||
| 604 | <url> | |
| 605 | http:// DNS apphdrrb01 . DNS DOMAIN . EXT :8081/repo sitory/int ernal | |
| 606 | </url> | |
| 607 | ||
| 608 | <releases> | |
| 609 | ||
| 610 | <enabled> | |
| 611 | false | |
| 612 | </enabled> | |
| 613 | ||
| 614 | </releases > | |
| 615 | ||
| 616 | <snapshots > | |
| 617 | ||
| 618 | <enabled> | |
| 619 | true | |
| 620 | </enabled> | |
| 621 | ||
| 622 | </snapshot s> | |
| 623 | ||
| 624 | </reposito ry> | |
| 625 | ||
| 626 | </reposito ries> | |
| 627 | </project> | |
| 628 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.