Produced by Araxis Merge on 4/23/2019 12:14:44 PM Central 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 | C:\AraxisMergeCompare\Pri_un\CCRS\ccra-6.3.0\ccra-6.3.0\CCRATypeAdapters | build.gradle | Wed Mar 20 03:15:56 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\ccra-6.3.0\ccra-6.3.0\CCRATypeAdapters | build.gradle | Wed Apr 17 16:43:47 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 90 |
| 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 | apply plug in: 'java' | |
| 2 | apply plug in: 'eclip se' | |
| 3 | apply plug in: 'maven ' | |
| 4 | ||
| 5 | repositori es { | |
| 6 | ||
| 7 | maven | |
| 8 | { | |
| 9 | ur l "https:/ /nexus.ftc -llc.com/r epository/ ccrs-group " | |
| 10 | } | |
| 11 | } | |
| 12 | configurat ions { | |
| 13 | // con figuration that hold s jars to include in the jar | |
| 14 | extraL ibs | |
| 15 | } | |
| 16 | ||
| 17 | descriptio n = 'CCRAT ypeAdapter s' | |
| 18 | dependenci es { | |
| 19 | /* compile pr oject(":cc rs-entitie s") | |
| 20 | co mpile proj ect(':ccrs -helpers') */ | |
| 21 | ||
| 22 | // ccrs-entit ies depend ency | |
| 23 | co mpile 'ccr s:ccrs-ent ities:+' | |
| 24 | ||
| 25 | co mpile('ccr s:ccrs-int erface-exe cutors:+') | |
| 26 | ||
| 27 | // ccrs-helpe rs depende ncy | |
| 28 | co mpile ('cc rs:ccrs-he lpers:+') | |
| 29 | { | |
| 30 | excl ude group: "ccrs", mo dule:"ccrs -interface -executors " | |
| 31 | } | |
| 32 | ||
| 33 | compil e group: ' com.google .code.gson ', name: ' gson', ver sion:'2.6. 2' | |
| 34 | } | |
| 35 | uploadArch ives { | |
| 36 | reposi tories { | |
| 37 | mav enDeployer { | |
| 38 | reposit ory(url: " https://ne xus.ftc-ll c.com/repo sitory/ccr s-snapshot s") { | |
| 39 | authentica tion(userN ame: " AI ", passwor d: " AI ") | |
| 40 | } | |
| 41 | pom.v ersion = " 2.0-SNAPSH OT" | |
| 42 | pom.art ifactId = project.na me | |
| 43 | pom.gro upId = "cc rs" | |
| 44 | } | |
| 45 | } | |
| 46 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.