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\commons-httpclient-custom-3.1\META-INF\maven\commons-httpclient\commons-httpclient-custom | pom.xml | Mon Nov 29 14:49:30 2010 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\JAR\commons-httpclient-custom-3.1\META-INF\maven\commons-httpclient\commons-httpclient-custom | pom.xml | Thu Jul 6 16:40:21 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 1006 |
| 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 | <?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 | <modelVers ion> | |
| 13 | 4.0.0 | |
| 14 | </modelVer sion> | |
| 15 | ||
| 16 | <groupId> | |
| 17 | commons-ht tpclient | |
| 18 | </groupId> | |
| 19 | ||
| 20 | <artifactI d> | |
| 21 | commons-ht tpclient-c ustom | |
| 22 | </artifact Id> | |
| 23 | ||
| 24 | <version> | |
| 25 | 3.1 | |
| 26 | </version> | |
| 27 | ||
| 28 | <name> | |
| 29 | commons-ht tpclient-c ustom | |
| 30 | </name> | |
| 31 | ||
| 32 | <packaging > | |
| 33 | jar | |
| 34 | </packagin g> | |
| 35 | ||
| 36 | <build> | |
| 37 | ||
| 38 | <finalName > | |
| 39 | ${artifact Id}-${vers ion} | |
| 40 | </finalNam e> | |
| 41 | ||
| 42 | <directory > | |
| 43 | ${basedir} /target | |
| 44 | </director y> | |
| 45 | ||
| 46 | <outputDir ectory> | |
| 47 | ${basedir} /target/cl asses | |
| 48 | </outputDi rectory> | |
| 49 | ||
| 50 | <testOutpu tDirectory > | |
| 51 | ${basedir} /target/te st-classes | |
| 52 | </testOutp utDirector y> | |
| 53 | ||
| 54 | <sourceDir ectory> | |
| 55 | src/java | |
| 56 | </sourceDi rectory> | |
| 57 | ||
| 58 | <testSourc eDirectory > | |
| 59 | test/java | |
| 60 | </testSour ceDirector y> | |
| 61 | ||
| 62 | <resources > | |
| 63 | ||
| 64 | <resource> | |
| 65 | ||
| 66 | <directory > | |
| 67 | src/resour ces | |
| 68 | </director y> | |
| 69 | ||
| 70 | <includes> | |
| 71 | ||
| 72 | <include> | |
| 73 | **/* | |
| 74 | </include> | |
| 75 | ||
| 76 | </includes > | |
| 77 | ||
| 78 | </resource > | |
| 79 | ||
| 80 | </resource s> | |
| 81 | ||
| 82 | <testResou rces> | |
| 83 | ||
| 84 | <testResou rce> | |
| 85 | ||
| 86 | <directory > | |
| 87 | test/resou rces | |
| 88 | </director y> | |
| 89 | ||
| 90 | <includes> | |
| 91 | ||
| 92 | <include> | |
| 93 | **/* | |
| 94 | </include> | |
| 95 | ||
| 96 | </includes > | |
| 97 | ||
| 98 | </testReso urce> | |
| 99 | ||
| 100 | </testReso urces> | |
| 101 | ||
| 102 | <plugins> | |
| 103 | ||
| 104 | <plugin> | |
| 105 | ||
| 106 | <groupId> | |
| 107 | UserPlugin s | |
| 108 | </groupId> | |
| 109 | ||
| 110 | <artifactI d> | |
| 111 | maven-goal -plugin | |
| 112 | </artifact Id> | |
| 113 | ||
| 114 | <version> | |
| 115 | 0.1 | |
| 116 | </version> | |
| 117 | ||
| 118 | <configura tion> | |
| 119 | ||
| 120 | <workingDi rectory> | |
| 121 | ${basedir} | |
| 122 | </workingD irectory> | |
| 123 | ||
| 124 | <maven2Rep ository> | |
| 125 | C:\Documen ts and Set tings\Admi nistrator\ .m2\reposi tory | |
| 126 | </maven2Re pository> | |
| 127 | ||
| 128 | <userGoalL ist> | |
| 129 | ||
| 130 | <userGoalI nfo> | |
| 131 | ||
| 132 | <goalName> | |
| 133 | deploy | |
| 134 | </goalName > | |
| 135 | ||
| 136 | <commands> | |
| 137 | ||
| 138 | <command> | |
| 139 | ||
| 140 | <![CDATA[< attainGoal name="cle an:clean" />]]> | |
| 141 | ||
| 142 | </command> | |
| 143 | ||
| 144 | <command> | |
| 145 | ||
| 146 | <![CDATA[< attainGoal name="jar :install" />]]> | |
| 147 | ||
| 148 | </command> | |
| 149 | ||
| 150 | <command> | |
| 151 | ||
| 152 | <![CDATA[< copy file= "${maven.b uild.dir}/ ${artifact Id}-${vers ion}.jar" todir="${w ebserver.l ib.dir}" / >]]> | |
| 153 | ||
| 154 | </command> | |
| 155 | ||
| 156 | <command> | |
| 157 | ||
| 158 | <![CDATA[< delete fil e="${webse rver.lib.d ir}/common s-httpclie nt-${versi on}.jar" / >]]> | |
| 159 | ||
| 160 | </command> | |
| 161 | ||
| 162 | </commands > | |
| 163 | ||
| 164 | </userGoal Info> | |
| 165 | ||
| 166 | <userGoalI nfo> | |
| 167 | ||
| 168 | <goalName> | |
| 169 | build-comm ons-httpcl ient-custo m_jar | |
| 170 | </goalName > | |
| 171 | ||
| 172 | <commands> | |
| 173 | ||
| 174 | <command> | |
| 175 | ||
| 176 | <![CDATA[< attainGoal name="cle an:clean" />]]> | |
| 177 | ||
| 178 | </command> | |
| 179 | ||
| 180 | <command> | |
| 181 | ||
| 182 | <![CDATA[< attainGoal name="jar :install" />]]> | |
| 183 | ||
| 184 | </command> | |
| 185 | ||
| 186 | </commands > | |
| 187 | ||
| 188 | </userGoal Info> | |
| 189 | ||
| 190 | <userGoalI nfo> | |
| 191 | ||
| 192 | <goalName> | |
| 193 | default | |
| 194 | </goalName > | |
| 195 | ||
| 196 | <commands> | |
| 197 | ||
| 198 | <command> | |
| 199 | ||
| 200 | <![CDATA[< attainGoal name="cle an:clean" />]]> | |
| 201 | ||
| 202 | </command> | |
| 203 | ||
| 204 | <command> | |
| 205 | ||
| 206 | <![CDATA[< attainGoal name="jar :install" />]]> | |
| 207 | ||
| 208 | </command> | |
| 209 | ||
| 210 | </commands > | |
| 211 | ||
| 212 | </userGoal Info> | |
| 213 | ||
| 214 | <userGoalI nfo> | |
| 215 | ||
| 216 | <goalName> | |
| 217 | misc | |
| 218 | </goalName > | |
| 219 | ||
| 220 | <commands> | |
| 221 | ||
| 222 | <!-- mvn g oal:misc Y our Miscel laneous Co mmand(s) H ere --> | |
| 223 | ||
| 224 | <!-- | |
| 225 | <com mand> | |
| 226 | <! [CDATA[<co py file="$ {basedir}/ myFile" t odir="${us er.home}/m yDir" />]] > | |
| 227 | </co mmand> | |
| 228 | --> | |
| 229 | ||
| 230 | <command> | |
| 231 | ||
| 232 | <![CDATA[< attainGoal name="--v ersion:--v ersion" /> ]]> | |
| 233 | ||
| 234 | </command> | |
| 235 | ||
| 236 | </commands > | |
| 237 | ||
| 238 | </userGoal Info> | |
| 239 | ||
| 240 | </userGoal List> | |
| 241 | ||
| 242 | </configur ation> | |
| 243 | ||
| 244 | </plugin> | |
| 245 | ||
| 246 | <plugin> | |
| 247 | ||
| 248 | <artifactI d> | |
| 249 | maven-comp iler-plugi n | |
| 250 | </artifact Id> | |
| 251 | ||
| 252 | <configura tion> | |
| 253 | ||
| 254 | <optimize> | |
| 255 | false | |
| 256 | </optimize > | |
| 257 | ||
| 258 | <compilerA rguments> | |
| 259 | ||
| 260 | <source> | |
| 261 | ${JAVA_VER SION} | |
| 262 | </source> | |
| 263 | ||
| 264 | <target> | |
| 265 | ${JAVA_VER SION} | |
| 266 | </target> | |
| 267 | ||
| 268 | <g /> | |
| 269 | ||
| 270 | <deprecati on /> | |
| 271 | ||
| 272 | </compiler Arguments> | |
| 273 | ||
| 274 | </configur ation> | |
| 275 | ||
| 276 | </plugin> | |
| 277 | ||
| 278 | <plugin> | |
| 279 | ||
| 280 | <artifactI d> | |
| 281 | maven-sure fire-plugi n | |
| 282 | </artifact Id> | |
| 283 | ||
| 284 | <configura tion> | |
| 285 | ||
| 286 | <forkMode> | |
| 287 | once | |
| 288 | </forkMode > | |
| 289 | ||
| 290 | <useFile> | |
| 291 | false | |
| 292 | </useFile> | |
| 293 | ||
| 294 | <includes> | |
| 295 | ||
| 296 | <include> | |
| 297 | **/Test*.j ava | |
| 298 | </include> | |
| 299 | ||
| 300 | </includes > | |
| 301 | ||
| 302 | </configur ation> | |
| 303 | ||
| 304 | </plugin> | |
| 305 | ||
| 306 | </plugins> | |
| 307 | ||
| 308 | </build> | |
| 309 | ||
| 310 | <dependenc ies> | |
| 311 | ||
| 312 | <dependenc y> | |
| 313 | ||
| 314 | <artifactI d> | |
| 315 | commons-lo gging | |
| 316 | </artifact Id> | |
| 317 | ||
| 318 | <groupId> | |
| 319 | commons-lo gging | |
| 320 | </groupId> | |
| 321 | ||
| 322 | <type> | |
| 323 | jar | |
| 324 | </type> | |
| 325 | ||
| 326 | <version> | |
| 327 | 1.1.1 | |
| 328 | </version> | |
| 329 | ||
| 330 | </dependen cy> | |
| 331 | ||
| 332 | <dependenc y> | |
| 333 | ||
| 334 | <artifactI d> | |
| 335 | commons-co dec | |
| 336 | </artifact Id> | |
| 337 | ||
| 338 | <groupId> | |
| 339 | commons-co dec | |
| 340 | </groupId> | |
| 341 | ||
| 342 | <type> | |
| 343 | jar | |
| 344 | </type> | |
| 345 | ||
| 346 | <version> | |
| 347 | 1.3 | |
| 348 | </version> | |
| 349 | ||
| 350 | </dependen cy> | |
| 351 | ||
| 352 | <dependenc y> | |
| 353 | ||
| 354 | <artifactI d> | |
| 355 | junit | |
| 356 | </artifact Id> | |
| 357 | ||
| 358 | <groupId> | |
| 359 | junit | |
| 360 | </groupId> | |
| 361 | ||
| 362 | <type> | |
| 363 | jar | |
| 364 | </type> | |
| 365 | ||
| 366 | <version> | |
| 367 | 3.8.2 | |
| 368 | </version> | |
| 369 | ||
| 370 | </dependen cy> | |
| 371 | ||
| 372 | <dependenc y> | |
| 373 | ||
| 374 | <artifactI d> | |
| 375 | log4j | |
| 376 | </artifact Id> | |
| 377 | ||
| 378 | <groupId> | |
| 379 | log4j | |
| 380 | </groupId> | |
| 381 | ||
| 382 | <type> | |
| 383 | jar | |
| 384 | </type> | |
| 385 | ||
| 386 | <version> | |
| 387 | 1.2.14 | |
| 388 | </version> | |
| 389 | ||
| 390 | </dependen cy> | |
| 391 | ||
| 392 | <dependenc y> | |
| 393 | ||
| 394 | <artifactI d> | |
| 395 | commons-cl i | |
| 396 | </artifact Id> | |
| 397 | ||
| 398 | <groupId> | |
| 399 | commons-cl i | |
| 400 | </groupId> | |
| 401 | ||
| 402 | <type> | |
| 403 | jar | |
| 404 | </type> | |
| 405 | ||
| 406 | <version> | |
| 407 | 1.2 | |
| 408 | </version> | |
| 409 | ||
| 410 | </dependen cy> | |
| 411 | ||
| 412 | </dependen cies> | |
| 413 | ||
| 414 | <reporting > | |
| 415 | ||
| 416 | <plugins> | |
| 417 | ||
| 418 | <plugin> | |
| 419 | ||
| 420 | <artifactI d> | |
| 421 | maven-chan ges-plugin | |
| 422 | </artifact Id> | |
| 423 | ||
| 424 | <configura tion> | |
| 425 | ||
| 426 | <xmlPath> | |
| 427 | ${basedir} /xdocs/cha nges.xml | |
| 428 | </xmlPath> | |
| 429 | ||
| 430 | </configur ation> | |
| 431 | ||
| 432 | </plugin> | |
| 433 | ||
| 434 | </plugins> | |
| 435 | ||
| 436 | </reportin g> | |
| 437 | ||
| 438 | <repositor ies> | |
| 439 | ||
| 440 | <repositor y> | |
| 441 | ||
| 442 | <id> | |
| 443 | Preferred- Remote-Rep ository-#1 | |
| 444 | </id> | |
| 445 | ||
| 446 | <url> | |
| 447 | http:// IP /m2 | |
| 448 | </url> | |
| 449 | ||
| 450 | </reposito ry> | |
| 451 | ||
| 452 | <repositor y> | |
| 453 | ||
| 454 | <id> | |
| 455 | Preferred- Remote-Rep ository-#2 | |
| 456 | </id> | |
| 457 | ||
| 458 | <url> | |
| 459 | http:// IP /m2 | |
| 460 | </url> | |
| 461 | ||
| 462 | </reposito ry> | |
| 463 | ||
| 464 | <repositor y> | |
| 465 | ||
| 466 | <id> | |
| 467 | Preferred- Remote-Rep ository-#3 | |
| 468 | </id> | |
| 469 | ||
| 470 | <url> | |
| 471 | http://rep o1.maven.o rg/maven2 | |
| 472 | </url> | |
| 473 | ||
| 474 | </reposito ry> | |
| 475 | ||
| 476 | <repositor y> | |
| 477 | ||
| 478 | <id> | |
| 479 | Preferred- Remote-Rep ository-#4 | |
| 480 | </id> | |
| 481 | ||
| 482 | <url> | |
| 483 | http://www .mvnreposi tory.com/a rtifact | |
| 484 | </url> | |
| 485 | ||
| 486 | </reposito ry> | |
| 487 | ||
| 488 | </reposito ries> | |
| 489 | ||
| 490 | <propertie s> | |
| 491 | ||
| 492 | <maven.bui ld.dir> | |
| 493 | ${basedir} /target | |
| 494 | </maven.bu ild.dir> | |
| 495 | ||
| 496 | <webserver .lib.dir> | |
| 497 | ${env.TOMC AT6_HOME}/ lib | |
| 498 | </webserve r.lib.dir> | |
| 499 | ||
| 500 | <maven.fin al.name> | |
| 501 | ${artifact Id}-${vers ion} | |
| 502 | </maven.fi nal.name> | |
| 503 | ||
| 504 | </properti es> | |
| 505 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.