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-web-api\6.0 | javaee-web-api-6.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 | 84 |
| 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"?><p roject> | |||||
| 2 | <!-- | |||||
| 3 | /* | |||||
| 4 | * DO NOT A LTER OR RE MOVE COPYR IGHT NOTIC ES OR THIS HEADER. | |||||
| 5 | * | |||||
| 6 | * Copyrigh t 1997-201 0 Sun Micr osystems, Inc. All r ights rese rved. | |||||
| 7 | * | |||||
| 8 | * The cont ents of th is file ar e subject to the ter ms of eith er the GNU | |||||
| 9 | * General Public Lic ense Versi on 2 only ("GPL") or the Commo n Developm ent | |||||
| 10 | * and Dist ribution L icense("CD DL") (coll ectively, the "Licen se"). You | |||||
| 11 | * may not use this f ile except in compli ance with the Licens e. You can obtain | |||||
| 12 | * a copy o f the Lice nse at htt ps://glass fish.dev.j ava.net/pu blic/CDDL+ GPL.html | |||||
| 13 | * or glass fish/boots trap/legal /LICENSE.t xt. See t he License for the s pecific | |||||
| 14 | * language governing permissio ns and lim itations u nder the L icense. | |||||
| 15 | * | |||||
| 16 | * When dis tributing the softwa re, includ e this Lic ense Heade r Notice i n each | |||||
| 17 | * file and include t he License file at g lassfish/b ootstrap/l egal/LICEN SE.txt. | |||||
| 18 | * Sun desi gnates thi s particul ar file as subject t o the "Cla sspath" ex ception | |||||
| 19 | * as provi ded by Sun in the GP L Version 2 section of the Lic ense file that | |||||
| 20 | * accompan ied this c ode. If a pplicable, add the f ollowing b elow the L icense | |||||
| 21 | * Header, with the f ields encl osed by br ackets [] replaced b y your own | |||||
| 22 | * identify ing inform ation: "Po rtions Cop yrighted [ year] | |||||
| 23 | * [name of copyright owner]" | |||||
| 24 | * | |||||
| 25 | * Contribu tor(s): | |||||
| 26 | * | |||||
| 27 | * If you w ish your v ersion of this file to be gove rned by on ly the CDD L or | |||||
| 28 | * only the GPL Versi on 2, indi cate your decision b y adding " [Contribut or] | |||||
| 29 | * elects t o include this softw are in thi s distribu tion under the [CDDL or GPL | |||||
| 30 | * Version 2] license ." If you don't ind icate a si ngle choic e of licen se, a | |||||
| 31 | * recipien t has the option to distribute your vers ion of thi s file und er | |||||
| 32 | * either t he CDDL, t he GPL Ver sion 2 or to extend the choice of licens e to | |||||
| 33 | * its lice nsees as p rovided ab ove. Howe ver, if yo u add GPL Version 2 code | |||||
| 34 | * and ther efore, ele cted the G PL Version 2 license , then the option ap plies | |||||
| 35 | * only if the new co de is made subject t o such opt ion by the copyright | |||||
| 36 | * holder. | |||||
| 37 | */ | |||||
| 38 | --> | |||||
| 39 | <model Version>4. 0.0</model Version> | |||||
| 40 | <group Id>javax</ groupId> | |||||
| 41 | <artif actId>java ee-web-api </artifact Id> | |||||
| 42 | <versi on>6.0</ve rsion> | |||||
| 43 | <packa ging>jar</ packaging> | |||||
| 44 | ||||||
| 45 | <name> Java(TM) E E 6 Web Sp ecificatio n APIs</na me> | |||||
| 46 | <descr iption>Jav a(TM) EE 6 Web Speci fication A PIs</descr iption> | |||||
| 47 | <url>h ttp://java .sun.com/j avaee/6/do cs/api/ind ex.html</u rl> | |||||
| 48 | ||||||
| 49 | <scm> | |||||
| 50 | <c onnection> scm:svn:ht tps://svn. dev.java.n et/svn/gla ssfish-svn /trunk/v3/ javaee-api /javax.jav aee</conne ction> | |||||
| 51 | <d eveloperCo nnection>s cm:svn:htt ps://svn.d ev.java.ne t/svn/glas sfish-svn/ trunk/v3/j avaee-api/ javax.java ee</develo perConnect ion> | |||||
| 52 | <u rl>https:/ /svn.dev.j ava.net/sv n/glassfis h-svn/tags /3.0/javae e-api/java x.javaee</ url> | |||||
| 53 | </scm> | |||||
| 54 | <licen ses> | |||||
| 55 | <l icense> | |||||
| 56 | <name>CD DL + GPLv2 with clas spath exce ption</nam e> | |||||
| 57 | <url>htt ps://glass fish.dev.j ava.net/no nav/public /CDDL+GPL. html</url> | |||||
| 58 | <distrib ution>repo </distribu tion> | |||||
| 59 | <comment s>A busine ss-friendl y OSS lice nse</comme nts> | |||||
| 60 | </ license> | |||||
| 61 | </lice nses> | |||||
| 62 | ||||||
| 63 | <organ ization> | |||||
| 64 | <n ame>GlassF ish Commun ity</name> | |||||
| 65 | <u rl>https:/ /glassfish .dev.java. net</url> | |||||
| 66 | </orga nization> | |||||
| 67 | ||||||
| 68 | <devel opers> | |||||
| 69 | <d eveloper> | |||||
| 70 | <id>robc </id> | |||||
| 71 | <name>Ro berto Chin nici</name > | |||||
| 72 | <organiz ation>Sun Microsyste ms, Inc.</ organizati on> | |||||
| 73 | <roles> | |||||
| 74 | <rol e>lead</ro le> | |||||
| 75 | </roles> | |||||
| 76 | </ developer> | |||||
| 77 | </deve lopers> | |||||
| 78 | ||||||
| 79 | <issue Management > | |||||
| 80 | <s ystem>Issu eTracker</ system> | |||||
| 81 | <u rl>https:/ /glassfish .dev.java. net/servle ts/Project Issues</ur l> | |||||
| 82 | </issu eManagemen t> | |||||
| 83 | ||||||
| 84 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.