Produced by Araxis Merge on 12/21/2017 6:15:12 PM Eastern 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 | Genisis_2.0_v7_bld7.zip\TS\CLI | pom.xml | Thu Dec 14 19:52:55 2017 UTC |
| 2 | Genisis_2.0_v7_bld7.zip\TS\CLI | pom.xml | Thu Dec 21 14:18:15 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 1064 |
| Changed | 3 | 6 |
| 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 | <groupId> | |
| 12 | gov.va.gen isis2 | |
| 13 | </groupId> | |
| 14 | ||
| 15 | <artifactI d> | |
| 16 | tsed | |
| 17 | </artifact Id> | |
| 18 | ||
| 19 | <version> | |
| 20 | 1.0.1 | |
| 21 | </version> | |
| 22 | ||
| 23 | ||
| 24 | <!-- SCM c onnection properties for mvn r elease plu gin --> | |
| 25 | ||
| 26 | <scm> | |
| 27 | ||
| 28 | <connectio n> | |
| 29 | scm:git:gi t://github .boozallen csn.com/HE ALTH-ACCT- GROUP/Geni sis2-Termi nology-CLI .git | |
| 30 | </connecti on> | |
| 31 | ||
| 32 | <developer Connection > | |
| 33 | scm:git:gi t@github.b oozallencs n.com:HEAL TH-ACCT-GR OUP/Genisi s2-Termino logy-CLI.g it | |
| 34 | </develope rConnectio n> | |
| 35 | ||
| 36 | <url> | |
| 37 | https://gi thub.booza llencsn.co m/HEALTH-A CCT-GROUP/ Genisis2-T erminology -CLI | |
| 38 | </url> | |
| 39 | ||
| 40 | <tag> | |
| 41 | tsed-1.0.1 | |
| 42 | </tag> | |
| 43 | ||
| 44 | </scm> | |
| 45 | ||
| 46 | ||
| 47 | <dependenc ies> | |
| 48 | ||
| 49 | <dependenc y> | |
| 50 | ||
| 51 | <groupId> | |
| 52 | gov.va.gen isis2 | |
| 53 | </groupId> | |
| 54 | ||
| 55 | <artifactI d> | |
| 56 | ts-common- api | |
| 57 | </artifact Id> | |
| 58 | ||
| 59 | <version> | |
| 60 | 1.0.3 | |
| 61 | </version> | |
| 62 | ||
| 63 | </dependen cy> | |
| 64 | ||
| 65 | <dependenc y> | |
| 66 | ||
| 67 | <groupId> | |
| 68 | commons-cl i | |
| 69 | </groupId> | |
| 70 | ||
| 71 | <artifactI d> | |
| 72 | commons-cl i | |
| 73 | </artifact Id> | |
| 74 | ||
| 75 | <version> | |
| 76 | 1.4 | |
| 77 | </version> | |
| 78 | ||
| 79 | </dependen cy> | |
| 80 | ||
| 81 | <dependenc y> | |
| 82 | ||
| 83 | <groupId> | |
| 84 | log4j | |
| 85 | </groupId> | |
| 86 | ||
| 87 | <artifactI d> | |
| 88 | log4j | |
| 89 | </artifact Id> | |
| 90 | ||
| 91 | <version> | |
| 92 | 1.2.12 | |
| 93 | </version> | |
| 94 | ||
| 95 | </dependen cy> | |
| 96 | ||
| 97 | <dependenc y> | |
| 98 | ||
| 99 | <groupId> | |
| 100 | com.faster xml.jackso n.core | |
| 101 | </groupId> | |
| 102 | ||
| 103 | <artifactI d> | |
| 104 | jackson-da tabind | |
| 105 | </artifact Id> | |
| 106 | ||
| 107 | <version> | |
| 108 | 2.7.9 | |
| 109 | </version> | |
| 110 | ||
| 111 | </dependen cy> | |
| 112 | ||
| 113 | </dependen cies> | |
| 114 | ||
| 115 | ||
| 116 | <build> | |
| 117 | ||
| 118 | <finalName > | |
| 119 | ${project. artifactId } | |
| 120 | </finalNam e> | |
| 121 | ||
| 122 | <sourceDir ectory> | |
| 123 | src/main/j ava | |
| 124 | </sourceDi rectory> | |
| 125 | ||
| 126 | <resources > | |
| 127 | ||
| 128 | <resource> | |
| 129 | ||
| 130 | <directory > | |
| 131 | src/main/r esources | |
| 132 | </director y> | |
| 133 | ||
| 134 | <includes> | |
| 135 | ||
| 136 | <include> | |
| 137 | **/* | |
| 138 | </include> | |
| 139 | ||
| 140 | </includes > | |
| 141 | ||
| 142 | </resource > | |
| 143 | ||
| 144 | </resource s> | |
| 145 | ||
| 146 | ||
| 147 | <pluginMan agement> | |
| 148 | ||
| 149 | <plugins> | |
| 150 | ||
| 151 | <plugin> | |
| 152 | ||
| 153 | <groupId> | |
| 154 | org.apache .maven.plu gins | |
| 155 | </groupId> | |
| 156 | ||
| 157 | <artifactI d> | |
| 158 | maven-comp iler-plugi n | |
| 159 | </artifact Id> | |
| 160 | ||
| 161 | <version> | |
| 162 | 3.6.2 | |
| 163 | </version> | |
| 164 | ||
| 165 | </plugin> | |
| 166 | ||
| 167 | <plugin> | |
| 168 | ||
| 169 | <groupId> | |
| 170 | org.apache .maven.plu gins | |
| 171 | </groupId> | |
| 172 | ||
| 173 | <artifactI d> | |
| 174 | maven-war- plugin | |
| 175 | </artifact Id> | |
| 176 | ||
| 177 | <version> | |
| 178 | 3.1.0 | |
| 179 | </version> | |
| 180 | ||
| 181 | </plugin> | |
| 182 | ||
| 183 | <plugin> | |
| 184 | ||
| 185 | <groupId> | |
| 186 | org.apache .tomcat.ma ven | |
| 187 | </groupId> | |
| 188 | ||
| 189 | <artifactI d> | |
| 190 | tomcat7-ma ven-plugin | |
| 191 | </artifact Id> | |
| 192 | ||
| 193 | <version> | |
| 194 | 2.2 | |
| 195 | </version> | |
| 196 | ||
| 197 | </plugin> | |
| 198 | ||
| 199 | <plugin> | |
| 200 | ||
| 201 | <groupId> | |
| 202 | org.apache .maven.plu gins | |
| 203 | </groupId> | |
| 204 | ||
| 205 | <artifactI d> | |
| 206 | maven-sour ce-plugin | |
| 207 | </artifact Id> | |
| 208 | ||
| 209 | <version> | |
| 210 | 3.0.1 | |
| 211 | </version> | |
| 212 | ||
| 213 | </plugin> | |
| 214 | ||
| 215 | <plugin> | |
| 216 | ||
| 217 | <groupId> | |
| 218 | org.apache .maven.plu gins | |
| 219 | </groupId> | |
| 220 | ||
| 221 | <artifactI d> | |
| 222 | maven-java doc-plugin | |
| 223 | </artifact Id> | |
| 224 | ||
| 225 | <version> | |
| 226 | 3.0.0-M1 | |
| 227 | </version> | |
| 228 | ||
| 229 | </plugin> | |
| 230 | ||
| 231 | <plugin> | |
| 232 | ||
| 233 | <groupId> | |
| 234 | org.apache .maven.plu gins | |
| 235 | </groupId> | |
| 236 | ||
| 237 | <artifactI d> | |
| 238 | maven-depl oy-plugin | |
| 239 | </artifact Id> | |
| 240 | ||
| 241 | <version> | |
| 242 | 2.8.2 | |
| 243 | </version> | |
| 244 | ||
| 245 | </plugin> | |
| 246 | ||
| 247 | <plugin> | |
| 248 | ||
| 249 | <groupId> | |
| 250 | org.apache .maven.plu gins | |
| 251 | </groupId> | |
| 252 | ||
| 253 | <artifactI d> | |
| 254 | maven-rele ase-plugin | |
| 255 | </artifact Id> | |
| 256 | ||
| 257 | <version> | |
| 258 | 2.5.3 | |
| 259 | </version> | |
| 260 | ||
| 261 | <dependenc ies> | |
| 262 | ||
| 263 | <dependenc y> | |
| 264 | ||
| 265 | <groupId> | |
| 266 | org.apache .maven.scm | |
| 267 | </groupId> | |
| 268 | ||
| 269 | <artifactI d> | |
| 270 | maven-scm- provider-g itexe | |
| 271 | </artifact Id> | |
| 272 | ||
| 273 | <version> | |
| 274 | 1.8.1 | |
| 275 | </version> | |
| 276 | ||
| 277 | </dependen cy> | |
| 278 | ||
| 279 | </dependen cies> | |
| 280 | ||
| 281 | </plugin> | |
| 282 | ||
| 283 | </plugins> | |
| 284 | ||
| 285 | </pluginMa nagement> | |
| 286 | ||
| 287 | ||
| 288 | <plugins> | |
| 289 | ||
| 290 | <plugin> | |
| 291 | ||
| 292 | <groupId> | |
| 293 | org.apache .maven.plu gins | |
| 294 | </groupId> | |
| 295 | ||
| 296 | <artifactI d> | |
| 297 | maven-comp iler-plugi n | |
| 298 | </artifact Id> | |
| 299 | ||
| 300 | <configura tion> | |
| 301 | ||
| 302 | <source> | |
| 303 | 1.8 | |
| 304 | </source> | |
| 305 | ||
| 306 | <target> | |
| 307 | 1.8 | |
| 308 | </target> | |
| 309 | ||
| 310 | </configur ation> | |
| 311 | ||
| 312 | </plugin> | |
| 313 | ||
| 314 | <plugin> | |
| 315 | ||
| 316 | <groupId> | |
| 317 | org.apache .maven.plu gins | |
| 318 | </groupId> | |
| 319 | ||
| 320 | <artifactI d> | |
| 321 | maven-asse mbly-plugi n | |
| 322 | </artifact Id> | |
| 323 | ||
| 324 | <configura tion> | |
| 325 | ||
| 326 | <archive> | |
| 327 | ||
| 328 | <manifest> | |
| 329 | ||
| 330 | <addClassp ath> | |
| 331 | true | |
| 332 | </addClass path> | |
| 333 | ||
| 334 | <mainClass > | |
| 335 | gov.va.gen isis2.Term Cli | |
| 336 | </mainClas s> | |
| 337 | ||
| 338 | </manifest > | |
| 339 | ||
| 340 | </archive> | |
| 341 | ||
| 342 | <descripto rs> | |
| 343 | ||
| 344 | <descripto r> | |
| 345 | src/main/a ssembly/ja r-with-dep endencies. xml | |
| 346 | </descript or> | |
| 347 | ||
| 348 | </descript ors> | |
| 349 | ||
| 350 | <!--<descr iptorRefs> <descript orRef>jar- with-depen dencies</d escriptorR ef> | |
| 351 | </ descriptor Refs> --> | |
| 352 | ||
| 353 | </configur ation> | |
| 354 | ||
| 355 | <execution s> | |
| 356 | ||
| 357 | <execution > | |
| 358 | ||
| 359 | <id> | |
| 360 | make-assem bly | |
| 361 | </id> | |
| 362 | ||
| 363 | <phase> | |
| 364 | package | |
| 365 | </phase> | |
| 366 | ||
| 367 | <goals> | |
| 368 | ||
| 369 | <goal> | |
| 370 | single | |
| 371 | </goal> | |
| 372 | ||
| 373 | </goals> | |
| 374 | ||
| 375 | </executio n> | |
| 376 | ||
| 377 | </executio ns> | |
| 378 | ||
| 379 | </plugin> | |
| 380 | ||
| 381 | <plugin> | |
| 382 | ||
| 383 | <groupId> | |
| 384 | org.apache .maven.plu gins | |
| 385 | </groupId> | |
| 386 | ||
| 387 | <artifactI d> | |
| 388 | maven-sour ce-plugin | |
| 389 | </artifact Id> | |
| 390 | ||
| 391 | </plugin> | |
| 392 | ||
| 393 | <plugin> | |
| 394 | ||
| 395 | <groupId> | |
| 396 | org.apache .maven.plu gins | |
| 397 | </groupId> | |
| 398 | ||
| 399 | <artifactI d> | |
| 400 | maven-java doc-plugin | |
| 401 | </artifact Id> | |
| 402 | ||
| 403 | </plugin> | |
| 404 | ||
| 405 | <plugin> | |
| 406 | ||
| 407 | <groupId> | |
| 408 | org.apache .maven.plu gins | |
| 409 | </groupId> | |
| 410 | ||
| 411 | <artifactI d> | |
| 412 | maven-depl oy-plugin | |
| 413 | </artifact Id> | |
| 414 | ||
| 415 | </plugin> | |
| 416 | ||
| 417 | <plugin> | |
| 418 | ||
| 419 | <groupId> | |
| 420 | org.apache .maven.plu gins | |
| 421 | </groupId> | |
| 422 | ||
| 423 | <artifactI d> | |
| 424 | maven-rele ase-plugin | |
| 425 | </artifact Id> | |
| 426 | ||
| 427 | <configura tion> | |
| 428 | ||
| 429 | <checkModi ficationEx cludes> | |
| 430 | ||
| 431 | <checkModi ficationEx clude> | |
| 432 | .gitignore | |
| 433 | </checkMod ificationE xclude> | |
| 434 | ||
| 435 | </checkMod ificationE xcludes> | |
| 436 | ||
| 437 | </configur ation> | |
| 438 | ||
| 439 | <dependenc ies> | |
| 440 | ||
| 441 | <dependenc y> | |
| 442 | ||
| 443 | <groupId> | |
| 444 | org.apache .maven.scm | |
| 445 | </groupId> | |
| 446 | ||
| 447 | <artifactI d> | |
| 448 | maven-scm- provider-g itexe | |
| 449 | </artifact Id> | |
| 450 | ||
| 451 | <version> | |
| 452 | 1.8.1 | |
| 453 | </version> | |
| 454 | ||
| 455 | </dependen cy> | |
| 456 | ||
| 457 | </dependen cies> | |
| 458 | ||
| 459 | </plugin> | |
| 460 | ||
| 461 | </plugins> | |
| 462 | ||
| 463 | </build> | |
| 464 | ||
| 465 | ||
| 466 | <distribut ionManagem ent> | |
| 467 | ||
| 468 | <!-- Publi sh the ver sioned rel eases here --> | |
| 469 | ||
| 470 | <repositor y> | |
| 471 | ||
| 472 | <id> | |
| 473 | nexus | |
| 474 | </id> | |
| 475 | ||
| 476 | <url> | |
| 477 | http:// IP /nexus/con tent/repos itories/re leases | |
| 478 | </url> | |
| 479 | ||
| 480 | </reposito ry> | |
| 481 | ||
| 482 | ||
| 483 | <!-- Publi sh the sna pshot rele ases here --> | |
| 484 | ||
| 485 | <snapshotR epository> | |
| 486 | ||
| 487 | <id> | |
| 488 | nexus | |
| 489 | </id> | |
| 490 | ||
| 491 | <url> | |
| 492 | http:// IP /nexus/con tent/repos itories/sn apshots | |
| 493 | </url> | |
| 494 | ||
| 495 | </snapshot Repository > | |
| 496 | ||
| 497 | </distribu tionManage ment> | |
| 498 | ||
| 499 | ||
| 500 | <repositor ies> | |
| 501 | ||
| 502 | <repositor y> | |
| 503 | ||
| 504 | <id> | |
| 505 | nexus | |
| 506 | </id> | |
| 507 | ||
| 508 | <name> | |
| 509 | genisis-re leases | |
| 510 | </name> | |
| 511 | ||
| 512 | <url> | |
| 513 | http:// IP /nexus/con tent/repos itories/re leases | |
| 514 | </url> | |
| 515 | ||
| 516 | <releases> | |
| 517 | ||
| 518 | <enabled> | |
| 519 | true | |
| 520 | </enabled> | |
| 521 | ||
| 522 | </releases > | |
| 523 | ||
| 524 | <snapshots > | |
| 525 | ||
| 526 | <enabled> | |
| 527 | false | |
| 528 | </enabled> | |
| 529 | ||
| 530 | </snapshot s> | |
| 531 | ||
| 532 | </reposito ry> | |
| 533 | ||
| 534 | </reposito ries> | |
| 535 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.