Commit abe55b51 authored by opencadc-admin's avatar opencadc-admin Committed by GitHub
Browse files

Merge pull request #4 from jburke-cadc/master 

s1970: added gradle application plugin
parents 398e9227 9374d383

cadc-cdp-server/build.gradle

+2 −7
Original line number Original line Diff line number Diff line
@@ -8,11 +8,6 @@ plugins { 
repositories {

repositories {

    jcenter()

    jcenter()

    mavenLocal()

    mavenLocal()



    // Only here until cadcUtil is in jcenter.

    maven {

        url  "http://dl.bintray.com/opencadc/software"

    }

}

}





sourceCompatibility = 1.7

sourceCompatibility = 1.7
@@ -32,6 +27,6 @@ dependencies { 
    compile 'org.opencadc:cadc-cdp:1.+'

    compile 'org.opencadc:cadc-cdp:1.+'

    compile 'org.opencadc:cadc-vosi:1.+'

    compile 'org.opencadc:cadc-vosi:1.+'





    testCompile group: 'junit', name: 'junit', version: '4.+'

    testCompile 'junit:junit:4.+'

    testCompile group: 'org.easymock', name: 'easymock', version: '3.+'

    testCompile 'org.easymock:easymock:3.+'

}
 
}

cadc-cdp/build.gradle

+7 −5
Original line number Original line Diff line number Diff line
@@ -3,16 +3,12 @@ plugins { 
    id 'maven'

    id 'maven'

    id 'maven-publish'

    id 'maven-publish'

    id 'com.jfrog.bintray' version '1.7.1'

    id 'com.jfrog.bintray' version '1.7.1'

    id 'application'

}

}





repositories {

repositories {

    jcenter()

    jcenter()

    mavenLocal()

    mavenLocal()



    // Only here until cadcUtil is in jcenter.

    maven {

        url  "http://dl.bintray.com/opencadc/software"

    }

}

}





sourceCompatibility = 1.7

sourceCompatibility = 1.7
@@ -21,6 +17,8 @@ group = 'org.opencadc' 




version = '1.0.2'

version = '1.0.2'





mainClassName = 'ca.nrc.cadc.cred.client.Main'



dependencies {

dependencies {

    compile 'log4j:log4j:1.2.+'

    compile 'log4j:log4j:1.2.+'

    compile 'org.jdom:jdom2:2.+'

    compile 'org.jdom:jdom2:2.+'
@@ -31,3 +29,7 @@ dependencies { 
    compile 'org.opencadc:cadc-log:1.+'

    compile 'org.opencadc:cadc-log:1.+'

    compile 'org.opencadc:cadc-registry:1.+'

    compile 'org.opencadc:cadc-registry:1.+'

}

}



configurations {

    runtime.exclude group: 'org.springframework'

}