Produced by Araxis Merge on 6/9/2017 3:49:39 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 | Fri Jun 9 19:49:39 2017 UTC | ||
| 2 | eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\lib\javax\xml\bind\jaxb-api\2.2.2 | jaxb-api-2.2.2.pom | Fri Apr 21 20:03:24 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 155 |
| 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 vers ion="1.0"? > | |||||
| 2 | <!-- | |||||
| 3 | ||||||
| 4 | DO NOT ALTER OR REMOVE COP YRIGHT NOT ICES OR TH IS HEADER. | |||||
| 5 | ||||||
| 6 | Copyri ght (c) 20 10 Oracle and/or its affiliate s. All rig hts reserv ed. | |||||
| 7 | ||||||
| 8 | The co ntents of this file are subjec t to the t erms of ei ther the G NU | |||||
| 9 | Genera l Public L icense Ver sion 2 onl y ("GPL") or the Com mon Develo pment | |||||
| 10 | and Di stribution License(" CDDL") (co llectively , the "Lic ense"). Y ou | |||||
| 11 | may no t use this file exce pt in comp liance wit h the Lice nse. You can | |||||
| 12 | obtain a copy of the Licen se at | |||||
| 13 | https: //glassfis h.dev.java .net/publi c/CDDL+GPL _1_1.html | |||||
| 14 | or pac kager/lega l/LICENSE. txt. See the Licens e for the specific | |||||
| 15 | langua ge governi ng permiss ions and l imitations under the License. | |||||
| 16 | ||||||
| 17 | When d istributin g the soft ware, incl ude this L icense Hea der Notice in each | |||||
| 18 | file a nd include the Licen se file at packager/ legal/LICE NSE.txt. | |||||
| 19 | ||||||
| 20 | GPL Cl asspath Ex ception: | |||||
| 21 | Oracle designate s this par ticular fi le as subj ect to the "Classpat h" | |||||
| 22 | except ion as pro vided by O racle in t he GPL Ver sion 2 sec tion of th e License | |||||
| 23 | file t hat accomp anied this code. | |||||
| 24 | ||||||
| 25 | Modifi cations: | |||||
| 26 | If app licable, a dd the fol lowing bel ow the Lic ense Heade r, with th e fields | |||||
| 27 | enclos ed by brac kets [] re placed by your own i dentifying informati on: | |||||
| 28 | "Porti ons Copyri ght [year] [name of copyright owner]" | |||||
| 29 | ||||||
| 30 | Contri butor(s): | |||||
| 31 | If you wish your version o f this fil e to be go verned by only the C DDL or | |||||
| 32 | only t he GPL Ver sion 2, in dicate you r decision by adding "[Contrib utor] | |||||
| 33 | elects to includ e this sof tware in t his distri bution und er the [CD DL or GPL | |||||
| 34 | Versio n 2] licen se." If y ou don't i ndicate a single cho ice of lic ense, a | |||||
| 35 | recipi ent has th e option t o distribu te your ve rsion of t his file u nder | |||||
| 36 | either the CDDL, the GPL V ersion 2 o r to exten d the choi ce of lice nse to | |||||
| 37 | its li censees as provided above. Ho wever, if you add GP L Version 2 code | |||||
| 38 | and th erefore, e lected the GPL Versi on 2 licen se, then t he option applies | |||||
| 39 | only i f the new code is ma de subject to such o ption by t he copyrig ht | |||||
| 40 | holder . | |||||
| 41 | ||||||
| 42 | --> | |||||
| 43 | ||||||
| 44 | <project x mlns="http ://maven.a pache.org/ POM/4.0.0" | |||||
| 45 | x mlns:xsi=" http://www .w3.org/20 01/XMLSche ma-instanc e" | |||||
| 46 | x si:schemaL ocation="h ttp://mave n.apache.o rg/POM/4.0 .0 http:// maven.apac he.org/mav en-v4_0_0. xsd"> | |||||
| 47 | <model Version>4. 0.0</model Version> | |||||
| 48 | <group Id>javax.x ml.bind</g roupId> | |||||
| 49 | <artif actId>jaxb -api</arti factId> | |||||
| 50 | <versi on>2.2.2</ version> | |||||
| 51 | <packa ging>jar</ packaging> | |||||
| 52 | ||||||
| 53 | <name> JAXB API b undle for GlassFish V3</name> | |||||
| 54 | <url>h ttps://jax b.dev.java .net/</url > | |||||
| 55 | ||||||
| 56 | <organ ization> | |||||
| 57 | <n ame>Oracle Corporati on</name> | |||||
| 58 | <u rl>http:// www.oracle .com/</url > | |||||
| 59 | </orga nization> | |||||
| 60 | ||||||
| 61 | <licen ses> | |||||
| 62 | <l icense> | |||||
| 63 | <name>CD DL 1.1</na me> | |||||
| 64 | <url>htt ps://glass fish.dev.j ava.net/pu blic/CDDL+ GPL_1_1.ht ml</url> | |||||
| 65 | <distrib ution>repo </distribu tion> | |||||
| 66 | </ license> | |||||
| 67 | <l icense> | |||||
| 68 | <name>GP L2 w/ CPE< /name> | |||||
| 69 | <url>htt ps://glass fish.dev.j ava.net/pu blic/CDDL+ GPL_1_1.ht ml</url> | |||||
| 70 | <distrib ution>repo </distribu tion> | |||||
| 71 | </ license> | |||||
| 72 | </lice nses> | |||||
| 73 | ||||||
| 74 | <scm> | |||||
| 75 | <u rl>https:/ /jaxb2-sou rces.dev.j ava.net/so urce/brows e/jaxb2-so urces/jaxb -ri/</url> | |||||
| 76 | </scm> | |||||
| 77 | ||||||
| 78 | <devel opers> | |||||
| 79 | <d eveloper> | |||||
| 80 | <name>Ma rtin Greba c</name> | |||||
| 81 | </ developer> | |||||
| 82 | </deve lopers> | |||||
| 83 | ||||||
| 84 | <descr iption> | |||||
| 85 | JA XB (JSR 22 2) API | |||||
| 86 | </desc ription> | |||||
| 87 | ||||||
| 88 | <depen dencies> | |||||
| 89 | <d ependency> | |||||
| 90 | <groupId >javax.xml .stream</g roupId> | |||||
| 91 | <artifac tId>stax-a pi</artifa ctId> | |||||
| 92 | <version >1.0-2</ve rsion> | |||||
| 93 | </ dependency > | |||||
| 94 | <d ependency> | |||||
| 95 | <groupId >javax.act ivation</g roupId> | |||||
| 96 | <artifac tId>activa tion</arti factId> | |||||
| 97 | <version >1.1</vers ion> | |||||
| 98 | </ dependency > | |||||
| 99 | </depe ndencies> | |||||
| 100 | ||||||
| 101 | <build > | |||||
| 102 | <p lugins> | |||||
| 103 | <!-- fak e out mave n and inst all the bi nary artif act --> | |||||
| 104 | <plugin> | |||||
| 105 | <gro upId>org.j vnet.maven -antrun-ex tended-plu gin</group Id> | |||||
| 106 | <art ifactId>ma ven-antrun -extended- plugin</ar tifactId> | |||||
| 107 | <exe cutions> | |||||
| 108 | <execution > | |||||
| 109 | <phase >package</ phase> | |||||
| 110 | <goals > | |||||
| 111 | <g oal>run</g oal> | |||||
| 112 | </goal s> | |||||
| 113 | <confi guration> | |||||
| 114 | <t asks> | |||||
| 115 | <attachA rtifact fi le="jaxb-a pi.jar"/> | |||||
| 116 | </ tasks> | |||||
| 117 | </conf iguration> | |||||
| 118 | </executio n> | |||||
| 119 | </ex ecutions> | |||||
| 120 | </plugin > | |||||
| 121 | </ plugins> | |||||
| 122 | <e xtensions> | |||||
| 123 | <extensi on> | |||||
| 124 | <gro upId>org.j vnet.wagon -svn</grou pId> | |||||
| 125 | <art ifactId>wa gon-svn</a rtifactId> | |||||
| 126 | <ver sion>1.8</ version> | |||||
| 127 | </extens ion> | |||||
| 128 | </ extensions > | |||||
| 129 | </buil d> | |||||
| 130 | ||||||
| 131 | <repos itories> | |||||
| 132 | <r epository> | |||||
| 133 | <id>m2.d ev.java.ne t</id> | |||||
| 134 | <url>htt p://downlo ad.java.ne t/maven/2< /url> | |||||
| 135 | <layout> default</l ayout> | |||||
| 136 | </ repository > | |||||
| 137 | </repo sitories> | |||||
| 138 | ||||||
| 139 | <plugi nRepositor ies> | |||||
| 140 | <p luginRepos itory> | |||||
| 141 | <id>mave n2-reposit ory.dev.ja va.net</id > | |||||
| 142 | <name>Ja va.net Rep ository fo r Maven</n ame> | |||||
| 143 | <url>htt p://downlo ad.java.ne t/maven/2/ </url> | |||||
| 144 | </ pluginRepo sitory> | |||||
| 145 | </plug inReposito ries> | |||||
| 146 | ||||||
| 147 | <distr ibutionMan agement> | |||||
| 148 | <r epository> | |||||
| 149 | <uniqueV ersion>fal se</unique Version> | |||||
| 150 | <id>java .net-maven 2-reposito ry</id> | |||||
| 151 | <url>jav a-net:/mav en2-reposi tory/trunk /repositor y/</url> | |||||
| 152 | </ repository > | |||||
| 153 | </dist ributionMa nagement> | |||||
| 154 | ||||||
| 155 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.