Produced by Araxis Merge on 6/18/2018 3:37:03 PM Eastern 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_DM2_v7.zip\CTT_ntrt-jira-ssoi-authenticator\authenticator | pom.xml | Tue Jun 12 16:41:30 2018 UTC |
| 2 | CTT_DM2_v7.zip\CTT_ntrt-jira-ssoi-authenticator\authenticator | pom.xml | Tue Jun 12 21:07:21 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 5 | 1580 |
| 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 | <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 | <parent> | |
| 13 | ||
| 14 | <groupId> | |
| 15 | gov.vha.ct t.ntrt | |
| 16 | </groupId> | |
| 17 | ||
| 18 | <artifactI d> | |
| 19 | jira-ssoi- integratio n-parent | |
| 20 | </artifact Id> | |
| 21 | ||
| 22 | <version> | |
| 23 | 1.0 | |
| 24 | </version> | |
| 25 | ||
| 26 | </parent> | |
| 27 | ||
| 28 | ||
| 29 | <artifactI d> | |
| 30 | jira-ssoi- authentica tor | |
| 31 | </artifact Id> | |
| 32 | ||
| 33 | <packaging > | |
| 34 | jar | |
| 35 | </packagin g> | |
| 36 | ||
| 37 | ||
| 38 | <name> | |
| 39 | JIRA SSOi Authentica tor | |
| 40 | </name> | |
| 41 | ||
| 42 | ||
| 43 | <propertie s> | |
| 44 | ||
| 45 | <docker.di r> | |
| 46 | ${project. basedir}/s rc/test/do cker | |
| 47 | </docker.d ir> | |
| 48 | ||
| 49 | </properti es> | |
| 50 | ||
| 51 | ||
| 52 | <dependenc ies> | |
| 53 | ||
| 54 | ||
| 55 | <!-- Guava needs to be up here because o f a load o rdering co nflict --> | |
| 56 | ||
| 57 | <dependenc y> | |
| 58 | ||
| 59 | <groupId> | |
| 60 | com.google .guava | |
| 61 | </groupId> | |
| 62 | ||
| 63 | <artifactI d> | |
| 64 | guava | |
| 65 | </artifact Id> | |
| 66 | ||
| 67 | <version> | |
| 68 | 22.0 | |
| 69 | </version> | |
| 70 | ||
| 71 | <scope> | |
| 72 | test | |
| 73 | </scope> | |
| 74 | ||
| 75 | </dependen cy> | |
| 76 | ||
| 77 | ||
| 78 | <!-- custo mized logi n page --> | |
| 79 | ||
| 80 | <dependenc y> | |
| 81 | ||
| 82 | <groupId> | |
| 83 | gov.vha.ct t.ntrt | |
| 84 | </groupId> | |
| 85 | ||
| 86 | <artifactI d> | |
| 87 | jira-ssoi- login-gadg et | |
| 88 | </artifact Id> | |
| 89 | ||
| 90 | <version> | |
| 91 | ${project. parent.ver sion} | |
| 92 | </version> | |
| 93 | ||
| 94 | <scope> | |
| 95 | provided | |
| 96 | </scope> | |
| 97 | ||
| 98 | </dependen cy> | |
| 99 | ||
| 100 | ||
| 101 | <!-- serap h authenti cation lib rary --> | |
| 102 | ||
| 103 | <dependenc y> | |
| 104 | ||
| 105 | <groupId> | |
| 106 | com.atlass ian.seraph | |
| 107 | </groupId> | |
| 108 | ||
| 109 | <artifactI d> | |
| 110 | atlassian- seraph | |
| 111 | </artifact Id> | |
| 112 | ||
| 113 | <version> | |
| 114 | 3.1.3 | |
| 115 | </version> | |
| 116 | ||
| 117 | <scope> | |
| 118 | provided | |
| 119 | </scope> | |
| 120 | ||
| 121 | </dependen cy> | |
| 122 | ||
| 123 | ||
| 124 | <!-- trans itive jta, jndi depe ndencies a re broken --> | |
| 125 | ||
| 126 | <dependenc y> | |
| 127 | ||
| 128 | <groupId> | |
| 129 | com.atlass ian.jira | |
| 130 | </groupId> | |
| 131 | ||
| 132 | <artifactI d> | |
| 133 | jira-core | |
| 134 | </artifact Id> | |
| 135 | ||
| 136 | <version> | |
| 137 | 7.4.1 | |
| 138 | </version> | |
| 139 | ||
| 140 | <exclusion s> | |
| 141 | ||
| 142 | <exclusion > | |
| 143 | ||
| 144 | <groupId> | |
| 145 | jta | |
| 146 | </groupId> | |
| 147 | ||
| 148 | <artifactI d> | |
| 149 | jta | |
| 150 | </artifact Id> | |
| 151 | ||
| 152 | </exclusio n> | |
| 153 | ||
| 154 | <exclusion > | |
| 155 | ||
| 156 | <groupId> | |
| 157 | jndi | |
| 158 | </groupId> | |
| 159 | ||
| 160 | <artifactI d> | |
| 161 | jndi | |
| 162 | </artifact Id> | |
| 163 | ||
| 164 | </exclusio n> | |
| 165 | ||
| 166 | </exclusio ns> | |
| 167 | ||
| 168 | <scope> | |
| 169 | provided | |
| 170 | </scope> | |
| 171 | ||
| 172 | </dependen cy> | |
| 173 | ||
| 174 | ||
| 175 | <dependenc y> | |
| 176 | ||
| 177 | <groupId> | |
| 178 | com.atlass ian.jira | |
| 179 | </groupId> | |
| 180 | ||
| 181 | <artifactI d> | |
| 182 | jira-gadge ts-plugin | |
| 183 | </artifact Id> | |
| 184 | ||
| 185 | <version> | |
| 186 | ${jira.gad gets.versi on} | |
| 187 | </version> | |
| 188 | ||
| 189 | <scope> | |
| 190 | provided | |
| 191 | </scope> | |
| 192 | ||
| 193 | </dependen cy> | |
| 194 | ||
| 195 | ||
| 196 | <!-- test scope --> | |
| 197 | ||
| 198 | <dependenc y> | |
| 199 | ||
| 200 | <groupId> | |
| 201 | com.codebo rne | |
| 202 | </groupId> | |
| 203 | ||
| 204 | <artifactI d> | |
| 205 | selenide | |
| 206 | </artifact Id> | |
| 207 | ||
| 208 | <version> | |
| 209 | 4.5.1 | |
| 210 | </version> | |
| 211 | ||
| 212 | <scope> | |
| 213 | test | |
| 214 | </scope> | |
| 215 | ||
| 216 | </dependen cy> | |
| 217 | ||
| 218 | <dependenc y> | |
| 219 | ||
| 220 | <groupId> | |
| 221 | com.square up.okhttp3 | |
| 222 | </groupId> | |
| 223 | ||
| 224 | <artifactI d> | |
| 225 | okhttp | |
| 226 | </artifact Id> | |
| 227 | ||
| 228 | <version> | |
| 229 | 3.8.1 | |
| 230 | </version> | |
| 231 | ||
| 232 | <scope> | |
| 233 | test | |
| 234 | </scope> | |
| 235 | ||
| 236 | </dependen cy> | |
| 237 | ||
| 238 | <dependenc y> | |
| 239 | ||
| 240 | <groupId> | |
| 241 | org.jsoup | |
| 242 | </groupId> | |
| 243 | ||
| 244 | <artifactI d> | |
| 245 | jsoup | |
| 246 | </artifact Id> | |
| 247 | ||
| 248 | <version> | |
| 249 | 1.10.3 | |
| 250 | </version> | |
| 251 | ||
| 252 | <scope> | |
| 253 | test | |
| 254 | </scope> | |
| 255 | ||
| 256 | </dependen cy> | |
| 257 | ||
| 258 | <dependenc y> | |
| 259 | ||
| 260 | <groupId> | |
| 261 | org.assert j | |
| 262 | </groupId> | |
| 263 | ||
| 264 | <artifactI d> | |
| 265 | assertj-co re | |
| 266 | </artifact Id> | |
| 267 | ||
| 268 | <version> | |
| 269 | 3.8.0 | |
| 270 | </version> | |
| 271 | ||
| 272 | <scope> | |
| 273 | test | |
| 274 | </scope> | |
| 275 | ||
| 276 | </dependen cy> | |
| 277 | ||
| 278 | <dependenc y> | |
| 279 | ||
| 280 | <groupId> | |
| 281 | org.spring framework | |
| 282 | </groupId> | |
| 283 | ||
| 284 | <artifactI d> | |
| 285 | spring-tes t | |
| 286 | </artifact Id> | |
| 287 | ||
| 288 | <version> | |
| 289 | 4.3.10.REL EASE | |
| 290 | </version> | |
| 291 | ||
| 292 | <scope> | |
| 293 | test | |
| 294 | </scope> | |
| 295 | ||
| 296 | </dependen cy> | |
| 297 | ||
| 298 | <dependenc y> | |
| 299 | ||
| 300 | <groupId> | |
| 301 | org.mockit o | |
| 302 | </groupId> | |
| 303 | ||
| 304 | <artifactI d> | |
| 305 | mockito-co re | |
| 306 | </artifact Id> | |
| 307 | ||
| 308 | <version> | |
| 309 | 2.8.47 | |
| 310 | </version> | |
| 311 | ||
| 312 | <scope> | |
| 313 | test | |
| 314 | </scope> | |
| 315 | ||
| 316 | </dependen cy> | |
| 317 | ||
| 318 | <dependenc y> | |
| 319 | ||
| 320 | <groupId> | |
| 321 | com.atlass ian.jira | |
| 322 | </groupId> | |
| 323 | ||
| 324 | <artifactI d> | |
| 325 | jira-tests | |
| 326 | </artifact Id> | |
| 327 | ||
| 328 | <version> | |
| 329 | 7.3.7 | |
| 330 | </version> | |
| 331 | ||
| 332 | <scope> | |
| 333 | test | |
| 334 | </scope> | |
| 335 | ||
| 336 | </dependen cy> | |
| 337 | ||
| 338 | </dependen cies> | |
| 339 | ||
| 340 | ||
| 341 | <build> | |
| 342 | ||
| 343 | <finalName > | |
| 344 | jira-ssoi- authentica tor | |
| 345 | </finalNam e> | |
| 346 | ||
| 347 | <plugins> | |
| 348 | ||
| 349 | ||
| 350 | <!-- creat e a jar of the authe nticator - -> | |
| 351 | ||
| 352 | <plugin> | |
| 353 | ||
| 354 | <groupId> | |
| 355 | org.apache .maven.plu gins | |
| 356 | </groupId> | |
| 357 | ||
| 358 | <artifactI d> | |
| 359 | maven-jar- plugin | |
| 360 | </artifact Id> | |
| 361 | ||
| 362 | <version> | |
| 363 | 3.0.2 | |
| 364 | </version> | |
| 365 | ||
| 366 | </plugin> | |
| 367 | ||
| 368 | ||
| 369 | <!-- creat e an assem bly contai ning the j ar and the seraph-co nfig file --> | |
| 370 | ||
| 371 | <plugin> | |
| 372 | ||
| 373 | <groupId> | |
| 374 | org.apache .maven.plu gins | |
| 375 | </groupId> | |
| 376 | ||
| 377 | <artifactI d> | |
| 378 | maven-asse mbly-plugi n | |
| 379 | </artifact Id> | |
| 380 | ||
| 381 | <version> | |
| 382 | 2.4.1 | |
| 383 | </version> | |
| 384 | ||
| 385 | <configura tion> | |
| 386 | ||
| 387 | <descripto r> | |
| 388 | src/main/a ssembly/bi n.xml | |
| 389 | </descript or> | |
| 390 | ||
| 391 | <finalName > | |
| 392 | jira-ssoi- authentica tor | |
| 393 | </finalNam e> | |
| 394 | ||
| 395 | </configur ation> | |
| 396 | ||
| 397 | <execution s> | |
| 398 | ||
| 399 | <execution > | |
| 400 | ||
| 401 | <phase> | |
| 402 | package | |
| 403 | </phase> | |
| 404 | ||
| 405 | <goals> | |
| 406 | ||
| 407 | <goal> | |
| 408 | single | |
| 409 | </goal> | |
| 410 | ||
| 411 | </goals> | |
| 412 | ||
| 413 | </executio n> | |
| 414 | ||
| 415 | </executio ns> | |
| 416 | ||
| 417 | </plugin> | |
| 418 | ||
| 419 | ||
| 420 | <!-- bind the failsa fe plugin --> | |
| 421 | <!-- todo: fix docke r containe r issues a nd reenabl e | |
| 422 | <plugin> | |
| 423 | <gro upId>org.a pache.mave n.plugins< /groupId> | |
| 424 | <art ifactId>ma ven-failsa fe-plugin< /artifactI d> | |
| 425 | <ver sion>2.20< /version> | |
| 426 | <exe cutions> | |
| 427 | <execution > | |
| 428 | <goals > | |
| 429 | <g oal>integr ation-test </goal> | |
| 430 | <g oal>verify </goal> | |
| 431 | </goal s> | |
| 432 | </executio n> | |
| 433 | </ex ecutions> | |
| 434 | </plugin > | |
| 435 | --> | |
| 436 | ||
| 437 | ||
| 438 | <!-- copy the modifi ed and ori ginal logi n gadgets --> | |
| 439 | ||
| 440 | <plugin> | |
| 441 | ||
| 442 | <groupId> | |
| 443 | org.apache .maven.plu gins | |
| 444 | </groupId> | |
| 445 | ||
| 446 | <artifactI d> | |
| 447 | maven-depe ndency-plu gin | |
| 448 | </artifact Id> | |
| 449 | ||
| 450 | <execution s> | |
| 451 | ||
| 452 | <execution > | |
| 453 | ||
| 454 | <goals> | |
| 455 | ||
| 456 | <goal> | |
| 457 | copy | |
| 458 | </goal> | |
| 459 | ||
| 460 | </goals> | |
| 461 | ||
| 462 | <configura tion> | |
| 463 | ||
| 464 | <artifactI tems> | |
| 465 | ||
| 466 | <artifactI tem> | |
| 467 | ||
| 468 | <groupId> | |
| 469 | gov.vha.ct t.ntrt | |
| 470 | </groupId> | |
| 471 | ||
| 472 | <artifactI d> | |
| 473 | jira-ssoi- login-gadg et | |
| 474 | </artifact Id> | |
| 475 | ||
| 476 | <version> | |
| 477 | ${project. parent.ver sion} | |
| 478 | </version> | |
| 479 | ||
| 480 | <type> | |
| 481 | jar | |
| 482 | </type> | |
| 483 | ||
| 484 | </artifact Item> | |
| 485 | ||
| 486 | <artifactI tem> | |
| 487 | ||
| 488 | <groupId> | |
| 489 | com.atlass ian.jira | |
| 490 | </groupId> | |
| 491 | ||
| 492 | <artifactI d> | |
| 493 | jira-gadge ts-plugin | |
| 494 | </artifact Id> | |
| 495 | ||
| 496 | <version> | |
| 497 | ${jira.gad gets.versi on} | |
| 498 | </version> | |
| 499 | ||
| 500 | <type> | |
| 501 | jar | |
| 502 | </type> | |
| 503 | ||
| 504 | </artifact Item> | |
| 505 | ||
| 506 | </artifact Items> | |
| 507 | ||
| 508 | </configur ation> | |
| 509 | ||
| 510 | </executio n> | |
| 511 | ||
| 512 | </executio ns> | |
| 513 | ||
| 514 | </plugin> | |
| 515 | ||
| 516 | ||
| 517 | <!-- copy assembly i nto the ji ra build d irectory - -> | |
| 518 | ||
| 519 | <plugin> | |
| 520 | ||
| 521 | <artifactI d> | |
| 522 | maven-reso urces-plug in | |
| 523 | </artifact Id> | |
| 524 | ||
| 525 | <version> | |
| 526 | 3.0.2 | |
| 527 | </version> | |
| 528 | ||
| 529 | <execution s> | |
| 530 | ||
| 531 | <execution > | |
| 532 | ||
| 533 | <id> | |
| 534 | copy-to-do cker | |
| 535 | </id> | |
| 536 | ||
| 537 | <phase> | |
| 538 | package | |
| 539 | </phase> | |
| 540 | ||
| 541 | <goals> | |
| 542 | ||
| 543 | <goal> | |
| 544 | copy-resou rces | |
| 545 | </goal> | |
| 546 | ||
| 547 | </goals> | |
| 548 | ||
| 549 | <configura tion> | |
| 550 | ||
| 551 | <outputDir ectory> | |
| 552 | ${docker.d ir}/jira/b uild | |
| 553 | </outputDi rectory> | |
| 554 | ||
| 555 | <resources > | |
| 556 | ||
| 557 | <resource> | |
| 558 | ||
| 559 | <directory > | |
| 560 | ${project. build.dire ctory} | |
| 561 | </director y> | |
| 562 | ||
| 563 | <includes> | |
| 564 | ||
| 565 | <include> | |
| 566 | jira-ssoi- authentica tor-bin.ta r.gz | |
| 567 | </include> | |
| 568 | ||
| 569 | </includes > | |
| 570 | ||
| 571 | </resource > | |
| 572 | ||
| 573 | </resource s> | |
| 574 | ||
| 575 | </configur ation> | |
| 576 | ||
| 577 | </executio n> | |
| 578 | ||
| 579 | </executio ns> | |
| 580 | ||
| 581 | </plugin> | |
| 582 | ||
| 583 | ||
| 584 | <!-- user docker to run contai ner agains t which in tegration tests will be execut ed --> | |
| 585 | ||
| 586 | <plugin> | |
| 587 | ||
| 588 | <groupId> | |
| 589 | io.fabric8 | |
| 590 | </groupId> | |
| 591 | ||
| 592 | <artifactI d> | |
| 593 | docker-mav en-plugin | |
| 594 | </artifact Id> | |
| 595 | ||
| 596 | <version> | |
| 597 | 0.21.0 | |
| 598 | </version> | |
| 599 | ||
| 600 | <configura tion> | |
| 601 | ||
| 602 | <autoCreat eCustomNet works> | |
| 603 | true | |
| 604 | </autoCrea teCustomNe tworks> | |
| 605 | ||
| 606 | <images> | |
| 607 | ||
| 608 | <image> | |
| 609 | ||
| 610 | <name> | |
| 611 | ctt/ntrt-a pache | |
| 612 | </name> | |
| 613 | ||
| 614 | <build> | |
| 615 | ||
| 616 | <dockerFil eDir> | |
| 617 | ${docker.d ir}/apache | |
| 618 | </dockerFi leDir> | |
| 619 | ||
| 620 | </build> | |
| 621 | ||
| 622 | <run> | |
| 623 | ||
| 624 | <ports> | |
| 625 | ||
| 626 | <port> | |
| 627 | 443 | |
| 628 | </port> | |
| 629 | ||
| 630 | <port> | |
| 631 | 12399:443 | |
| 632 | </port> | |
| 633 | ||
| 634 | </ports> | |
| 635 | ||
| 636 | <hostname> | |
| 637 | DNS | |
| 638 | </hostname > | |
| 639 | ||
| 640 | <log> | |
| 641 | ||
| 642 | <prefix> | |
| 643 | APACHE | |
| 644 | </prefix> | |
| 645 | ||
| 646 | </log> | |
| 647 | ||
| 648 | <network> | |
| 649 | ||
| 650 | <name> | |
| 651 | main | |
| 652 | </name> | |
| 653 | ||
| 654 | <alias> | |
| 655 | apache | |
| 656 | </alias> | |
| 657 | ||
| 658 | <alias> | |
| 659 | DNS | |
| 660 | </alias> | |
| 661 | ||
| 662 | </network> | |
| 663 | ||
| 664 | <wait> | |
| 665 | ||
| 666 | <http> | |
| 667 | ||
| 668 | <url> | |
| 669 | https://lo calhost:12 399/ntrt/ | |
| 670 | </url> | |
| 671 | ||
| 672 | <method> | |
| 673 | GET | |
| 674 | </method> | |
| 675 | ||
| 676 | <status> | |
| 677 | 200 | |
| 678 | </status> | |
| 679 | ||
| 680 | <allowAllH osts> | |
| 681 | true | |
| 682 | </allowAll Hosts> | |
| 683 | ||
| 684 | </http> | |
| 685 | ||
| 686 | <time> | |
| 687 | 300000 | |
| 688 | </time> | |
| 689 | ||
| 690 | </wait> | |
| 691 | ||
| 692 | </run> | |
| 693 | ||
| 694 | </image> | |
| 695 | ||
| 696 | <image> | |
| 697 | ||
| 698 | <name> | |
| 699 | ctt/ntrt-j ira | |
| 700 | </name> | |
| 701 | ||
| 702 | <build> | |
| 703 | ||
| 704 | <dockerFil eDir> | |
| 705 | ${docker.d ir}/jira | |
| 706 | </dockerFi leDir> | |
| 707 | ||
| 708 | </build> | |
| 709 | ||
| 710 | <run> | |
| 711 | ||
| 712 | <ports> | |
| 713 | ||
| 714 | <port> | |
| 715 | 8088:8088 | |
| 716 | </port> | |
| 717 | ||
| 718 | </ports> | |
| 719 | ||
| 720 | <hostname> | |
| 721 | DNS | |
| 722 | </hostname > | |
| 723 | ||
| 724 | <log> | |
| 725 | ||
| 726 | <prefix> | |
| 727 | JIRA | |
| 728 | </prefix> | |
| 729 | ||
| 730 | <enabled> | |
| 731 | false | |
| 732 | </enabled> | |
| 733 | ||
| 734 | </log> | |
| 735 | ||
| 736 | <network> | |
| 737 | ||
| 738 | <name> | |
| 739 | main | |
| 740 | </name> | |
| 741 | ||
| 742 | <alias> | |
| 743 | jira | |
| 744 | </alias> | |
| 745 | ||
| 746 | <alias> | |
| 747 | DNS | |
| 748 | </alias> | |
| 749 | ||
| 750 | </network> | |
| 751 | ||
| 752 | </run> | |
| 753 | ||
| 754 | </image> | |
| 755 | ||
| 756 | </images> | |
| 757 | ||
| 758 | <verbose> | |
| 759 | true | |
| 760 | </verbose> | |
| 761 | ||
| 762 | </configur ation> | |
| 763 | <!-- | |
| 764 | <exe cutions> | |
| 765 | <execution > | |
| 766 | <id>do cker-build </id> | |
| 767 | <goals > | |
| 768 | <g oal>build< /goal> | |
| 769 | </goal s> | |
| 770 | </executio n> | |
| 771 | <execution > | |
| 772 | <id>st art</id> | |
| 773 | <phase >pre-integ ration-tes t</phase> | |
| 774 | <goals > | |
| 775 | <g oal>build< /goal> | |
| 776 | <g oal>start< /goal> | |
| 777 | </goal s> | |
| 778 | </executio n> | |
| 779 | <execution > | |
| 780 | <id>st op</id> | |
| 781 | <phase >post-inte gration-te st</phase> | |
| 782 | <goals > | |
| 783 | <g oal>stop</ goal> | |
| 784 | </goal s> | |
| 785 | </executio n> | |
| 786 | </ex ecutions> | |
| 787 | --> | |
| 788 | ||
| 789 | </plugin> | |
| 790 | ||
| 791 | </plugins> | |
| 792 | ||
| 793 | </build> | |
| 794 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.