Produced by Araxis Merge on 7/6/2017 8:22:51 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 | OSCIF_CTT_v4_build 1.zip\ISAAC-file-transfer-utils | pom.xml | Wed May 31 03:58:42 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\ISAAC-file-transfer-utils | pom.xml | Mon Jul 3 21:54:13 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 506 |
| Changed | 2 | 5 |
| 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 | |||
| 12 | <parent> | ||
| 13 | |||
| 14 | <groupId> | ||
| 15 | gov.vha.is aac.ochre | ||
| 16 | </groupId> | ||
| 17 | |||
| 18 | <artifactI d> | ||
| 19 | isaac-pare nt | ||
| 20 | </artifact Id> | ||
| 21 | |||
| 22 | <version> | ||
| 23 | 4.04 | ||
| 24 | </version> | ||
| 25 | |||
| 26 | </parent> | ||
| 27 | |||
| 28 | |||
| 29 | <groupId> | ||
| 30 | gov.vha.is aac.utils | ||
| 31 | </groupId> | ||
| 32 | |||
| 33 | <artifactI d> | ||
| 34 | isaac-file -transfer- utils | ||
| 35 | </artifact Id> | ||
| 36 | |||
| 37 | <version> | ||
| 38 | 1.3.15-SNA PSHOT | ||
| 39 | </version> | ||
| 40 | |||
| 41 | <packaging > | ||
| 42 | jar | ||
| 43 | </packagin g> | ||
| 44 | |||
| 45 | |||
| 46 | <name> | ||
| 47 | file-trans fer | ||
| 48 | </name> | ||
| 49 | |||
| 50 | <url> | ||
| 51 | https://DN S :PORT | ||
| 52 | </url> | ||
| 53 | |||
| 54 | |||
| 55 | <scm> | ||
| 56 | |||
| 57 | <url> | ||
| 58 | https://DN S :PORT | ||
| 59 | |||
| 60 | </scm> | ||
| 61 | |||
| 62 | |||
| 63 | <dependenc ies> | ||
| 64 | |||
| 65 | <dependenc y> | ||
| 66 | |||
| 67 | <groupId> | ||
| 68 | net.lingal a.zip4j | ||
| 69 | </groupId> | ||
| 70 | |||
| 71 | <artifactI d> | ||
| 72 | zip4j | ||
| 73 | </artifact Id> | ||
| 74 | |||
| 75 | <version> | ||
| 76 | 1.3.2 | ||
| 77 | </version> | ||
| 78 | |||
| 79 | </dependen cy> | ||
| 80 | |||
| 81 | <dependenc y> | ||
| 82 | |||
| 83 | <groupId> | ||
| 84 | org.apache .commons | ||
| 85 | </groupId> | ||
| 86 | |||
| 87 | <artifactI d> | ||
| 88 | commons-la ng3 | ||
| 89 | </artifact Id> | ||
| 90 | |||
| 91 | </dependen cy> | ||
| 92 | |||
| 93 | <dependenc y> | ||
| 94 | |||
| 95 | <groupId> | ||
| 96 | commons-cl i | ||
| 97 | </groupId> | ||
| 98 | |||
| 99 | <artifactI d> | ||
| 100 | commons-cl i | ||
| 101 | </artifact Id> | ||
| 102 | |||
| 103 | <version> | ||
| 104 | 1.3 | ||
| 105 | </version> | ||
| 106 | |||
| 107 | </dependen cy> | ||
| 108 | |||
| 109 | <dependenc y> | ||
| 110 | |||
| 111 | <groupId> | ||
| 112 | com.faster xml.jackso n.core | ||
| 113 | </groupId> | ||
| 114 | |||
| 115 | <artifactI d> | ||
| 116 | jackson-da tabind | ||
| 117 | </artifact Id> | ||
| 118 | |||
| 119 | <version> | ||
| 120 | 2.6.3 | ||
| 121 | </version> | ||
| 122 | |||
| 123 | </dependen cy> | ||
| 124 | |||
| 125 | <dependenc y> | ||
| 126 | |||
| 127 | <groupId> | ||
| 128 | org.apache .logging.l og4j | ||
| 129 | </groupId> | ||
| 130 | |||
| 131 | <artifactI d> | ||
| 132 | log4j-slf4 j-impl | ||
| 133 | </artifact Id> | ||
| 134 | |||
| 135 | <scope> | ||
| 136 | compile | ||
| 137 | </scope> | ||
| 138 | |||
| 139 | </dependen cy> | ||
| 140 | |||
| 141 | <dependenc y> | ||
| 142 | |||
| 143 | <groupId> | ||
| 144 | org.apache .logging.l og4j | ||
| 145 | </groupId> | ||
| 146 | |||
| 147 | <artifactI d> | ||
| 148 | log4j-core | ||
| 149 | </artifact Id> | ||
| 150 | |||
| 151 | <scope> | ||
| 152 | compile | ||
| 153 | </scope> | ||
| 154 | |||
| 155 | </dependen cy> | ||
| 156 | |||
| 157 | </dependen cies> | ||
| 158 | |||
| 159 | |||
| 160 | <build> | ||
| 161 | |||
| 162 | <plugins> | ||
| 163 | |||
| 164 | <plugin> | ||
| 165 | |||
| 166 | <artifactI d> | ||
| 167 | maven-asse mbly-plugi n | ||
| 168 | </artifact Id> | ||
| 169 | |||
| 170 | <execution s> | ||
| 171 | |||
| 172 | <execution > | ||
| 173 | |||
| 174 | <id> | ||
| 175 | make-uber- jar | ||
| 176 | </id> | ||
| 177 | |||
| 178 | <phase> | ||
| 179 | package | ||
| 180 | </phase> | ||
| 181 | |||
| 182 | <configura tion> | ||
| 183 | |||
| 184 | <archive> | ||
| 185 | |||
| 186 | <manifest> | ||
| 187 | |||
| 188 | <mainClass > | ||
| 189 | gov.vha.is aac.utils. file_trans fer.FileTr ansfer | ||
| 190 | </mainClas s> | ||
| 191 | |||
| 192 | </manifest > | ||
| 193 | |||
| 194 | </archive> | ||
| 195 | |||
| 196 | <descripto rRefs> | ||
| 197 | |||
| 198 | <descripto rRef> | ||
| 199 | jar-with-d ependencie s | ||
| 200 | </descript orRef> | ||
| 201 | |||
| 202 | </descript orRefs> | ||
| 203 | |||
| 204 | </configur ation> | ||
| 205 | |||
| 206 | <goals> | ||
| 207 | |||
| 208 | <goal> | ||
| 209 | single | ||
| 210 | </goal> | ||
| 211 | |||
| 212 | </goals> | ||
| 213 | |||
| 214 | </executio n> | ||
| 215 | |||
| 216 | <execution > | ||
| 217 | |||
| 218 | <id> | ||
| 219 | make-zip | ||
| 220 | </id> | ||
| 221 | |||
| 222 | <phase> | ||
| 223 | package | ||
| 224 | </phase> | ||
| 225 | |||
| 226 | <configura tion> | ||
| 227 | |||
| 228 | <descripto rs> | ||
| 229 | |||
| 230 | <descripto r> | ||
| 231 | ${basedir} /src/main/ assembly.x ml | ||
| 232 | </descript or> | ||
| 233 | |||
| 234 | </descript ors> | ||
| 235 | |||
| 236 | </configur ation> | ||
| 237 | |||
| 238 | <goals> | ||
| 239 | |||
| 240 | <goal> | ||
| 241 | single | ||
| 242 | </goal> | ||
| 243 | |||
| 244 | </goals> | ||
| 245 | |||
| 246 | </executio n> | ||
| 247 | |||
| 248 | </executio ns> | ||
| 249 | |||
| 250 | </plugin> | ||
| 251 | |||
| 252 | </plugins> | ||
| 253 | |||
| 254 | </build> | ||
| 255 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.