Produced by Araxis Merge on 7/10/2017 1:01:52 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 | C:\AraxisMergeCompare\Pri_un\JAR\CoreRouterSemantics-0.1\META-INF\maven\Imaging\CoreRouterSemantics | pom.xml | Sat Oct 1 19:23:40 2016 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\JAR\CoreRouterSemantics-0.1\META-INF\maven\Imaging\CoreRouterSemantics | pom.xml | Thu Jul 6 16:02:16 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 868 |
| 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 | xsi:schema Location=" http://mav en.apache. org/POM/4. 0.0 http:/ /maven.apa che.org/xs d/maven-4. 0.0.xsd" | |
| 7 | xmlns="htt p://maven. apache.org /POM/4.0.0 " | |
| 8 | ||
| 9 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 10 | > | |
| 11 | ||
| 12 | <parent> | |
| 13 | ||
| 14 | <groupId> | |
| 15 | Imaging | |
| 16 | </groupId> | |
| 17 | ||
| 18 | <artifactI d> | |
| 19 | ImagingRoo t | |
| 20 | </artifact Id> | |
| 21 | ||
| 22 | <version> | |
| 23 | ${BUILD_VE RSION} | |
| 24 | </version> | |
| 25 | ||
| 26 | <relativeP ath> | |
| 27 | ../Imaging Root/pom.x ml | |
| 28 | </relative Path> | |
| 29 | ||
| 30 | </parent> | |
| 31 | ||
| 32 | <modelVers ion> | |
| 33 | 4.0.0 | |
| 34 | </modelVer sion> | |
| 35 | ||
| 36 | <artifactI d> | |
| 37 | CoreRouter Semantics | |
| 38 | </artifact Id> | |
| 39 | ||
| 40 | <name> | |
| 41 | CoreRouter Semantics | |
| 42 | </name> | |
| 43 | ||
| 44 | <developer s> | |
| 45 | ||
| 46 | <developer > | |
| 47 | ||
| 48 | <id> | |
| 49 | vhaiswbeck ec | |
| 50 | </id> | |
| 51 | ||
| 52 | <name> | |
| 53 | Chris Beck ey | |
| 54 | </name> | |
| 55 | ||
| 56 | <email> | |
| 57 | PII | |
| 58 | </email> | |
| 59 | ||
| 60 | <organizat ion> | |
| 61 | VHA | |
| 62 | </organiza tion> | |
| 63 | ||
| 64 | </develope r> | |
| 65 | ||
| 66 | </develope rs> | |
| 67 | ||
| 68 | <packaging > | |
| 69 | jar | |
| 70 | </packagin g> | |
| 71 | ||
| 72 | <build> | |
| 73 | ||
| 74 | <finalName > | |
| 75 | ${artifact Id}-${vers ion} | |
| 76 | </finalNam e> | |
| 77 | ||
| 78 | <directory > | |
| 79 | ${basedir} /target | |
| 80 | </director y> | |
| 81 | ||
| 82 | <outputDir ectory> | |
| 83 | ${basedir} /target/cl asses | |
| 84 | </outputDi rectory> | |
| 85 | ||
| 86 | <testOutpu tDirectory > | |
| 87 | ${basedir} /target/te st-classes | |
| 88 | </testOutp utDirector y> | |
| 89 | ||
| 90 | <sourceDir ectory> | |
| 91 | main/src/j ava | |
| 92 | </sourceDi rectory> | |
| 93 | ||
| 94 | <testSourc eDirectory > | |
| 95 | main/test/ java | |
| 96 | </testSour ceDirector y> | |
| 97 | ||
| 98 | <resources > | |
| 99 | ||
| 100 | <resource> | |
| 101 | ||
| 102 | <directory > | |
| 103 | main/src/r esources | |
| 104 | </director y> | |
| 105 | ||
| 106 | <includes> | |
| 107 | ||
| 108 | <include> | |
| 109 | **/* | |
| 110 | </include> | |
| 111 | ||
| 112 | </includes > | |
| 113 | ||
| 114 | </resource > | |
| 115 | ||
| 116 | </resource s> | |
| 117 | ||
| 118 | <testResou rces> | |
| 119 | ||
| 120 | <testResou rce> | |
| 121 | ||
| 122 | <directory > | |
| 123 | main/test/ resources | |
| 124 | </director y> | |
| 125 | ||
| 126 | <includes> | |
| 127 | ||
| 128 | <include> | |
| 129 | **/* | |
| 130 | </include> | |
| 131 | ||
| 132 | </includes > | |
| 133 | ||
| 134 | </testReso urce> | |
| 135 | ||
| 136 | </testReso urces> | |
| 137 | ||
| 138 | <plugins> | |
| 139 | ||
| 140 | <plugin> | |
| 141 | ||
| 142 | <groupId> | |
| 143 | UserPlugin s | |
| 144 | </groupId> | |
| 145 | ||
| 146 | <artifactI d> | |
| 147 | maven-goal -plugin | |
| 148 | </artifact Id> | |
| 149 | ||
| 150 | <version> | |
| 151 | 0.1 | |
| 152 | </version> | |
| 153 | ||
| 154 | <configura tion> | |
| 155 | ||
| 156 | <workingDi rectory> | |
| 157 | ${basedir} | |
| 158 | </workingD irectory> | |
| 159 | ||
| 160 | <userGoalL ist> | |
| 161 | ||
| 162 | <userGoalI nfo> | |
| 163 | ||
| 164 | <goalName> | |
| 165 | CruiseCont rol-build | |
| 166 | </goalName > | |
| 167 | ||
| 168 | <commands> | |
| 169 | ||
| 170 | <command> | |
| 171 | ||
| 172 | <![CDATA[< cvs comman d="up -d - P" />]]> | |
| 173 | ||
| 174 | </command> | |
| 175 | ||
| 176 | <command> | |
| 177 | ||
| 178 | <![CDATA[< attainGoal name="cle an:clean" />]]> | |
| 179 | ||
| 180 | </command> | |
| 181 | ||
| 182 | <command> | |
| 183 | ||
| 184 | <![CDATA[< attainGoal name="jar :install" />]]> | |
| 185 | ||
| 186 | </command> | |
| 187 | ||
| 188 | </commands > | |
| 189 | ||
| 190 | </userGoal Info> | |
| 191 | ||
| 192 | <userGoalI nfo> | |
| 193 | ||
| 194 | <goalName> | |
| 195 | Imaging-di st | |
| 196 | </goalName > | |
| 197 | ||
| 198 | <commands> | |
| 199 | ||
| 200 | <command> | |
| 201 | ||
| 202 | <![CDATA[< attainGoal name="cle an:clean" />]]> | |
| 203 | ||
| 204 | </command> | |
| 205 | ||
| 206 | <command> | |
| 207 | ||
| 208 | <![CDATA[< attainGoal name="jar :install" />]]> | |
| 209 | ||
| 210 | </command> | |
| 211 | ||
| 212 | </commands > | |
| 213 | ||
| 214 | </userGoal Info> | |
| 215 | ||
| 216 | <userGoalI nfo> | |
| 217 | ||
| 218 | <goalName> | |
| 219 | default | |
| 220 | </goalName > | |
| 221 | ||
| 222 | <commands> | |
| 223 | ||
| 224 | <command> | |
| 225 | ||
| 226 | <![CDATA[< attainGoal name="cle an:clean" />]]> | |
| 227 | ||
| 228 | </command> | |
| 229 | ||
| 230 | <command> | |
| 231 | ||
| 232 | <![CDATA[< attainGoal name="jar :install" />]]> | |
| 233 | ||
| 234 | </command> | |
| 235 | ||
| 236 | </commands > | |
| 237 | ||
| 238 | </userGoal Info> | |
| 239 | ||
| 240 | <userGoalI nfo> | |
| 241 | ||
| 242 | <goalName> | |
| 243 | misc | |
| 244 | </goalName > | |
| 245 | ||
| 246 | <commands> | |
| 247 | ||
| 248 | <!-- mvn g oal:misc Y our Miscel laneous Co mmand(s) H ere --> | |
| 249 | ||
| 250 | <!-- | |
| 251 | <com mand> | |
| 252 | <! [CDATA[<co py file="$ {basedir}/ myFile" t odir="${us er.home}/m yDir" />]] > | |
| 253 | </co mmand> | |
| 254 | --> | |
| 255 | ||
| 256 | <command> | |
| 257 | ||
| 258 | <![CDATA[< attainGoal name="--v ersion:--v ersion" /> ]]> | |
| 259 | ||
| 260 | </command> | |
| 261 | ||
| 262 | </commands > | |
| 263 | ||
| 264 | </userGoal Info> | |
| 265 | ||
| 266 | </userGoal List> | |
| 267 | ||
| 268 | </configur ation> | |
| 269 | ||
| 270 | </plugin> | |
| 271 | ||
| 272 | <plugin> | |
| 273 | ||
| 274 | <artifactI d> | |
| 275 | maven-comp iler-plugi n | |
| 276 | </artifact Id> | |
| 277 | ||
| 278 | <configura tion> | |
| 279 | ||
| 280 | <optimize> | |
| 281 | false | |
| 282 | </optimize > | |
| 283 | ||
| 284 | <compilerA rguments> | |
| 285 | ||
| 286 | <source> | |
| 287 | ${JAVA_VER SION} | |
| 288 | </source> | |
| 289 | ||
| 290 | <target> | |
| 291 | ${JAVA_VER SION} | |
| 292 | </target> | |
| 293 | ||
| 294 | <g /> | |
| 295 | ||
| 296 | <deprecati on /> | |
| 297 | ||
| 298 | </compiler Arguments> | |
| 299 | ||
| 300 | </configur ation> | |
| 301 | ||
| 302 | </plugin> | |
| 303 | ||
| 304 | <plugin> | |
| 305 | ||
| 306 | <artifactI d> | |
| 307 | maven-jar- plugin | |
| 308 | </artifact Id> | |
| 309 | ||
| 310 | <configura tion> | |
| 311 | ||
| 312 | <archive> | |
| 313 | ||
| 314 | <manifest> | |
| 315 | ||
| 316 | <addClassp ath> | |
| 317 | true | |
| 318 | </addClass path> | |
| 319 | ||
| 320 | </manifest > | |
| 321 | ||
| 322 | </archive> | |
| 323 | ||
| 324 | </configur ation> | |
| 325 | ||
| 326 | </plugin> | |
| 327 | ||
| 328 | <plugin> | |
| 329 | ||
| 330 | <artifactI d> | |
| 331 | maven-sure fire-plugi n | |
| 332 | </artifact Id> | |
| 333 | ||
| 334 | <configura tion> | |
| 335 | ||
| 336 | <forkMode> | |
| 337 | once | |
| 338 | </forkMode > | |
| 339 | ||
| 340 | <includes> | |
| 341 | ||
| 342 | <include> | |
| 343 | **/*Test*. java | |
| 344 | </include> | |
| 345 | ||
| 346 | </includes > | |
| 347 | ||
| 348 | <excludes> | |
| 349 | ||
| 350 | <!-- All a bstract cl asses star t with Abs tract --> | |
| 351 | ||
| 352 | <exclude> | |
| 353 | **/Abstrac t*.java | |
| 354 | </exclude> | |
| 355 | ||
| 356 | <!-- Utili ty (helper ) classes end with U tility --> | |
| 357 | ||
| 358 | <exclude> | |
| 359 | **/*Utilit y.java | |
| 360 | </exclude> | |
| 361 | ||
| 362 | <!-- Data generators end with Generator --> | |
| 363 | ||
| 364 | <exclude> | |
| 365 | **/*Genera tor.java | |
| 366 | </exclude> | |
| 367 | ||
| 368 | <!-- All T est Base c lasses end with Test Base --> | |
| 369 | ||
| 370 | <exclude> | |
| 371 | **/*TestBa se.java | |
| 372 | </exclude> | |
| 373 | ||
| 374 | <!-- Data may be inc luded in a static cl ass ending with Data --> | |
| 375 | ||
| 376 | <exclude> | |
| 377 | **/Mock*.j ava | |
| 378 | </exclude> | |
| 379 | ||
| 380 | <!-- Inner classes a re exclude d as unit tests --> | |
| 381 | ||
| 382 | <exclude> | |
| 383 | **/*$* | |
| 384 | </exclude> | |
| 385 | ||
| 386 | <!-- Exclu ding indiv idual clas ses on a p ermanent b asis is di scouraged --> | |
| 387 | ||
| 388 | <!-- Enter individua l classes here --> | |
| 389 | ||
| 390 | </excludes > | |
| 391 | ||
| 392 | </configur ation> | |
| 393 | ||
| 394 | </plugin> | |
| 395 | ||
| 396 | </plugins> | |
| 397 | ||
| 398 | </build> | |
| 399 | ||
| 400 | <reporting > | |
| 401 | ||
| 402 | <plugins> | |
| 403 | ||
| 404 | <plugin> | |
| 405 | ||
| 406 | <artifactI d> | |
| 407 | maven-chan ges-plugin | |
| 408 | </artifact Id> | |
| 409 | ||
| 410 | <configura tion> | |
| 411 | ||
| 412 | <xmlPath> | |
| 413 | ${basedir} /xdocs/cha nges.xml | |
| 414 | </xmlPath> | |
| 415 | ||
| 416 | </configur ation> | |
| 417 | ||
| 418 | </plugin> | |
| 419 | ||
| 420 | </plugins> | |
| 421 | ||
| 422 | </reportin g> | |
| 423 | ||
| 424 | <propertie s> | |
| 425 | ||
| 426 | <maven.bui ld.dir> | |
| 427 | ${basedir} /target | |
| 428 | </maven.bu ild.dir> | |
| 429 | ||
| 430 | <maven.fin al.name> | |
| 431 | ${artifact Id}-${vers ion} | |
| 432 | </maven.fi nal.name> | |
| 433 | ||
| 434 | </properti es> | |
| 435 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.