Produced by Araxis Merge on 7/9/2017 11:01:19 PM Eastern 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 | PPS_N_3.0_Iter2_Build_360.zip\Unredacted\PS_PPS_interface | pom.xml | Fri Jun 30 19:00:00 2017 UTC |
2 | PPS_N_3.0_Iter2_Build_360.zip\Unredacted\PS_PPS_interface | pom.xml | Fri Jul 7 15:51:31 2017 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 1162 |
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 | <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 | ||
5 | xsi:schema Location=" http://mav en.apache. org/POM/4. 0.0 http:/ /maven.apa che.org/xs d/maven-4. 0.0.xsd" | |
6 | > | |
7 | ||
8 | <modelVers ion> | |
9 | 4.0.0 | |
10 | </modelVer sion> | |
11 | ||
12 | <artifactI d> | |
13 | PS_PPS_int erface | |
14 | </artifact Id> | |
15 | ||
16 | <parent> | |
17 | ||
18 | <groupId> | |
19 | gov.va.med .pharmacy | |
20 | </groupId> | |
21 | ||
22 | <artifactI d> | |
23 | PS_PPS | |
24 | </artifact Id> | |
25 | ||
26 | <version> | |
27 | 3.0.0-SNAP SHOT | |
28 | </version> | |
29 | ||
30 | <relativeP ath> | |
31 | ../PS_PPS/ pom.xml | |
32 | </relative Path> | |
33 | ||
34 | </parent> | |
35 | ||
36 | ||
37 | <propertie s> | |
38 | ||
39 | <cxf.versi on> | |
40 | 3.1.10 | |
41 | </cxf.vers ion> | |
42 | ||
43 | ||
44 | <!-- Many of the aut omated tes ts in this project a re broken. Skip them for now. --> | |
45 | ||
46 | <skipTests > | |
47 | true | |
48 | </skipTest s> | |
49 | ||
50 | <schema.bi nding.dire ctory> | |
51 | etc/xml/sc hema | |
52 | </schema.b inding.dir ectory> | |
53 | ||
54 | <schema.di rectory> | |
55 | etc/xml/sc hema | |
56 | </schema.d irectory> | |
57 | ||
58 | ||
59 | <!-- | |
60 | <for tify.sca.t ranslate.s ourcePath> ${project. basedir}/s rc/main/ge nerated</f ortify.sca .translate .sourcePat h> | |
61 | ||
62 | ||
63 | <for tify.sca.c p>${projec t.basedir} /target/cl asses</for tify.sca.c p> | |
64 | --> | |
65 | ||
66 | ||
67 | </properti es> | |
68 | ||
69 | ||
70 | <repositor ies> | |
71 | ||
72 | <repositor y> | |
73 | ||
74 | <id> | |
75 | project.lo cal | |
76 | </id> | |
77 | ||
78 | <name> | |
79 | project | |
80 | </name> | |
81 | ||
82 | <url> | |
83 | file:${pro ject.based ir}/../PS_ PPS_lib/ma venrepo | |
84 | </url> | |
85 | ||
86 | <releases> | |
87 | ||
88 | <checksumP olicy> | |
89 | false | |
90 | </checksum Policy> | |
91 | ||
92 | <!-- | |
93 | <updateP olicy>neve r</updateP olicy> | |
94 | --> | |
95 | ||
96 | </releases > | |
97 | ||
98 | <snapshots > | |
99 | ||
100 | <enabled> | |
101 | false | |
102 | </enabled> | |
103 | ||
104 | </snapshot s> | |
105 | ||
106 | </reposito ry> | |
107 | ||
108 | </reposito ries> | |
109 | ||
110 | ||
111 | ||
112 | <build> | |
113 | ||
114 | <pluginMan agement> | |
115 | ||
116 | <plugins> | |
117 | ||
118 | <!-- | |
119 | <plugi n> | |
120 | <groupId >com.forti fy.ps.mave n.plugin</ groupId> | |
121 | <artifac tId>sca-ma ven-plugin </artifact Id> | |
122 | <configu ration> | |
123 | <buildId>M YBUILDID</ buildId> | |
124 | <toplevelA rtifactId> PS_PPS_For tify</topl evelArtifa ctId> | |
125 | <source>1. 8</source> | |
126 | <skipTests >true</ski pTests> | |
127 | <extraCl assPathStr ing>${fort ify.sca.cp }</extraCl assPathStr ing> | |
128 | </config uration> | |
129 | </plug in> | |
130 | -- > | |
131 | ||
132 | <plugin> | |
133 | ||
134 | <groupId> | |
135 | org.apache .maven.plu gins | |
136 | </groupId> | |
137 | ||
138 | <artifactI d> | |
139 | maven-jar- plugin | |
140 | </artifact Id> | |
141 | ||
142 | <execution s> | |
143 | ||
144 | <execution > | |
145 | ||
146 | <goals> | |
147 | ||
148 | <goal> | |
149 | test-jar | |
150 | </goal> | |
151 | ||
152 | </goals> | |
153 | ||
154 | </executio n> | |
155 | ||
156 | </executio ns> | |
157 | ||
158 | </plugin> | |
159 | ||
160 | </plugins> | |
161 | ||
162 | </pluginMa nagement> | |
163 | ||
164 | <plugins> | |
165 | ||
166 | <!-- Plugi n required to genera te java cl asses from XSD using XJC --> | |
167 | ||
168 | <plugin> | |
169 | ||
170 | <groupId> | |
171 | org.jvnet. jaxb2.mave n2 | |
172 | </groupId> | |
173 | ||
174 | <artifactI d> | |
175 | maven-jaxb 2-plugin | |
176 | </artifact Id> | |
177 | ||
178 | <execution s> | |
179 | ||
180 | <execution > | |
181 | ||
182 | <goals> | |
183 | ||
184 | <goal> | |
185 | generate | |
186 | </goal> | |
187 | ||
188 | </goals> | |
189 | ||
190 | </executio n> | |
191 | ||
192 | </executio ns> | |
193 | ||
194 | <configura tion> | |
195 | ||
196 | <bindingDi rectory> | |
197 | ${schema.b inding.dir ectory} | |
198 | </bindingD irectory> | |
199 | ||
200 | <bindingIn cludes> | |
201 | ||
202 | <include> | |
203 | *.xjb | |
204 | </include> | |
205 | ||
206 | </bindingI ncludes> | |
207 | ||
208 | <schemaDir ectory> | |
209 | ${schema.d irectory} | |
210 | </schemaDi rectory> | |
211 | ||
212 | <schemaInc ludes> | |
213 | ||
214 | <include> | |
215 | *.xsd | |
216 | </include> | |
217 | ||
218 | <include> | |
219 | **/*.xsd | |
220 | </include> | |
221 | ||
222 | </schemaIn cludes> | |
223 | ||
224 | </configur ation> | |
225 | ||
226 | </plugin> | |
227 | ||
228 | <plugin> | |
229 | ||
230 | <groupId> | |
231 | org.apache .cxf | |
232 | </groupId> | |
233 | ||
234 | <artifactI d> | |
235 | cxf-codege n-plugin | |
236 | </artifact Id> | |
237 | ||
238 | <version> | |
239 | ${cxf.vers ion} | |
240 | </version> | |
241 | ||
242 | <execution s> | |
243 | ||
244 | <execution > | |
245 | ||
246 | <id> | |
247 | generate-s ources | |
248 | </id> | |
249 | ||
250 | <phase> | |
251 | generate-s ources | |
252 | </phase> | |
253 | ||
254 | <configura tion> | |
255 | ||
256 | <!-- <sour ceRoot>${p roject.bui ld.directo ry}/genera ted-source s/cxf</sou rceRoot> - -> | |
257 | ||
258 | <wsdlOptio ns> | |
259 | ||
260 | <wsdlOptio n> | |
261 | ||
262 | <wsdl> | |
263 | ${project. basedir}/e tc/xml/sch ema/ctServ ice.wsdl | |
264 | </wsdl> | |
265 | ||
266 | <extraargs > | |
267 | ||
268 | <extraarg> | |
269 | -client | |
270 | </extraarg > | |
271 | ||
272 | <extraarg> | |
273 | -p | |
274 | </extraarg > | |
275 | ||
276 | <extraarg> | |
277 | ct.webserv ice. DNS . URL | |
278 | </extraarg > | |
279 | ||
280 | </extraarg s> | |
281 | ||
282 | </wsdlOpti on> | |
283 | ||
284 | </wsdlOpti ons> | |
285 | ||
286 | </configur ation> | |
287 | ||
288 | <goals> | |
289 | ||
290 | <goal> | |
291 | wsdl2java | |
292 | </goal> | |
293 | ||
294 | </goals> | |
295 | ||
296 | </executio n> | |
297 | ||
298 | </executio ns> | |
299 | ||
300 | </plugin> | |
301 | ||
302 | </plugins> | |
303 | ||
304 | </build> | |
305 | ||
306 | <dependenc ies> | |
307 | ||
308 | <dependenc y> | |
309 | ||
310 | <groupId> | |
311 | gov.va.med .pharmacy | |
312 | </groupId> | |
313 | ||
314 | <artifactI d> | |
315 | PS_PPS_com mon | |
316 | </artifact Id> | |
317 | ||
318 | <version> | |
319 | ${project. version} | |
320 | </version> | |
321 | ||
322 | </dependen cy> | |
323 | ||
324 | <dependenc y> | |
325 | ||
326 | <groupId> | |
327 | gov.va.med .pharmacy | |
328 | </groupId> | |
329 | ||
330 | <artifactI d> | |
331 | PS_PPS_com mon | |
332 | </artifact Id> | |
333 | ||
334 | <version> | |
335 | ${project. version} | |
336 | </version> | |
337 | ||
338 | <type> | |
339 | test-jar | |
340 | </type> | |
341 | ||
342 | <scope> | |
343 | test | |
344 | </scope> | |
345 | ||
346 | </dependen cy> | |
347 | ||
348 | <!-- FDB D IF --> | |
349 | ||
350 | <dependenc y> | |
351 | ||
352 | <groupId> | |
353 | fdb.dif | |
354 | </groupId> | |
355 | ||
356 | <artifactI d> | |
357 | dif | |
358 | </artifact Id> | |
359 | ||
360 | </dependen cy> | |
361 | ||
362 | <dependenc y> | |
363 | ||
364 | <groupId> | |
365 | fdb.dif | |
366 | </groupId> | |
367 | ||
368 | <artifactI d> | |
369 | fdbdatacon nection | |
370 | </artifact Id> | |
371 | ||
372 | </dependen cy> | |
373 | ||
374 | <!-- Sprin g Framewor k --> | |
375 | ||
376 | <dependenc y> | |
377 | ||
378 | <groupId> | |
379 | org.spring framework | |
380 | </groupId> | |
381 | ||
382 | <artifactI d> | |
383 | spring-cor e | |
384 | </artifact Id> | |
385 | ||
386 | </dependen cy> | |
387 | ||
388 | <dependenc y> | |
389 | ||
390 | <groupId> | |
391 | org.spring framework | |
392 | </groupId> | |
393 | ||
394 | <artifactI d> | |
395 | spring-jdb c | |
396 | </artifact Id> | |
397 | ||
398 | </dependen cy> | |
399 | ||
400 | <!-- VistA Link --> | |
401 | ||
402 | <dependenc y> | |
403 | ||
404 | <groupId> | |
405 | gov.va.med .vistalink | |
406 | </groupId> | |
407 | ||
408 | <artifactI d> | |
409 | vljConnect or | |
410 | </artifact Id> | |
411 | ||
412 | <!-- Versi on specifi ed in pare nt POM. -- > | |
413 | ||
414 | <!-- This dependency must be p icked up f rom the de ployed Res ource Adap ter. --> | |
415 | ||
416 | <scope> | |
417 | provided | |
418 | </scope> | |
419 | ||
420 | <!-- We us e the Log4 j 1.x -> 2 .x bridge instead. - -> | |
421 | ||
422 | <exclusion s> | |
423 | ||
424 | <exclusion > | |
425 | ||
426 | <groupId> | |
427 | log4j | |
428 | </groupId> | |
429 | ||
430 | <artifactI d> | |
431 | log4j | |
432 | </artifact Id> | |
433 | ||
434 | </exclusio n> | |
435 | ||
436 | </exclusio ns> | |
437 | ||
438 | </dependen cy> | |
439 | ||
440 | <dependenc y> | |
441 | ||
442 | <groupId> | |
443 | gov.va.med .vistalink | |
444 | </groupId> | |
445 | ||
446 | <artifactI d> | |
447 | vljFoundat ionsLib | |
448 | </artifact Id> | |
449 | ||
450 | <!-- Versi on specifi ed in pare nt POM. -- > | |
451 | ||
452 | <!-- This dependency must be p icked up f rom the de ployed Res ource Adap ter. --> | |
453 | ||
454 | <scope> | |
455 | provided | |
456 | </scope> | |
457 | ||
458 | <!-- We us e the Log4 j 1.x -> 2 .x bridge instead. - -> | |
459 | ||
460 | <exclusion s> | |
461 | ||
462 | <exclusion > | |
463 | ||
464 | <groupId> | |
465 | log4j | |
466 | </groupId> | |
467 | ||
468 | <artifactI d> | |
469 | log4j | |
470 | </artifact Id> | |
471 | ||
472 | </exclusio n> | |
473 | ||
474 | </exclusio ns> | |
475 | ||
476 | </dependen cy> | |
477 | ||
478 | <!-- Pull in the Log 4j 1.x -> 2.x bridge just for VistALink. (We exclu ded the Lo g4j 1.x de pendency a bove.) --> | |
479 | ||
480 | <dependenc y> | |
481 | ||
482 | <groupId> | |
483 | org.apache .logging.l og4j | |
484 | </groupId> | |
485 | ||
486 | <artifactI d> | |
487 | log4j-1.2- api | |
488 | </artifact Id> | |
489 | ||
490 | <!-- Versi on specifi ed in pare nt POM. -- > | |
491 | ||
492 | <!-- We de ploy this dependency in WebLog ic. --> | |
493 | ||
494 | <scope> | |
495 | provided | |
496 | </scope> | |
497 | ||
498 | </dependen cy> | |
499 | ||
500 | ||
501 | <!-- Some remaining 1.x code r elies on t his interf ace. --> | |
502 | ||
503 | <dependenc y> | |
504 | ||
505 | <groupId> | |
506 | javax.reso urce | |
507 | </groupId> | |
508 | ||
509 | <artifactI d> | |
510 | connector- api | |
511 | </artifact Id> | |
512 | ||
513 | <!-- When deployed, this inter face is pr ovided by the contai ner. --> | |
514 | ||
515 | <scope> | |
516 | provided | |
517 | </scope> | |
518 | ||
519 | </dependen cy> | |
520 | ||
521 | <!-- Apach e Commons --> | |
522 | ||
523 | <dependenc y> | |
524 | ||
525 | <groupId> | |
526 | commons-io | |
527 | </groupId> | |
528 | ||
529 | <artifactI d> | |
530 | commons-io | |
531 | </artifact Id> | |
532 | ||
533 | </dependen cy> | |
534 | ||
535 | <!-- Apach e CFX --> | |
536 | ||
537 | <dependenc y> | |
538 | ||
539 | <groupId> | |
540 | xerces | |
541 | </groupId> | |
542 | ||
543 | <artifactI d> | |
544 | xercesImpl | |
545 | </artifact Id> | |
546 | ||
547 | </dependen cy> | |
548 | ||
549 | <dependenc y> | |
550 | ||
551 | <groupId> | |
552 | org.apache .cxf | |
553 | </groupId> | |
554 | ||
555 | <artifactI d> | |
556 | cxf-rt-fro ntend-jaxw s | |
557 | </artifact Id> | |
558 | ||
559 | <version> | |
560 | ${cxf.vers ion} | |
561 | </version> | |
562 | ||
563 | </dependen cy> | |
564 | ||
565 | <dependenc y> | |
566 | ||
567 | <groupId> | |
568 | org.apache .cxf | |
569 | </groupId> | |
570 | ||
571 | <artifactI d> | |
572 | cxf-rt-tra nsports-ht tp | |
573 | </artifact Id> | |
574 | ||
575 | <version> | |
576 | ${cxf.vers ion} | |
577 | </version> | |
578 | ||
579 | </dependen cy> | |
580 | ||
581 | </dependen cies> | |
582 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.