Produced by Araxis Merge on 12/20/2017 5:56:05 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_v6_bld6.zip\Source Code\TS\Service\common | pom.xml | Thu Dec 14 19:56:16 2017 UTC |
| 2 | Genisis_2.0_v6_bld6.zip\Source Code\TS\Service\common | pom.xml | Wed Dec 20 13:55:14 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 1090 |
| Changed | 2 | 4 |
| 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 | ts-common- parent | |
| 17 | </artifact Id> | |
| 18 | ||
| 19 | <version> | |
| 20 | 7.0.5-SNAP SHOT | |
| 21 | </version> | |
| 22 | ||
| 23 | <packaging > | |
| 24 | pom | |
| 25 | </packagin g> | |
| 26 | ||
| 27 | <name> | |
| 28 | ts-common- parent | |
| 29 | </name> | |
| 30 | ||
| 31 | <descripti on> | |
| 32 | Common par ent projec t for Term inology Se rvice | |
| 33 | </descript ion> | |
| 34 | ||
| 35 | ||
| 36 | <modules> | |
| 37 | ||
| 38 | <module> | |
| 39 | ts-common- api | |
| 40 | </module> | |
| 41 | ||
| 42 | <module> | |
| 43 | ts-common- data | |
| 44 | </module> | |
| 45 | ||
| 46 | </modules> | |
| 47 | ||
| 48 | ||
| 49 | <propertie s> | |
| 50 | ||
| 51 | <ts.common .api.versi on> | |
| 52 | 7.0.5-SNAP SHOT | |
| 53 | </ts.commo n.api.vers ion> | |
| 54 | ||
| 55 | <spring.ve rsion> | |
| 56 | 4.3.2.RELE ASE | |
| 57 | </spring.v ersion> | |
| 58 | ||
| 59 | <spring.da ta.jpa.ver sion> | |
| 60 | 1.10.11.RE LEASE | |
| 61 | </spring.d ata.jpa.ve rsion> | |
| 62 | ||
| 63 | <hibernate .version> | |
| 64 | 5.2.10.Fin al | |
| 65 | </hibernat e.version> | |
| 66 | ||
| 67 | <mssql.jdb c.driver.v ersion> | |
| 68 | 6.2.1.jre8 | |
| 69 | </mssql.jd bc.driver. version> | |
| 70 | ||
| 71 | <log4j.ver sion> | |
| 72 | 2.7 | |
| 73 | </log4j.ve rsion> | |
| 74 | ||
| 75 | <jackson.v ersion> | |
| 76 | 2.7.9 | |
| 77 | </jackson. version> | |
| 78 | ||
| 79 | <junit.ver sion> | |
| 80 | 3.8.1 | |
| 81 | </junit.ve rsion> | |
| 82 | ||
| 83 | <commons.l ang.verion > | |
| 84 | 3.5 | |
| 85 | </commons. lang.verio n> | |
| 86 | ||
| 87 | <swagger.s pringfox.v ersion> | |
| 88 | 2.7.0 | |
| 89 | </swagger. springfox. version> | |
| 90 | ||
| 91 | </properti es> | |
| 92 | ||
| 93 | ||
| 94 | <dependenc yManagemen t> | |
| 95 | ||
| 96 | <dependenc ies> | |
| 97 | ||
| 98 | <dependenc y> | |
| 99 | ||
| 100 | <groupId> | |
| 101 | gov.va.gen isis2 | |
| 102 | </groupId> | |
| 103 | ||
| 104 | <artifactI d> | |
| 105 | ts-common- api | |
| 106 | </artifact Id> | |
| 107 | ||
| 108 | <version> | |
| 109 | ${ts.commo n.api.vers ion} | |
| 110 | </version> | |
| 111 | ||
| 112 | </dependen cy> | |
| 113 | ||
| 114 | <dependenc y> | |
| 115 | ||
| 116 | <groupId> | |
| 117 | org.spring framework | |
| 118 | </groupId> | |
| 119 | ||
| 120 | <artifactI d> | |
| 121 | spring-web | |
| 122 | </artifact Id> | |
| 123 | ||
| 124 | <version> | |
| 125 | ${spring.v ersion} | |
| 126 | </version> | |
| 127 | ||
| 128 | </dependen cy> | |
| 129 | ||
| 130 | <dependenc y> | |
| 131 | ||
| 132 | <groupId> | |
| 133 | org.spring framework | |
| 134 | </groupId> | |
| 135 | ||
| 136 | <artifactI d> | |
| 137 | spring-web mvc | |
| 138 | </artifact Id> | |
| 139 | ||
| 140 | <version> | |
| 141 | ${spring.v ersion} | |
| 142 | </version> | |
| 143 | ||
| 144 | </dependen cy> | |
| 145 | ||
| 146 | <dependenc y> | |
| 147 | ||
| 148 | <groupId> | |
| 149 | org.spring framework | |
| 150 | </groupId> | |
| 151 | ||
| 152 | <artifactI d> | |
| 153 | spring-cor e | |
| 154 | </artifact Id> | |
| 155 | ||
| 156 | <version> | |
| 157 | ${spring.v ersion} | |
| 158 | </version> | |
| 159 | ||
| 160 | </dependen cy> | |
| 161 | ||
| 162 | <dependenc y> | |
| 163 | ||
| 164 | <groupId> | |
| 165 | org.spring framework | |
| 166 | </groupId> | |
| 167 | ||
| 168 | <artifactI d> | |
| 169 | spring-orm | |
| 170 | </artifact Id> | |
| 171 | ||
| 172 | <version> | |
| 173 | ${spring.v ersion} | |
| 174 | </version> | |
| 175 | ||
| 176 | </dependen cy> | |
| 177 | ||
| 178 | <dependenc y> | |
| 179 | ||
| 180 | <groupId> | |
| 181 | org.spring framework. data | |
| 182 | </groupId> | |
| 183 | ||
| 184 | <artifactI d> | |
| 185 | spring-dat a-jpa | |
| 186 | </artifact Id> | |
| 187 | ||
| 188 | <version> | |
| 189 | ${spring.d ata.jpa.ve rsion} | |
| 190 | </version> | |
| 191 | ||
| 192 | </dependen cy> | |
| 193 | ||
| 194 | <dependenc y> | |
| 195 | ||
| 196 | <groupId> | |
| 197 | org.hibern ate | |
| 198 | </groupId> | |
| 199 | ||
| 200 | <artifactI d> | |
| 201 | hibernate- entitymana ger | |
| 202 | </artifact Id> | |
| 203 | ||
| 204 | <version> | |
| 205 | ${hibernat e.version} | |
| 206 | </version> | |
| 207 | ||
| 208 | </dependen cy> | |
| 209 | ||
| 210 | ||
| 211 | <!-- Jacks on JSON Pr ocessor -- > | |
| 212 | ||
| 213 | <dependenc y> | |
| 214 | ||
| 215 | <groupId> | |
| 216 | com.faster xml.jackso n.core | |
| 217 | </groupId> | |
| 218 | ||
| 219 | <artifactI d> | |
| 220 | jackson-da tabind | |
| 221 | </artifact Id> | |
| 222 | ||
| 223 | <version> | |
| 224 | ${jackson. version} | |
| 225 | </version> | |
| 226 | ||
| 227 | </dependen cy> | |
| 228 | ||
| 229 | ||
| 230 | <dependenc y> | |
| 231 | ||
| 232 | <groupId> | |
| 233 | com.micros oft.sqlser ver | |
| 234 | </groupId> | |
| 235 | ||
| 236 | <artifactI d> | |
| 237 | mssql-jdbc | |
| 238 | </artifact Id> | |
| 239 | ||
| 240 | <version> | |
| 241 | ${mssql.jd bc.driver. version} | |
| 242 | </version> | |
| 243 | ||
| 244 | </dependen cy> | |
| 245 | ||
| 246 | ||
| 247 | <dependenc y> | |
| 248 | ||
| 249 | <groupId> | |
| 250 | org.apache .commons | |
| 251 | </groupId> | |
| 252 | ||
| 253 | <artifactI d> | |
| 254 | commons-la ng3 | |
| 255 | </artifact Id> | |
| 256 | ||
| 257 | <version> | |
| 258 | ${commons. lang.verio n} | |
| 259 | </version> | |
| 260 | ||
| 261 | </dependen cy> | |
| 262 | ||
| 263 | ||
| 264 | <!--Log4 - -> | |
| 265 | ||
| 266 | <dependenc y> | |
| 267 | ||
| 268 | <groupId> | |
| 269 | org.apache .logging.l og4j | |
| 270 | </groupId> | |
| 271 | ||
| 272 | <artifactI d> | |
| 273 | log4j-api | |
| 274 | </artifact Id> | |
| 275 | ||
| 276 | <version> | |
| 277 | ${log4j.ve rsion} | |
| 278 | </version> | |
| 279 | ||
| 280 | </dependen cy> | |
| 281 | ||
| 282 | <dependenc y> | |
| 283 | ||
| 284 | <groupId> | |
| 285 | org.apache .logging.l og4j | |
| 286 | </groupId> | |
| 287 | ||
| 288 | <artifactI d> | |
| 289 | log4j-core | |
| 290 | </artifact Id> | |
| 291 | ||
| 292 | <version> | |
| 293 | ${log4j.ve rsion} | |
| 294 | </version> | |
| 295 | ||
| 296 | </dependen cy> | |
| 297 | ||
| 298 | ||
| 299 | <dependenc y> | |
| 300 | ||
| 301 | <groupId> | |
| 302 | junit | |
| 303 | </groupId> | |
| 304 | ||
| 305 | <artifactI d> | |
| 306 | junit | |
| 307 | </artifact Id> | |
| 308 | ||
| 309 | <version> | |
| 310 | ${junit.ve rsion} | |
| 311 | </version> | |
| 312 | ||
| 313 | <scope> | |
| 314 | test | |
| 315 | </scope> | |
| 316 | ||
| 317 | </dependen cy> | |
| 318 | ||
| 319 | ||
| 320 | <!-- swagg er --> | |
| 321 | ||
| 322 | <dependenc y> | |
| 323 | ||
| 324 | <groupId> | |
| 325 | io.springf ox | |
| 326 | </groupId> | |
| 327 | ||
| 328 | <artifactI d> | |
| 329 | springfox- swagger2 | |
| 330 | </artifact Id> | |
| 331 | ||
| 332 | <version> | |
| 333 | ${swagger. springfox. version} | |
| 334 | </version> | |
| 335 | ||
| 336 | </dependen cy> | |
| 337 | ||
| 338 | <dependenc y> | |
| 339 | ||
| 340 | <groupId> | |
| 341 | io.springf ox | |
| 342 | </groupId> | |
| 343 | ||
| 344 | <artifactI d> | |
| 345 | springfox- swagger-ui | |
| 346 | </artifact Id> | |
| 347 | ||
| 348 | <version> | |
| 349 | ${swagger. springfox. version} | |
| 350 | </version> | |
| 351 | ||
| 352 | </dependen cy> | |
| 353 | ||
| 354 | </dependen cies> | |
| 355 | ||
| 356 | </dependen cyManageme nt> | |
| 357 | ||
| 358 | ||
| 359 | <build> | |
| 360 | ||
| 361 | <!-- To de fine the p lugin vers ion in you r parent P OM --> | |
| 362 | ||
| 363 | <pluginMan agement> | |
| 364 | ||
| 365 | <plugins> | |
| 366 | ||
| 367 | <plugin> | |
| 368 | ||
| 369 | <groupId> | |
| 370 | org.apache .maven.plu gins | |
| 371 | </groupId> | |
| 372 | ||
| 373 | <artifactI d> | |
| 374 | maven-comp iler-plugi n | |
| 375 | </artifact Id> | |
| 376 | ||
| 377 | <version> | |
| 378 | 3.6.2 | |
| 379 | </version> | |
| 380 | ||
| 381 | </plugin> | |
| 382 | ||
| 383 | <plugin> | |
| 384 | ||
| 385 | <groupId> | |
| 386 | org.apache .maven.plu gins | |
| 387 | </groupId> | |
| 388 | ||
| 389 | <artifactI d> | |
| 390 | maven-war- plugin | |
| 391 | </artifact Id> | |
| 392 | ||
| 393 | <version> | |
| 394 | 3.1.0 | |
| 395 | </version> | |
| 396 | ||
| 397 | </plugin> | |
| 398 | ||
| 399 | <plugin> | |
| 400 | ||
| 401 | <groupId> | |
| 402 | org.apache .tomcat.ma ven | |
| 403 | </groupId> | |
| 404 | ||
| 405 | <artifactI d> | |
| 406 | tomcat7-ma ven-plugin | |
| 407 | </artifact Id> | |
| 408 | ||
| 409 | <version> | |
| 410 | 2.2 | |
| 411 | </version> | |
| 412 | ||
| 413 | </plugin> | |
| 414 | ||
| 415 | <plugin> | |
| 416 | ||
| 417 | <groupId> | |
| 418 | org.apache .maven.plu gins | |
| 419 | </groupId> | |
| 420 | ||
| 421 | <artifactI d> | |
| 422 | maven-sour ce-plugin | |
| 423 | </artifact Id> | |
| 424 | ||
| 425 | <version> | |
| 426 | 3.0.1 | |
| 427 | </version> | |
| 428 | ||
| 429 | </plugin> | |
| 430 | ||
| 431 | <plugin> | |
| 432 | ||
| 433 | <groupId> | |
| 434 | org.apache .maven.plu gins | |
| 435 | </groupId> | |
| 436 | ||
| 437 | <artifactI d> | |
| 438 | maven-java doc-plugin | |
| 439 | </artifact Id> | |
| 440 | ||
| 441 | <version> | |
| 442 | 3.0.0-M1 | |
| 443 | </version> | |
| 444 | ||
| 445 | </plugin> | |
| 446 | ||
| 447 | <plugin> | |
| 448 | ||
| 449 | <groupId> | |
| 450 | org.apache .maven.plu gins | |
| 451 | </groupId> | |
| 452 | ||
| 453 | <artifactI d> | |
| 454 | maven-depl oy-plugin | |
| 455 | </artifact Id> | |
| 456 | ||
| 457 | <version> | |
| 458 | 2.8.2 | |
| 459 | </version> | |
| 460 | ||
| 461 | </plugin> | |
| 462 | ||
| 463 | <plugin> | |
| 464 | ||
| 465 | <groupId> | |
| 466 | org.apache .maven.plu gins | |
| 467 | </groupId> | |
| 468 | ||
| 469 | <artifactI d> | |
| 470 | maven-rele ase-plugin | |
| 471 | </artifact Id> | |
| 472 | ||
| 473 | <version> | |
| 474 | 2.5.3 | |
| 475 | </version> | |
| 476 | ||
| 477 | <dependenc ies> | |
| 478 | ||
| 479 | <dependenc y> | |
| 480 | ||
| 481 | <groupId> | |
| 482 | org.apache .maven.scm | |
| 483 | </groupId> | |
| 484 | ||
| 485 | <artifactI d> | |
| 486 | maven-scm- provider-g itexe | |
| 487 | </artifact Id> | |
| 488 | ||
| 489 | <version> | |
| 490 | 1.8.1 | |
| 491 | </version> | |
| 492 | ||
| 493 | </dependen cy> | |
| 494 | ||
| 495 | </dependen cies> | |
| 496 | ||
| 497 | </plugin> | |
| 498 | ||
| 499 | </plugins> | |
| 500 | ||
| 501 | </pluginMa nagement> | |
| 502 | ||
| 503 | </build> | |
| 504 | ||
| 505 | ||
| 506 | <distribut ionManagem ent> | |
| 507 | ||
| 508 | <!-- Publi sh the ver sioned rel eases here --> | |
| 509 | ||
| 510 | <repositor y> | |
| 511 | ||
| 512 | <id> | |
| 513 | nexus | |
| 514 | </id> | |
| 515 | ||
| 516 | <name> | |
| 517 | nexus | |
| 518 | </name> | |
| 519 | ||
| 520 | <url> | |
| 521 | http:// IP /nexus/con tent/repos itories/re leases | |
| 522 | </url> | |
| 523 | ||
| 524 | </reposito ry> | |
| 525 | ||
| 526 | ||
| 527 | <!-- Publi sh the sna pshot rele ases here --> | |
| 528 | ||
| 529 | <snapshotR epository> | |
| 530 | ||
| 531 | <id> | |
| 532 | nexus | |
| 533 | </id> | |
| 534 | ||
| 535 | <name> | |
| 536 | nexus | |
| 537 | </name> | |
| 538 | ||
| 539 | <url> | |
| 540 | http:// IP /nexus/con tent/repos itories/sn apshots | |
| 541 | </url> | |
| 542 | ||
| 543 | </snapshot Repository > | |
| 544 | ||
| 545 | </distribu tionManage ment> | |
| 546 | ||
| 547 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.