Produced by Araxis Merge on 10/12/2018 4:04:42 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 | Vetlink 2.0.zip\Vetlink 2.0\vetlink-services.zip\vetlink-services | build.gradle | Fri Aug 24 18:25:23 2018 UTC |
| 2 | Vetlink 2.0.zip\Vetlink 2.0\vetlink-services.zip\vetlink-services | build.gradle | Fri Oct 12 19:12:37 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 196 |
| Changed | 2 | 4 |
| 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 | plugins { | |
| 2 | id 'org.hide take.ssh' version '1 .1.4' | |
| 3 | } | |
| 4 | ||
| 5 | Authentica tor.setDef ault(new A uthenticat or() { | |
| 6 | @O verride | |
| 7 | pr otected Pa sswordAuth entication getPasswo rdAuthenti cation() { | |
| 8 | retu rn new Pas swordAuthe ntication ("${nexusU ser}", "${ nexusPass} " as char[ ]) | |
| 9 | } | |
| 10 | }); | |
| 11 | ||
| 12 | if(System. env.LOCAL_ COMMONS){ | |
| 13 | pr intln "Usi ng local c ommons: \0 33[1m${Sys tem.env.LO CAL_COMMON S}/common. gradle\033 [0m" | |
| 14 | ap ply from: "${System. env.LOCAL_ COMMONS}/c ommon.grad le" | |
| 15 | } | |
| 16 | else { | |
| 17 | pr intln "Usi ng Commons version f rom Nexus: \033[1m${ getLatestC ommonsVers ion()}\033 [0m" | |
| 18 | ap ply from: "${nexusDo wnload}?r= ${commonsB aseRepo}-$ {repoTypeF romVersion (commonsVe rsion)}&g= ${commonsG roupId}&a= ${commonsA rtifactId} &v=${URLEn coder.enco de(getLate stCommonsV ersion(), 'UTF-8')}& p=${common sExtension }" | |
| 19 | } | |
| 20 | ||
| 21 | subproject s { | |
| 22 | ap ply plugin : 'java' | |
| 23 | ap ply plugin : 'war' | |
| 24 | ap ply plugin : 'maven' | |
| 25 | ||
| 26 | re positories { | |
| 27 | mave n { | |
| 28 | url "https :// DNS . URL /content/r epositorie s/agilex-s napshots/" | |
| 29 | creden tials { | |
| 30 | username "${nexusU ser}" | |
| 31 | password "${nexusP ass}" | |
| 32 | } | |
| 33 | } | |
| 34 | mave n { | |
| 35 | url "https :// DNS . URL /content/r epositorie s/ckm-rele ases/" | |
| 36 | creden tials { | |
| 37 | username "${nexusU ser}" | |
| 38 | password "${nexusP ass}" | |
| 39 | } | |
| 40 | } | |
| 41 | mave n { url { 'http://ma ven.spring framework. org/snapsh ot/' } } | |
| 42 | ma venCentral () | |
| 43 | jc enter() | |
| 44 | } | |
| 45 | } | |
| 46 | ||
| 47 | def isSnap shot(versi on){ | |
| 48 | de f pattern = ~/.*SNAP SHOT/ | |
| 49 | re turn patte rn.matcher (version). matches() | |
| 50 | } | |
| 51 | /********* ** | |
| 52 | * Determi ne the rep ository ty pe based o n the vers ion value | |
| 53 | ********* **/ | |
| 54 | def repoTy peFromVers ion(versio n) { | |
| 55 | if (isSnapsh ot(version )) { | |
| 56 | retu rn "snapsh ots" | |
| 57 | } | |
| 58 | el se { | |
| 59 | retu rn "releas es" | |
| 60 | } | |
| 61 | } | |
| 62 | /********* ** | |
| 63 | * Query N exus to de termine th e latest v ersion of the common gradle sc ript | |
| 64 | ********* **/ | |
| 65 | def getLat estCommons Version() { | |
| 66 | de f repo = " ${commonsB aseRepo}-$ {repoTypeF romVersion (commonsVe rsion)}" | |
| 67 | de f xml = "$ {nexusSear ch}?r=${re po}&g=${co mmonsGroup Id}&a=${co mmonsArtif actId}&v=$ {commonsVe rsion}*".t oURL().tex t; | |
| 68 | de f metadata = new Xml Slurper(). parseText( xml); | |
| 69 | // Find the first retu rned eleme nt whose r epository matches th e requeste d artifact 's repo ty pe (snapsh ots or rel eases) | |
| 70 | // (this wi ll be the latest art ifact matc hing the p attern, in the appro priate rep ository) | |
| 71 | de f artifact Xml = meta data.data. depthFirst ().find { node -> no de.artifac tHits.arti factHit.re positoryId .text() == repo } | |
| 72 | re turn artif actXml.ver sion.text( ); | |
| 73 | } | |
| 74 | /*task cre ateLaunchp adIcon(typ e: RunSQL) { | |
| 75 | sq lFile = fi le('../sql -scripts/l aunchpad-i tem.sql') | |
| 76 | } | |
| 77 | */ | |
| 78 | ||
| 79 | task tarJa coco(type: Tar) { | |
| 80 | de f FileTree reportTre e = fileTr ee(dir: '. ', | |
| 81 | includ es: ['VetL inkService s/build/ja cocoHtml/* *']) | |
| 82 | fr om reportT ree | |
| 83 | ba seName = ' jacocoRepo rts' | |
| 84 | de stinationD ir = file( '.') | |
| 85 | ex tension = 'tar' | |
| 86 | co mpression = Compress ion.GZIP | |
| 87 | } | |
| 88 | ||
| 89 | publishing { | |
| 90 | pu blications { | |
| 91 | if(t arJacoco.a rchivePath .exists()) { | |
| 92 | maven( MavenPubli cation) { | |
| 93 | artifact (tarJacoco ){ | |
| 94 | artifactId "VetLinkS ervices" | |
| 95 | classifier "jacocoRe ports" | |
| 96 | } | |
| 97 | } | |
| 98 | } | |
| 99 | } | |
| 100 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.