Produced by Araxis Merge on 6/9/2017 3:49:35 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:35 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\annotation\javax.annotation-api\1.2 | javax.annotation-api-1.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 | 308 |
| 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 | <project x mlns="http ://maven.a pache.org/ POM/4.0.0" xmlns:xsi ="http://w ww.w3.org/ 2001/XMLSc hema-insta nce" xsi:s chemaLocat ion="http: //maven.ap ache.org/P OM/4.0.0 h ttp://mave n.apache.o rg/maven-v 4_0_0.xsd" > | |||||
| 45 | <model Version>4. 0.0</model Version> | |||||
| 46 | <paren t> | |||||
| 47 | <g roupId>net .java</gro upId> | |||||
| 48 | <a rtifactId> jvnet-pare nt</artifa ctId> | |||||
| 49 | <v ersion>3</ version> | |||||
| 50 | </pare nt> | |||||
| 51 | ||||||
| 52 | <group Id>javax.a nnotation< /groupId> | |||||
| 53 | <artif actId>java x.annotati on-api</ar tifactId> | |||||
| 54 | <versi on>1.2</ve rsion> | |||||
| 55 | ||||||
| 56 | <prope rties> | |||||
| 57 | <n on.final>f alse</non. final> | |||||
| 58 | <s pec.versio n>1.2</spe c.version> | |||||
| 59 | <e xtension.n ame>javax. annotation </extensio n.name> | |||||
| 60 | <b undle.symb olicName>j avax.annot ation-api< /bundle.sy mbolicName > | |||||
| 61 | <v endor.name >Oracle Co rporation< /vendor.na me> | |||||
| 62 | <i mplementat ion.vendor .id>org.gl assfish</i mplementat ion.vendor .id> | |||||
| 63 | <f indbugs.ve rsion>2.3. 1</findbug s.version> | |||||
| 64 | <f indbugs.ex clude>excl ude.xml</f indbugs.ex clude> | |||||
| 65 | <f indbugs.th reshold>Lo w</findbug s.threshol d> | |||||
| 66 | </prop erties> | |||||
| 67 | <name> ${extensio n.name} AP I</name> | |||||
| 68 | <descr iption>Com mon Annota tions for the JavaTM Platform API</descr iption> | |||||
| 69 | ||||||
| 70 | <url>h ttp://jcp. org/en/jsr /detail?id =250</url> | |||||
| 71 | ||||||
| 72 | <devel opers> | |||||
| 73 | <d eveloper> | |||||
| 74 | <id>mode </id> | |||||
| 75 | <name>Ra jiv Mordan i</name> | |||||
| 76 | <organiz ation>Orac le, Inc.</ organizati on> | |||||
| 77 | <roles> | |||||
| 78 | <rol e>lead</ro le> | |||||
| 79 | </roles> | |||||
| 80 | </ developer> | |||||
| 81 | </deve lopers> | |||||
| 82 | ||||||
| 83 | <organ ization> | |||||
| 84 | <n ame>GlassF ish Commun ity</name> | |||||
| 85 | <u rl>https:/ /glassfish .java.net< /url> | |||||
| 86 | </orga nization> | |||||
| 87 | <licen ses> | |||||
| 88 | <l icense> | |||||
| 89 | <name>CD DL + GPLv2 with clas spath exce ption</nam e> | |||||
| 90 | <url>htt ps://glass fish.dev.j ava.net/no nav/public /CDDL+GPL. html</url> | |||||
| 91 | <distrib ution>repo </distribu tion> | |||||
| 92 | <comment s>A busine ss-friendl y OSS lice nse</comme nts> | |||||
| 93 | </ license> | |||||
| 94 | </lice nses> | |||||
| 95 | <issue Management > | |||||
| 96 | <s ystem>jira </system> | |||||
| 97 | <u rl>http:// java.net/j ira/browse /GLASSFISH </url> | |||||
| 98 | </issu eManagemen t> | |||||
| 99 | <maili ngLists> | |||||
| 100 | <m ailingList > | |||||
| 101 | <name>Gl assFish De veloper</n ame> | |||||
| 102 | <archive >users@htt ps://glass fish.java. net</archi ve> | |||||
| 103 | </ mailingLis t> | |||||
| 104 | </mail ingLists> | |||||
| 105 | <scm> | |||||
| 106 | <c onnection> scm:svn:ht tps://svn. java.net/s vn/glassfi sh~svn/tag s/javax.an notation-a pi-1.2</co nnection> | |||||
| 107 | <d eveloperCo nnection>s cm:svn:htt ps://svn.j ava.net/sv n/glassfis h~svn/tags /javax.ann otation-ap i-1.2</dev eloperConn ection> | |||||
| 108 | <u rl>http:// java.net/p rojects/gl assfish/so urces/svn/ show/tags/ javax.anno tation-api -1.2</url> | |||||
| 109 | </scm> | |||||
| 110 | ||||||
| 111 | <build > | |||||
| 112 | <r esources> | |||||
| 113 | <resourc e> | |||||
| 114 | <dir ectory>src /main/java </director y> | |||||
| 115 | <inc ludes> | |||||
| 116 | <include>* */*.proper ties</incl ude> | |||||
| 117 | <include>* */*.html</ include> | |||||
| 118 | </in cludes> | |||||
| 119 | </resour ce> | |||||
| 120 | <resourc e> | |||||
| 121 | <dir ectory>src /main/reso urces</dir ectory> | |||||
| 122 | <exc ludes> | |||||
| 123 | <exclude>M ETA-INF/RE ADME</excl ude> | |||||
| 124 | </ex cludes> | |||||
| 125 | </resour ce> | |||||
| 126 | </ resources> | |||||
| 127 | <p lugins> | |||||
| 128 | <plugin> | |||||
| 129 | <art ifactId>ma ven-compil er-plugin< /artifactI d> | |||||
| 130 | <ver sion>2.5.1 </version> | |||||
| 131 | <con figuration > | |||||
| 132 | <source>1. 6</source> | |||||
| 133 | <target>1. 6</target> | |||||
| 134 | <compilerA rgument>-X lint:unche cked</comp ilerArgume nt> | |||||
| 135 | </co nfiguratio n> | |||||
| 136 | </plugin > | |||||
| 137 | <plugin> | |||||
| 138 | <gro upId>org.g lassfish.b uild</grou pId> | |||||
| 139 | <art ifactId>sp ec-version -maven-plu gin</artif actId> | |||||
| 140 | <ver sion>1.2</ version> | |||||
| 141 | <con figuration > | |||||
| 142 | <spec> | |||||
| 143 | <nonFi nal>${non. final}</no nFinal> | |||||
| 144 | <jarTy pe>api</ja rType> | |||||
| 145 | <specV ersion>${s pec.versio n}</specVe rsion> | |||||
| 146 | <specI mplVersion >${project .version}< /specImplV ersion> | |||||
| 147 | <apiPa ckage>${ex tension.na me}</apiPa ckage> | |||||
| 148 | </spec> | |||||
| 149 | </co nfiguratio n> | |||||
| 150 | <exe cutions> | |||||
| 151 | <execution > | |||||
| 152 | <goals > | |||||
| 153 | <g oal>set-sp ec-propert ies</goal> | |||||
| 154 | <g oal>check- module</go al> | |||||
| 155 | </goal s> | |||||
| 156 | </executio n> | |||||
| 157 | </ex ecutions> | |||||
| 158 | </plugin > | |||||
| 159 | <plugin> | |||||
| 160 | <gro upId>org.a pache.feli x</groupId > | |||||
| 161 | <art ifactId>ma ven-bundle -plugin</a rtifactId> | |||||
| 162 | <ver sion>1.4.3 </version> | |||||
| 163 | <con figuration > | |||||
| 164 | <supported ProjectTyp es> | |||||
| 165 | <suppo rtedProjec tType>jar< /supported ProjectTyp e> | |||||
| 166 | </supporte dProjectTy pes> | |||||
| 167 | <instructi ons> | |||||
| 168 | <Bundl e-Version> ${spec.bun dle.versio n}</Bundle -Version> | |||||
| 169 | <Bundl e-Symbolic Name>${spe c.bundle.s ymbolic-na me}</Bundl e-Symbolic Name> | |||||
| 170 | <Exten sion-Name> ${spec.ext ension.nam e}</Extens ion-Name> | |||||
| 171 | <Imple mentation- Version>${ spec.imple mentation. version}</ Implementa tion-Versi on> | |||||
| 172 | <Speci fication-V ersion>${s pec.specif ication.ve rsion}</Sp ecificatio n-Version> | |||||
| 173 | <Bundl e-Descript ion> | |||||
| 174 | Ja va(TM) Com mon Annota tions ${sp ec.version } API Desi gn Specifi cation | |||||
| 175 | </Bund le-Descrip tion> | |||||
| 176 | <Speci fication-V endor>${ve ndor.name} </Specific ation-Vend or> | |||||
| 177 | <Imple mentation- Vendor>${p roject.org anization. name}</Imp lementatio n-Vendor> | |||||
| 178 | <Imple mentation- Vendor-Id> ${implemen tation.ven dor.id}</I mplementat ion-Vendor -Id> | |||||
| 179 | </instruct ions> | |||||
| 180 | </co nfiguratio n> | |||||
| 181 | <exe cutions> | |||||
| 182 | <execution > | |||||
| 183 | <id>bu ndle-manif est</id> | |||||
| 184 | <phase >process-c lasses</ph ase> | |||||
| 185 | <goals > | |||||
| 186 | <g oal>manife st</goal> | |||||
| 187 | </goal s> | |||||
| 188 | </executio n> | |||||
| 189 | </ex ecutions> | |||||
| 190 | </plugin > | |||||
| 191 | <plugin> | |||||
| 192 | <gro upId>org.a pache.mave n.plugins< /groupId> | |||||
| 193 | <art ifactId>ma ven-jar-pl ugin</arti factId> | |||||
| 194 | <ver sion>2.4</ version> | |||||
| 195 | <con figuration > | |||||
| 196 | <archive> | |||||
| 197 | <manif estFile>${ project.bu ild.output Directory} /META-INF/ MANIFEST.M F</manifes tFile> | |||||
| 198 | </archive> | |||||
| 199 | <excludes> | |||||
| 200 | <exclu de>**/*.ja va</exclud e> | |||||
| 201 | </excludes > | |||||
| 202 | </co nfiguratio n> | |||||
| 203 | </plugin > | |||||
| 204 | <plugin> | |||||
| 205 | <gro upId>org.a pache.mave n.plugins< /groupId> | |||||
| 206 | <art ifactId>ma ven-remote -resources -plugin</a rtifactId> | |||||
| 207 | <ver sion>1.2.1 </version> | |||||
| 208 | <exe cutions> | |||||
| 209 | <e xecution> | |||||
| 210 | <goals> | |||||
| 211 | <goal>pr ocess</goa l> | |||||
| 212 | </goals> | |||||
| 213 | <configura tion> | |||||
| 214 | <resourc eBundles> | |||||
| 215 | <resou rceBundle> org.glassf ish:legal: 1.1</resou rceBundle> | |||||
| 216 | </resour ceBundles> | |||||
| 217 | </configur ation> | |||||
| 218 | </ execution> | |||||
| 219 | </ex ecutions> | |||||
| 220 | </plugin > | |||||
| 221 | <plugin> | |||||
| 222 | <gro upId>org.a pache.mave n.plugins< /groupId> | |||||
| 223 | <art ifactId>ma ven-source -plugin</a rtifactId> | |||||
| 224 | <ver sion>2.1</ version> | |||||
| 225 | <con figuration > | |||||
| 226 | <includePo m>true</in cludePom> | |||||
| 227 | </co nfiguratio n> | |||||
| 228 | <exe cutions> | |||||
| 229 | <execution > | |||||
| 230 | <id>att ach-source s</id> | |||||
| 231 | <goals> | |||||
| 232 | <go al>jar-no- fork</goal > | |||||
| 233 | </goals > | |||||
| 234 | </executio n> | |||||
| 235 | </ex ecutions> | |||||
| 236 | </plugin > | |||||
| 237 | <plugin> | |||||
| 238 | <gro upId>org.a pache.mave n.plugins< /groupId> | |||||
| 239 | <art ifactId>ma ven-javado c-plugin</ artifactId > | |||||
| 240 | <ver sion>2.8</ version> | |||||
| 241 | <exe cutions> | |||||
| 242 | <execution > | |||||
| 243 | <phase >javadoc</ phase> | |||||
| 244 | <goals > | |||||
| 245 | <g oal>javado c</goal> | |||||
| 246 | </goal s> | |||||
| 247 | <confi guration> | |||||
| 248 | <g roups> | |||||
| 249 | <group> | |||||
| 250 | <tit le>Common Annotation s API Docu mentation< /title> | |||||
| 251 | <pac kages>java x.annotati on</packag es> | |||||
| 252 | </group> | |||||
| 253 | </ groups> | |||||
| 254 | <b ottom> | |||||
| 255 | <![CDATA[C opyright & #169; 1999 -2013, | |||||
| 256 | <a hre f="http:// www.oracle .com">Orac le</a> | |||||
| 257 | and/or its affil iates. All Rights Re served. | |||||
| 258 | Use is subject t o | |||||
| 259 | <a hre f="{@docRo ot}/doc-fi les/specli cense.html " target=" _top">lice nse terms< /a>. | |||||
| 260 | ]]> | |||||
| 261 | </ bottom> | |||||
| 262 | </conf iguration> | |||||
| 263 | </executio n> | |||||
| 264 | </ex ecutions> | |||||
| 265 | </plugin > | |||||
| 266 | <plugin> | |||||
| 267 | <gro upId>org.c odehaus.mo jo</groupI d> | |||||
| 268 | <art ifactId>fi ndbugs-mav en-plugin< /artifactI d> | |||||
| 269 | <ver sion>${fin dbugs.vers ion}</vers ion> | |||||
| 270 | <con figuration > | |||||
| 271 | <threshold >${findbug s.threshol d}</thresh old> | |||||
| 272 | <excludeFi lterFile>$ {findbugs. exclude}</ excludeFil terFile> | |||||
| 273 | <findbugsX mlOutput>t rue</findb ugsXmlOutp ut> | |||||
| 274 | <findbugsX mlWithMess ages>true< /findbugsX mlWithMess ages> | |||||
| 275 | </co nfiguratio n> | |||||
| 276 | </plugin > | |||||
| 277 | <plugin> | |||||
| 278 | <gro upId>org.a pache.mave n.plugins< /groupId> | |||||
| 279 | <art ifactId>ma ven-releas e-plugin</ artifactId > | |||||
| 280 | <con figuration > | |||||
| 281 | <mavenExec utorId>for ked-path</ mavenExecu torId> | |||||
| 282 | <useReleas eProfile>f alse</useR eleaseProf ile> | |||||
| 283 | <arguments >${release .arguments }</argumen ts> | |||||
| 284 | </co nfiguratio n> | |||||
| 285 | </plugin > | |||||
| 286 | <plugin> | |||||
| 287 | <gro upId>org.a pache.mave n.plugins< /groupId> | |||||
| 288 | <art ifactId>ma ven-site-p lugin</art ifactId> | |||||
| 289 | <ver sion>3.1</ version> | |||||
| 290 | <con figuration > | |||||
| 291 | <reporting > | |||||
| 292 | <plugi ns> | |||||
| 293 | <p lugin> | |||||
| 294 | <groupId >org.codeh aus.mojo</ groupId> | |||||
| 295 | <artifac tId>findbu gs-maven-p lugin</art ifactId> | |||||
| 296 | <version >${findbug s.version} </version> | |||||
| 297 | <configu ration> | |||||
| 298 | <thr eshold>${f indbugs.th reshold}</ threshold> | |||||
| 299 | <exc ludeFilter File>${fin dbugs.excl ude}</excl udeFilterF ile> | |||||
| 300 | </config uration> | |||||
| 301 | </ plugin> | |||||
| 302 | </plug ins> | |||||
| 303 | </reportin g> | |||||
| 304 | </co nfiguratio n> | |||||
| 305 | </plugin > | |||||
| 306 | </ plugins> | |||||
| 307 | </buil d> | |||||
| 308 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.