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