Produced by Araxis Merge on 7/20/2018 12:56:41 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\ISAAC\integration-tests | pom.xml | Tue Jul 17 16:27:24 2018 UTC |
| 2 | CTT_Release_8_June_2018.zip\CTT_ISAAC\ISAAC\integration-tests | pom.xml | Wed Jul 18 14:40:00 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 956 |
| 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 | 4.04 | |
| 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 | <name> | |
| 44 | OCHRE: Int egration t ests | |
| 45 | </name> | |
| 46 | ||
| 47 | <dependenc ies> | |
| 48 | ||
| 49 | <dependenc y> | |
| 50 | ||
| 51 | <groupId> | |
| 52 | gov.vha.is aac.ochre. modules | |
| 53 | </groupId> | |
| 54 | ||
| 55 | <artifactI d> | |
| 56 | ochre-meta data | |
| 57 | </artifact Id> | |
| 58 | ||
| 59 | <version> | |
| 60 | ${project. version} | |
| 61 | </version> | |
| 62 | ||
| 63 | <scope> | |
| 64 | test | |
| 65 | </scope> | |
| 66 | ||
| 67 | </dependen cy> | |
| 68 | ||
| 69 | <dependenc y> | |
| 70 | ||
| 71 | <groupId> | |
| 72 | org.glassf ish.hk2 | |
| 73 | </groupId> | |
| 74 | ||
| 75 | <artifactI d> | |
| 76 | hk2-testng | |
| 77 | </artifact Id> | |
| 78 | ||
| 79 | <scope> | |
| 80 | test | |
| 81 | </scope> | |
| 82 | ||
| 83 | </dependen cy> | |
| 84 | ||
| 85 | <dependenc y> | |
| 86 | ||
| 87 | <groupId> | |
| 88 | org.testng | |
| 89 | </groupId> | |
| 90 | ||
| 91 | <artifactI d> | |
| 92 | testng | |
| 93 | </artifact Id> | |
| 94 | ||
| 95 | </dependen cy> | |
| 96 | ||
| 97 | <dependenc y> | |
| 98 | ||
| 99 | <groupId> | |
| 100 | gov.vha.is aac.ochre. modules | |
| 101 | </groupId> | |
| 102 | ||
| 103 | <artifactI d> | |
| 104 | ibdf-provi der | |
| 105 | </artifact Id> | |
| 106 | ||
| 107 | <version> | |
| 108 | ${project. version} | |
| 109 | </version> | |
| 110 | ||
| 111 | <scope> | |
| 112 | test | |
| 113 | </scope> | |
| 114 | ||
| 115 | </dependen cy> | |
| 116 | ||
| 117 | <dependenc y> | |
| 118 | ||
| 119 | <groupId> | |
| 120 | gov.vha.is aac.ochre. modules | |
| 121 | </groupId> | |
| 122 | ||
| 123 | <artifactI d> | |
| 124 | commit-pro vider | |
| 125 | </artifact Id> | |
| 126 | ||
| 127 | <version> | |
| 128 | ${project. version} | |
| 129 | </version> | |
| 130 | ||
| 131 | <scope> | |
| 132 | test | |
| 133 | </scope> | |
| 134 | ||
| 135 | </dependen cy> | |
| 136 | ||
| 137 | <dependenc y> | |
| 138 | ||
| 139 | <groupId> | |
| 140 | gov.vha.is aac.ochre. modules | |
| 141 | </groupId> | |
| 142 | ||
| 143 | <artifactI d> | |
| 144 | stamp-prov ider | |
| 145 | </artifact Id> | |
| 146 | ||
| 147 | <version> | |
| 148 | ${project. version} | |
| 149 | </version> | |
| 150 | ||
| 151 | <scope> | |
| 152 | test | |
| 153 | </scope> | |
| 154 | ||
| 155 | </dependen cy> | |
| 156 | ||
| 157 | <dependenc y> | |
| 158 | ||
| 159 | <groupId> | |
| 160 | gov.vha.is aac.ochre. modules | |
| 161 | </groupId> | |
| 162 | ||
| 163 | <artifactI d> | |
| 164 | identifier -provider | |
| 165 | </artifact Id> | |
| 166 | ||
| 167 | <version> | |
| 168 | ${project. version} | |
| 169 | </version> | |
| 170 | ||
| 171 | <scope> | |
| 172 | test | |
| 173 | </scope> | |
| 174 | ||
| 175 | </dependen cy> | |
| 176 | ||
| 177 | <dependenc y> | |
| 178 | ||
| 179 | <groupId> | |
| 180 | gov.vha.is aac.ochre. modules | |
| 181 | </groupId> | |
| 182 | ||
| 183 | <artifactI d> | |
| 184 | concept-pr ovider | |
| 185 | </artifact Id> | |
| 186 | ||
| 187 | <version> | |
| 188 | ${project. version} | |
| 189 | </version> | |
| 190 | ||
| 191 | <scope> | |
| 192 | test | |
| 193 | </scope> | |
| 194 | ||
| 195 | </dependen cy> | |
| 196 | ||
| 197 | <dependenc y> | |
| 198 | ||
| 199 | <groupId> | |
| 200 | gov.vha.is aac.ochre. modules | |
| 201 | </groupId> | |
| 202 | ||
| 203 | <artifactI d> | |
| 204 | sememe-pro vider | |
| 205 | </artifact Id> | |
| 206 | ||
| 207 | <version> | |
| 208 | ${project. version} | |
| 209 | </version> | |
| 210 | ||
| 211 | <scope> | |
| 212 | test | |
| 213 | </scope> | |
| 214 | ||
| 215 | </dependen cy> | |
| 216 | ||
| 217 | <dependenc y> | |
| 218 | ||
| 219 | <groupId> | |
| 220 | gov.vha.is aac.ochre. modules | |
| 221 | </groupId> | |
| 222 | ||
| 223 | <artifactI d> | |
| 224 | taxonomy-p rovider | |
| 225 | </artifact Id> | |
| 226 | ||
| 227 | <version> | |
| 228 | ${project. version} | |
| 229 | </version> | |
| 230 | ||
| 231 | <scope> | |
| 232 | test | |
| 233 | </scope> | |
| 234 | ||
| 235 | </dependen cy> | |
| 236 | ||
| 237 | <dependenc y> | |
| 238 | ||
| 239 | <groupId> | |
| 240 | gov.vha.is aac.ochre. modules | |
| 241 | </groupId> | |
| 242 | ||
| 243 | <artifactI d> | |
| 244 | logic-prov ider | |
| 245 | </artifact Id> | |
| 246 | ||
| 247 | <version> | |
| 248 | ${project. version} | |
| 249 | </version> | |
| 250 | ||
| 251 | <scope> | |
| 252 | test | |
| 253 | </scope> | |
| 254 | ||
| 255 | </dependen cy> | |
| 256 | ||
| 257 | <dependenc y> | |
| 258 | ||
| 259 | <groupId> | |
| 260 | gov.vha.is aac.ochre. modules | |
| 261 | </groupId> | |
| 262 | ||
| 263 | <artifactI d> | |
| 264 | progress-p rovider | |
| 265 | </artifact Id> | |
| 266 | ||
| 267 | <version> | |
| 268 | ${project. version} | |
| 269 | </version> | |
| 270 | ||
| 271 | <scope> | |
| 272 | test | |
| 273 | </scope> | |
| 274 | ||
| 275 | </dependen cy> | |
| 276 | ||
| 277 | <dependenc y> | |
| 278 | ||
| 279 | <groupId> | |
| 280 | gov.vha.is aac.ochre. modules | |
| 281 | </groupId> | |
| 282 | ||
| 283 | <artifactI d> | |
| 284 | coordinate -provider | |
| 285 | </artifact Id> | |
| 286 | ||
| 287 | <version> | |
| 288 | ${project. version} | |
| 289 | </version> | |
| 290 | ||
| 291 | <scope> | |
| 292 | test | |
| 293 | </scope> | |
| 294 | ||
| 295 | </dependen cy> | |
| 296 | ||
| 297 | <dependenc y> | |
| 298 | ||
| 299 | <groupId> | |
| 300 | gov.vha.is aac.ochre. modules | |
| 301 | </groupId> | |
| 302 | ||
| 303 | <artifactI d> | |
| 304 | path-provi der | |
| 305 | </artifact Id> | |
| 306 | ||
| 307 | <version> | |
| 308 | ${project. version} | |
| 309 | </version> | |
| 310 | ||
| 311 | <scope> | |
| 312 | test | |
| 313 | </scope> | |
| 314 | ||
| 315 | </dependen cy> | |
| 316 | ||
| 317 | <dependenc y> | |
| 318 | ||
| 319 | <groupId> | |
| 320 | gov.vha.is aac.ochre. modules | |
| 321 | </groupId> | |
| 322 | ||
| 323 | <artifactI d> | |
| 324 | workflow-p rovider | |
| 325 | </artifact Id> | |
| 326 | ||
| 327 | <version> | |
| 328 | ${project. version} | |
| 329 | </version> | |
| 330 | ||
| 331 | <scope> | |
| 332 | test | |
| 333 | </scope> | |
| 334 | ||
| 335 | </dependen cy> | |
| 336 | ||
| 337 | </dependen cies> | |
| 338 | ||
| 339 | <build> | |
| 340 | ||
| 341 | <plugins> | |
| 342 | ||
| 343 | <plugin> | |
| 344 | ||
| 345 | <groupId> | |
| 346 | org.apache .maven.plu gins | |
| 347 | </groupId> | |
| 348 | ||
| 349 | <artifactI d> | |
| 350 | maven-depe ndency-plu gin | |
| 351 | </artifact Id> | |
| 352 | ||
| 353 | <execution s> | |
| 354 | ||
| 355 | <execution > | |
| 356 | ||
| 357 | <id> | |
| 358 | extract-te st-depende ncies | |
| 359 | </id> | |
| 360 | ||
| 361 | <phase> | |
| 362 | generate-t est-resour ces | |
| 363 | </phase> | |
| 364 | ||
| 365 | <goals> | |
| 366 | ||
| 367 | <goal> | |
| 368 | unpack | |
| 369 | </goal> | |
| 370 | ||
| 371 | </goals> | |
| 372 | ||
| 373 | <configura tion> | |
| 374 | ||
| 375 | <skip> | |
| 376 | ${skipTest s} | |
| 377 | </skip> | |
| 378 | ||
| 379 | <artifactI tems> | |
| 380 | ||
| 381 | <artifact> | |
| 382 | ||
| 383 | <groupId> | |
| 384 | gov.vha.is aac.ochre. modules | |
| 385 | </groupId> | |
| 386 | ||
| 387 | <artifactI d> | |
| 388 | ochre-meta data | |
| 389 | </artifact Id> | |
| 390 | ||
| 391 | <version> | |
| 392 | ${project. version} | |
| 393 | </version> | |
| 394 | ||
| 395 | <classifie r> | |
| 396 | all | |
| 397 | </classifi er> | |
| 398 | ||
| 399 | <type> | |
| 400 | ibdf.zip | |
| 401 | </type> | |
| 402 | ||
| 403 | </artifact > | |
| 404 | ||
| 405 | </artifact Items> | |
| 406 | ||
| 407 | <outputDir ectory> | |
| 408 | ${project. build.dire ctory}/dat a | |
| 409 | </outputDi rectory> | |
| 410 | ||
| 411 | </configur ation> | |
| 412 | ||
| 413 | </executio n> | |
| 414 | ||
| 415 | </executio ns> | |
| 416 | ||
| 417 | </plugin> | |
| 418 | ||
| 419 | <plugin> | |
| 420 | ||
| 421 | <groupId> | |
| 422 | org.apache .maven.plu gins | |
| 423 | </groupId> | |
| 424 | ||
| 425 | <artifactI d> | |
| 426 | maven-sure fire-plugi n | |
| 427 | </artifact Id> | |
| 428 | ||
| 429 | <configura tion> | |
| 430 | ||
| 431 | <forkCount > | |
| 432 | 1 | |
| 433 | </forkCoun t> | |
| 434 | ||
| 435 | <reuseFork s> | |
| 436 | true | |
| 437 | </reuseFor ks> | |
| 438 | ||
| 439 | <parallel> | |
| 440 | false | |
| 441 | </parallel > | |
| 442 | ||
| 443 | <useSystem ClassLoade r> | |
| 444 | true | |
| 445 | </useSyste mClassLoad er> | |
| 446 | ||
| 447 | <useManife stOnlyJar> | |
| 448 | false | |
| 449 | </useManif estOnlyJar > | |
| 450 | ||
| 451 | <argLine> | |
| 452 | -ea -d64 - Xmx12g -Dj ava.awt.he adless=tru e | |
| 453 | </argLine> | |
| 454 | <!-- <argLine>- Xmx8g -Xms 8g -Djava. awt.headle ss=true -a gentpath:/ Applicatio ns/jprofil er8/bin/ma cos/libjpr ofilerti.j nilib= PORT = PORT </argLine> --> | |
| 455 | ||
| 456 | <!-- debug ForkedProc ess>true</ debugForke dProcess - -> | |
| 457 | ||
| 458 | <includes> | |
| 459 | ||
| 460 | <!-- Let J Unit annot ations dec ide --> | |
| 461 | ||
| 462 | <include> | |
| 463 | **/*.class | |
| 464 | </include> | |
| 465 | ||
| 466 | </includes > | |
| 467 | ||
| 468 | <!--system PropertyVa riables> | |
| 469 | <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> | |
| 470 | </systemPr opertyVari ables--> | |
| 471 | ||
| 472 | </configur ation> | |
| 473 | ||
| 474 | </plugin> | |
| 475 | ||
| 476 | </plugins> | |
| 477 | ||
| 478 | </build> | |
| 479 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.