Commit c9268fb2 authored by Patrick Dowler's avatar Patrick Dowler Committed by GitHub
Browse files

Merge pull request #16 from brianmajor/issue-10 

issue-10 - reverted API changes in GMSClient
parents cf0e8254 b3eb73e4

cadc-access-control-server/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ repositories { 
sourceCompatibility = 1.7

group = 'org.opencadc'



version = '1.1.0'

version = '1.1.1'



dependencies {

    compile 'log4j:log4j:1.2.+'
@@ -22,7 +22,7 @@ dependencies { 
    compile 'xerces:xercesImpl:2.+'

    compile 'com.unboundid:unboundid-ldapsdk:2.3.+'



    compile 'org.opencadc:cadc-access-control:1.1.+'

    compile 'org.opencadc:cadc-access-control:[1.1.1,)'

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

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

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

cadc-access-control/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ sourceCompatibility = 1.7 


group = 'org.opencadc'



version = '1.1.0'

version = '1.1.1'



mainClassName = 'ca.nrc.cadc.ac.client.GMSClientMain'

cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java

+75 −69

File changed.

Preview size limit exceeded, changes collapsed.

cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClientMain.java→cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/Main.java

+26 −44

File changed and moved.

Preview size limit exceeded, changes collapsed.

cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java

+29 −23

File changed.

Preview size limit exceeded, changes collapsed.