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\CCRSEntities | build.gradle | Wed Mar 20 03:15:56 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\ccra-6.3.0\ccra-6.3.0\CCRSEntities | build.gradle | Wed Apr 17 16:45:37 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 98 |
| Changed | 3 | 12 |
| 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: 'maven ' | |
| 3 | ||
| 4 | repositori es { | |
| 5 | ||
| 6 | maven | |
| 7 | { | |
| 8 | ur l "https:/ /nexus.ftc -llc.com/r epository/ ccrs-group " | |
| 9 | } | |
| 10 | } | |
| 11 | descriptio n = 'CCRSE ntities' | |
| 12 | dependenci es { | |
| 13 | testCo mpile grou p: 'com.mi crosoft.sq lserver', name: 'mss ql-jdbc', version:'6 .1.0.jre8' | |
| 14 | } | |
| 15 | ||
| 16 | def env_db = findPro perty('env _db') | |
| 17 | ||
| 18 | processRes ources { | |
| 19 | wi th copySpe c { | |
| 20 | fr om(sourceS ets.main.r esources.s rcDirs) | |
| 21 | { | |
| 22 | ||
| 23 | incl ude '**/hi bernate.cf g.xml' | |
| 24 | if( env_db == ("ftc.dev" ) ) | |
| 25 | { | |
| 26 | filter { String li ne -> | |
| 27 | line.repla ce('${env_ db.usernam e}', ' AI ') | |
| 28 | .replace(' ${env_db.p assword}', ' AI ') | |
| 29 | .replace(' ${env_db.u rl}', 'jdb c:sqlserve r:// SERVER ') | |
| 30 | } | |
| 31 | } | |
| 32 | els e if( env_ db == ("va .dev") ) | |
| 33 | { | |
| 34 | filter { String li ne -> | |
| 35 | line.r eplace('${ env_db.use rname}', ' ccrs_rw') | |
| 36 | .replace(' ${env_db.p assword}', ' AI ') | |
| 37 | .replace(' ${env_db.u rl}', 'jdb c:sqlserve r://
|
|
| 38 | } | |
| 39 | } | |
| 40 | } | |
| 41 | } | |
| 42 | } | |
| 43 | ||
| 44 | uploadArch ives { | |
| 45 | reposi tories { | |
| 46 | mav enDeployer { | |
| 47 | reposit ory(url: " https://ne xus.ftc-ll c.com/repo sitory/ccr s-snapshot s") { | |
| 48 | authentica tion(userN ame: " AI ", passwor d: " AI ") | |
| 49 | } | |
| 50 | pom.v ersion = " 2.0-SNAPSH OT" | |
| 51 | pom.art ifactId = project.na me | |
| 52 | pom.gro upId = "cc rs" | |
| 53 | } | |
| 54 | } | |
| 55 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.