Produced by Araxis Merge on 6/9/2017 3:49:36 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:36 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\javaee-api\7.0 | javaee-api-7.0.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 | 241 |
| 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" encoding=" UTF-8"?> | |||||
| 2 | <!-- | |||||
| 3 | ||||||
| 4 | DO NOT ALTER OR REMOVE COP YRIGHT NOT ICES OR TH IS HEADER. | |||||
| 5 | ||||||
| 6 | Copyri ght (c) 20 12-2013 Or acle and/o r its affi liates. Al l rights r eserved. | |||||
| 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 | ||||||
| 45 | <project x si:schemaL ocation="h ttp://mave n.apache.o rg/POM/4.0 .0 http:// maven.apac he.org/xsd /maven-4.0 .0.xsd" xm lns="http: //maven.ap ache.org/P OM/4.0.0" | |||||
| 46 | xmlns: xsi="http: //www.w3.o rg/2001/XM LSchema-in stance"> | |||||
| 47 | <modelVe rsion>4.0. 0</modelVe rsion> | |||||
| 48 | <parent> | |||||
| 49 | <artif actId>jvne t-parent</ artifactId > | |||||
| 50 | <group Id>net.jav a</groupId > | |||||
| 51 | <versi on>3</vers ion> | |||||
| 52 | </parent > | |||||
| 53 | <groupId >javax</gr oupId> | |||||
| 54 | <artifac tId>javaee -api</arti factId> | |||||
| 55 | <version >7.0</vers ion> | |||||
| 56 | <name>Ja va(TM) EE 7 Specific ation APIs </name> | |||||
| 57 | <descrip tion>Java( TM) EE 7 S pecificati on APIs</d escription > | |||||
| 58 | <organiz ation /> | |||||
| 59 | <license s> | |||||
| 60 | <licen se> | |||||
| 61 | <nam e>CDDL + G PLv2 with classpath exception< /name> | |||||
| 62 | <url >http://gl assfish.ja va.net/non av/public/ CDDL+GPL.h tml</url> | |||||
| 63 | <dis tribution> repo</dist ribution> | |||||
| 64 | <com ments>A bu siness-fri endly OSS license</c omments> | |||||
| 65 | </lice nse> | |||||
| 66 | </licens es> | |||||
| 67 | <develop ers> | |||||
| 68 | <devel oper> | |||||
| 69 | <id> shannon</i d> | |||||
| 70 | <nam e>Bill Sha nnon</name > | |||||
| 71 | <org anization> Oracle Cor p.</organi zation> | |||||
| 72 | <rol es> | |||||
| 73 | <r ole>lead</ role> | |||||
| 74 | </ro les> | |||||
| 75 | </deve loper> | |||||
| 76 | <devel oper> | |||||
| 77 | <id> ldemichiel </id> | |||||
| 78 | <nam e>Linda De Michiel</ name> | |||||
| 79 | <org anization> Oracle Cor p.</organi zation> | |||||
| 80 | <rol es> | |||||
| 81 | <r ole>lead</ role> | |||||
| 82 | </ro les> | |||||
| 83 | </deve loper> | |||||
| 84 | </develo pers> | |||||
| 85 | <mailing Lists> | |||||
| 86 | <maili ngList> | |||||
| 87 | <nam e>dev</nam e> | |||||
| 88 | <sub scribe>htt p://java.n et/project s/glassfis h/lists</s ubscribe> | |||||
| 89 | <pos t>dev@glas sfish.java .net</post > | |||||
| 90 | <arc hive>http: //java.net /projects/ glassfish/ lists/dev/ archive</a rchive> | |||||
| 91 | </mail ingList> | |||||
| 92 | <maili ngList> | |||||
| 93 | <nam e>users</n ame> | |||||
| 94 | <sub scribe>htt p://java.n et/project s/glassfis h/lists</s ubscribe> | |||||
| 95 | <pos t>users@gl assfish.ja va.net</po st> | |||||
| 96 | <arc hive>http: //java.net /projects/ glassfish/ lists/user s/archive< /archive> | |||||
| 97 | </mail ingList> | |||||
| 98 | <maili ngList> | |||||
| 99 | <nam e>issues</ name> | |||||
| 100 | <sub scribe>htt p://java.n et/project s/glassfis h/lists</s ubscribe> | |||||
| 101 | <pos t>issues@g lassfish.j ava.net</p ost> | |||||
| 102 | <arc hive>http: //java.net /projects/ glassfish/ lists/issu es/archive </archive> | |||||
| 103 | </mail ingList> | |||||
| 104 | <maili ngList> | |||||
| 105 | <nam e>commits< /name> | |||||
| 106 | <sub scribe>htt p://java.n et/project s/glassfis h/lists</s ubscribe> | |||||
| 107 | <pos t>commits@ glassfish. java.net</ post> | |||||
| 108 | <arc hive>http: //java.net /projects/ glassfish/ lists/comm its/archiv e</archive > | |||||
| 109 | </mail ingList> | |||||
| 110 | </mailin gLists> | |||||
| 111 | <scm> | |||||
| 112 | <conne ction>scm: svn:https: //svn.java .net/svn/g lassfish~s vn/trunk/m ain/appser ver/javaee -api-paren t/javaee-a pi</connec tion> | |||||
| 113 | <devel operConnec tion>scm:s vn:https:/ /svn.java. net/svn/gl assfish~sv n/trunk/ma in/appserv er/javaee- api-parent /javaee-ap i</develop erConnecti on> | |||||
| 114 | <url>h ttps://svn .java.net/ svn/glassf ish~svn/tr unk/main/a ppserver/j avaee-api- parent/jav aee-api</u rl> | |||||
| 115 | </scm> | |||||
| 116 | <issueMa nagement> | |||||
| 117 | <syste m>IssueTra cker</syst em> | |||||
| 118 | <url>h ttp://java .net/jira/ browse/GLA SSFISH</ur l> | |||||
| 119 | </issueM anagement> | |||||
| 120 | <depende ncies> | |||||
| 121 | <depen dency> | |||||
| 122 | <gro upId>javax </groupId> | |||||
| 123 | <art ifactId>ja vaee-web-a pi</artifa ctId> | |||||
| 124 | <ver sion>7.0</ version> | |||||
| 125 | <sco pe>compile </scope> | |||||
| 126 | <opt ional>true </optional > | |||||
| 127 | </depe ndency> | |||||
| 128 | <depen dency> | |||||
| 129 | <gro upId>org.g lassfish</ groupId> | |||||
| 130 | <art ifactId>ja vax.faces< /artifactI d> | |||||
| 131 | <ver sion>2.2.0 </version> | |||||
| 132 | <sco pe>compile </scope> | |||||
| 133 | <opt ional>true </optional > | |||||
| 134 | </depe ndency> | |||||
| 135 | <depen dency> | |||||
| 136 | <gro upId>javax .jms</grou pId> | |||||
| 137 | <art ifactId>ja vax.jms-ap i</artifac tId> | |||||
| 138 | <ver sion>2.0</ version> | |||||
| 139 | <sco pe>compile </scope> | |||||
| 140 | <opt ional>true </optional > | |||||
| 141 | </depe ndency> | |||||
| 142 | <depen dency> | |||||
| 143 | <gro upId>com.s un.mail</g roupId> | |||||
| 144 | <art ifactId>ja vax.mail</ artifactId > | |||||
| 145 | <ver sion>1.5.0 </version> | |||||
| 146 | <sco pe>compile </scope> | |||||
| 147 | </depe ndency> | |||||
| 148 | <depen dency> | |||||
| 149 | <gro upId>javax .resource< /groupId> | |||||
| 150 | <art ifactId>ja vax.resour ce-api</ar tifactId> | |||||
| 151 | <ver sion>1.7</ version> | |||||
| 152 | <sco pe>compile </scope> | |||||
| 153 | <opt ional>true </optional > | |||||
| 154 | </depe ndency> | |||||
| 155 | <depen dency> | |||||
| 156 | <gro upId>javax .jws</grou pId> | |||||
| 157 | <art ifactId>js r181-api</ artifactId > | |||||
| 158 | <ver sion>1.0-M R1</versio n> | |||||
| 159 | <sco pe>compile </scope> | |||||
| 160 | <opt ional>true </optional > | |||||
| 161 | </depe ndency> | |||||
| 162 | <depen dency> | |||||
| 163 | <gro upId>javax .xml.soap< /groupId> | |||||
| 164 | <art ifactId>ja vax.xml.so ap-api</ar tifactId> | |||||
| 165 | <ver sion>1.3.5 </version> | |||||
| 166 | <sco pe>compile </scope> | |||||
| 167 | <opt ional>true </optional > | |||||
| 168 | </depe ndency> | |||||
| 169 | <depen dency> | |||||
| 170 | <gro upId>javax .xml.ws</g roupId> | |||||
| 171 | <art ifactId>ja xws-api</a rtifactId> | |||||
| 172 | <ver sion>2.2.8 </version> | |||||
| 173 | <sco pe>compile </scope> | |||||
| 174 | <opt ional>true </optional > | |||||
| 175 | </depe ndency> | |||||
| 176 | <depen dency> | |||||
| 177 | <gro upId>javax .xml.bind< /groupId> | |||||
| 178 | <art ifactId>ja xb-api-osg i</artifac tId> | |||||
| 179 | <ver sion>2.2.7 </version> | |||||
| 180 | <sco pe>compile </scope> | |||||
| 181 | <opt ional>true </optional > | |||||
| 182 | </depe ndency> | |||||
| 183 | <depen dency> | |||||
| 184 | <gro upId>javax .managemen t.j2ee</gr oupId> | |||||
| 185 | <art ifactId>ja vax.manage ment.j2ee- api</artif actId> | |||||
| 186 | <ver sion>1.1.1 </version> | |||||
| 187 | <sco pe>compile </scope> | |||||
| 188 | <opt ional>true </optional > | |||||
| 189 | </depe ndency> | |||||
| 190 | <depen dency> | |||||
| 191 | <gro upId>javax .security. jacc</grou pId> | |||||
| 192 | <art ifactId>ja vax.securi ty.jacc-ap i</artifac tId> | |||||
| 193 | <ver sion>1.5</ version> | |||||
| 194 | <sco pe>compile </scope> | |||||
| 195 | <opt ional>true </optional > | |||||
| 196 | </depe ndency> | |||||
| 197 | <depen dency> | |||||
| 198 | <gro upId>javax .security. auth.messa ge</groupI d> | |||||
| 199 | <art ifactId>ja vax.securi ty.auth.me ssage-api< /artifactI d> | |||||
| 200 | <ver sion>1.1</ version> | |||||
| 201 | <sco pe>compile </scope> | |||||
| 202 | <opt ional>true </optional > | |||||
| 203 | </depe ndency> | |||||
| 204 | <depen dency> | |||||
| 205 | <gro upId>javax .enterpris e.concurre nt</groupI d> | |||||
| 206 | <art ifactId>ja vax.enterp rise.concu rrent-api< /artifactI d> | |||||
| 207 | <ver sion>1.0</ version> | |||||
| 208 | <sco pe>compile </scope> | |||||
| 209 | <opt ional>true </optional > | |||||
| 210 | </depe ndency> | |||||
| 211 | <depen dency> | |||||
| 212 | <gro upId>javax .batch</gr oupId> | |||||
| 213 | <art ifactId>ja vax.batch- api</artif actId> | |||||
| 214 | <ver sion>1.0</ version> | |||||
| 215 | <sco pe>compile </scope> | |||||
| 216 | <opt ional>true </optional > | |||||
| 217 | </depe ndency> | |||||
| 218 | <depen dency> | |||||
| 219 | <gro upId>javax .enterpris e.deploy</ groupId> | |||||
| 220 | <art ifactId>ja vax.enterp rise.deplo y-api</art ifactId> | |||||
| 221 | <ver sion>1.6</ version> | |||||
| 222 | <sco pe>compile </scope> | |||||
| 223 | <opt ional>true </optional > | |||||
| 224 | </depe ndency> | |||||
| 225 | <depen dency> | |||||
| 226 | <gro upId>javax .xml.regis try</group Id> | |||||
| 227 | <art ifactId>ja vax.xml.re gistry-api </artifact Id> | |||||
| 228 | <ver sion>1.0.5 </version> | |||||
| 229 | <sco pe>compile </scope> | |||||
| 230 | <opt ional>true </optional > | |||||
| 231 | </depe ndency> | |||||
| 232 | <depen dency> | |||||
| 233 | <gro upId>javax .xml.rpc</ groupId> | |||||
| 234 | <art ifactId>ja vax.xml.rp c-api</art ifactId> | |||||
| 235 | <ver sion>1.1.1 </version> | |||||
| 236 | <sco pe>compile </scope> | |||||
| 237 | <opt ional>true </optional > | |||||
| 238 | </depe ndency> | |||||
| 239 | </depend encies> | |||||
| 240 | <build / > | |||||
| 241 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.