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\bookmarking-service | pom.xml | Thu Dec 14 19:56:16 2017 UTC |
| 2 | Genisis_2.0_v6_bld6.zip\Source Code\TS\Service\bookmarking-service | pom.xml | Wed Dec 20 20:24:10 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 736 |
| 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 | <parent> | |
| 12 | ||
| 13 | <groupId> | |
| 14 | gov.va.gen isis2 | |
| 15 | </groupId> | |
| 16 | ||
| 17 | <artifactI d> | |
| 18 | ts-common- parent | |
| 19 | </artifact Id> | |
| 20 | ||
| 21 | <relativeP ath> | |
| 22 | ../common/ pom.xml | |
| 23 | </relative Path> | |
| 24 | ||
| 25 | <version> | |
| 26 | 7.0.5-SNAP SHOT | |
| 27 | </version> | |
| 28 | ||
| 29 | </parent> | |
| 30 | ||
| 31 | <artifactI d> | |
| 32 | Bookmarkin gService | |
| 33 | </artifact Id> | |
| 34 | ||
| 35 | <packaging > | |
| 36 | war | |
| 37 | </packagin g> | |
| 38 | ||
| 39 | ||
| 40 | <name> | |
| 41 | ts-bookmar king-servi ce | |
| 42 | </name> | |
| 43 | ||
| 44 | ||
| 45 | <propertie s> | |
| 46 | ||
| 47 | <warName> | |
| 48 | Bookmarkin gService | |
| 49 | </warName> | |
| 50 | ||
| 51 | <context-p ath> | |
| 52 | Bookmarkin gService | |
| 53 | </context- path> | |
| 54 | ||
| 55 | <common.ap i.version> | |
| 56 | 1.0.0-SNAP SHOT | |
| 57 | </common.a pi.version > | |
| 58 | ||
| 59 | </properti es> | |
| 60 | ||
| 61 | ||
| 62 | <!-- SCM c onnection properties for mvn r elease plu gin --> | |
| 63 | ||
| 64 | <scm> | |
| 65 | ||
| 66 | <connectio n> | |
| 67 | URL | |
| 68 | </connecti on> | |
| 69 | ||
| 70 | <developer Connection > | |
| 71 | URL | |
| 72 | </develope rConnectio n> | |
| 73 | ||
| 74 | <url> | |
| 75 | URL | |
| 76 | </url> | |
| 77 | ||
| 78 | <tag> | |
| 79 | HEAD | |
| 80 | </tag> | |
| 81 | ||
| 82 | </scm> | |
| 83 | ||
| 84 | ||
| 85 | <dependenc ies> | |
| 86 | ||
| 87 | <dependenc y> | |
| 88 | ||
| 89 | <groupId> | |
| 90 | gov.va.gen isis2 | |
| 91 | </groupId> | |
| 92 | ||
| 93 | <artifactI d> | |
| 94 | ts-common- api | |
| 95 | </artifact Id> | |
| 96 | ||
| 97 | </dependen cy> | |
| 98 | ||
| 99 | <dependenc y> | |
| 100 | ||
| 101 | <groupId> | |
| 102 | org.spring framework | |
| 103 | </groupId> | |
| 104 | ||
| 105 | <artifactI d> | |
| 106 | spring-web | |
| 107 | </artifact Id> | |
| 108 | ||
| 109 | </dependen cy> | |
| 110 | ||
| 111 | <dependenc y> | |
| 112 | ||
| 113 | <groupId> | |
| 114 | org.spring framework | |
| 115 | </groupId> | |
| 116 | ||
| 117 | <artifactI d> | |
| 118 | spring-web mvc | |
| 119 | </artifact Id> | |
| 120 | ||
| 121 | </dependen cy> | |
| 122 | ||
| 123 | <dependenc y> | |
| 124 | ||
| 125 | <groupId> | |
| 126 | org.spring framework | |
| 127 | </groupId> | |
| 128 | ||
| 129 | <artifactI d> | |
| 130 | spring-cor e | |
| 131 | </artifact Id> | |
| 132 | ||
| 133 | </dependen cy> | |
| 134 | ||
| 135 | ||
| 136 | <!-- Jacks on JSON Pr ocessor -- > | |
| 137 | ||
| 138 | <dependenc y> | |
| 139 | ||
| 140 | <groupId> | |
| 141 | com.faster xml.jackso n.core | |
| 142 | </groupId> | |
| 143 | ||
| 144 | <artifactI d> | |
| 145 | jackson-da tabind | |
| 146 | </artifact Id> | |
| 147 | ||
| 148 | </dependen cy> | |
| 149 | ||
| 150 | ||
| 151 | <!--Log4 - -> | |
| 152 | ||
| 153 | <dependenc y> | |
| 154 | ||
| 155 | <groupId> | |
| 156 | org.apache .logging.l og4j | |
| 157 | </groupId> | |
| 158 | ||
| 159 | <artifactI d> | |
| 160 | log4j-api | |
| 161 | </artifact Id> | |
| 162 | ||
| 163 | </dependen cy> | |
| 164 | ||
| 165 | <dependenc y> | |
| 166 | ||
| 167 | <groupId> | |
| 168 | org.apache .logging.l og4j | |
| 169 | </groupId> | |
| 170 | ||
| 171 | <artifactI d> | |
| 172 | log4j-core | |
| 173 | </artifact Id> | |
| 174 | ||
| 175 | </dependen cy> | |
| 176 | ||
| 177 | <dependenc y> | |
| 178 | ||
| 179 | <groupId> | |
| 180 | com.micros oft.sqlser ver | |
| 181 | </groupId> | |
| 182 | ||
| 183 | <artifactI d> | |
| 184 | mssql-jdbc | |
| 185 | </artifact Id> | |
| 186 | ||
| 187 | </dependen cy> | |
| 188 | ||
| 189 | <dependenc y> | |
| 190 | ||
| 191 | <groupId> | |
| 192 | org.spring framework. data | |
| 193 | </groupId> | |
| 194 | ||
| 195 | <artifactI d> | |
| 196 | spring-dat a-jpa | |
| 197 | </artifact Id> | |
| 198 | ||
| 199 | </dependen cy> | |
| 200 | ||
| 201 | <dependenc y> | |
| 202 | ||
| 203 | <groupId> | |
| 204 | org.spring framework | |
| 205 | </groupId> | |
| 206 | ||
| 207 | <artifactI d> | |
| 208 | spring-orm | |
| 209 | </artifact Id> | |
| 210 | ||
| 211 | </dependen cy> | |
| 212 | ||
| 213 | <dependenc y> | |
| 214 | ||
| 215 | <groupId> | |
| 216 | org.hibern ate | |
| 217 | </groupId> | |
| 218 | ||
| 219 | <artifactI d> | |
| 220 | hibernate- entitymana ger | |
| 221 | </artifact Id> | |
| 222 | ||
| 223 | </dependen cy> | |
| 224 | ||
| 225 | <dependenc y> | |
| 226 | ||
| 227 | <groupId> | |
| 228 | org.owasp. esapi | |
| 229 | </groupId> | |
| 230 | ||
| 231 | <artifactI d> | |
| 232 | esapi | |
| 233 | </artifact Id> | |
| 234 | ||
| 235 | <version> | |
| 236 | 2.1.0.1 | |
| 237 | </version> | |
| 238 | ||
| 239 | </dependen cy> | |
| 240 | ||
| 241 | </dependen cies> | |
| 242 | ||
| 243 | ||
| 244 | <repositor ies> | |
| 245 | ||
| 246 | <repositor y> | |
| 247 | ||
| 248 | <id> | |
| 249 | Maven Cent ral | |
| 250 | </id> | |
| 251 | ||
| 252 | <url> | |
| 253 | http://rep o.maven.ap ache.org/m aven2/ | |
| 254 | </url> | |
| 255 | ||
| 256 | </reposito ry> | |
| 257 | ||
| 258 | </reposito ries> | |
| 259 | ||
| 260 | ||
| 261 | <build> | |
| 262 | ||
| 263 | <sourceDir ectory> | |
| 264 | src/main/j ava | |
| 265 | </sourceDi rectory> | |
| 266 | ||
| 267 | <resources > | |
| 268 | ||
| 269 | <resource> | |
| 270 | ||
| 271 | <directory > | |
| 272 | src/main/r esources | |
| 273 | </director y> | |
| 274 | ||
| 275 | <includes> | |
| 276 | ||
| 277 | <include> | |
| 278 | **/* | |
| 279 | </include> | |
| 280 | ||
| 281 | </includes > | |
| 282 | ||
| 283 | </resource > | |
| 284 | ||
| 285 | </resource s> | |
| 286 | ||
| 287 | ||
| 288 | <plugins> | |
| 289 | ||
| 290 | <!-- Maven Compiler Plugin --> | |
| 291 | ||
| 292 | <plugin> | |
| 293 | ||
| 294 | <groupId> | |
| 295 | org.apache .maven.plu gins | |
| 296 | </groupId> | |
| 297 | ||
| 298 | <artifactI d> | |
| 299 | maven-comp iler-plugi n | |
| 300 | </artifact Id> | |
| 301 | ||
| 302 | <configura tion> | |
| 303 | ||
| 304 | <source> | |
| 305 | 1.8 | |
| 306 | </source> | |
| 307 | ||
| 308 | <target> | |
| 309 | 1.8 | |
| 310 | </target> | |
| 311 | ||
| 312 | </configur ation> | |
| 313 | ||
| 314 | </plugin> | |
| 315 | ||
| 316 | <plugin> | |
| 317 | ||
| 318 | <groupId> | |
| 319 | org.apache .maven.plu gins | |
| 320 | </groupId> | |
| 321 | ||
| 322 | <artifactI d> | |
| 323 | maven-war- plugin | |
| 324 | </artifact Id> | |
| 325 | ||
| 326 | <configura tion> | |
| 327 | ||
| 328 | <warName> | |
| 329 | ${warName} | |
| 330 | </warName> | |
| 331 | ||
| 332 | </configur ation> | |
| 333 | ||
| 334 | </plugin> | |
| 335 | ||
| 336 | <plugin> | |
| 337 | ||
| 338 | <groupId> | |
| 339 | org.apache .tomcat.ma ven | |
| 340 | </groupId> | |
| 341 | ||
| 342 | <artifactI d> | |
| 343 | tomcat7-ma ven-plugin | |
| 344 | </artifact Id> | |
| 345 | ||
| 346 | <configura tion> | |
| 347 | ||
| 348 | <server> | |
| 349 | TomcatServ er | |
| 350 | </server> | |
| 351 | ||
| 352 | <warFile> | |
| 353 | /${project .build.dir ectory}/${ warName}.w ar | |
| 354 | </warFile> | |
| 355 | ||
| 356 | <path> | |
| 357 | /${context -path} | |
| 358 | </path> | |
| 359 | ||
| 360 | <update> | |
| 361 | true | |
| 362 | </update> | |
| 363 | ||
| 364 | </configur ation> | |
| 365 | ||
| 366 | </plugin> | |
| 367 | ||
| 368 | </plugins> | |
| 369 | ||
| 370 | </build> | |
| 371 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.