Commit 6012aba8 authored by Sara Bertocco's avatar Sara Bertocco
Browse files

Merge remote-tracking branch 'ia2gitlab/master'

parents ca862ad4 27f076fd
...@@ -11,6 +11,8 @@ repositories { ...@@ -11,6 +11,8 @@ repositories {
mavenLocal() mavenLocal()
} }
jar.archiveName = "cadc-access-control-admin.jar"
sourceCompatibility = 1.7 sourceCompatibility = 1.7
group = 'org.opencadc' group = 'org.opencadc'
...@@ -26,10 +28,14 @@ dependencies { ...@@ -26,10 +28,14 @@ dependencies {
compile 'com.unboundid:unboundid-ldapsdk:2.3.+' compile 'com.unboundid:unboundid-ldapsdk:2.3.+'
compile 'com.sun.mail:javax.mail:1.+' compile 'com.sun.mail:javax.mail:1.+'
compile 'org.opencadc:cadc-util:1.+' //compile 'org.opencadc:cadc-util:1.+'
compile 'org.opencadc:cadc-registry:1.+' //compile 'org.opencadc:cadc-registry:1.+'
compile 'org.opencadc:cadc-access-control:1.+' //compile 'org.opencadc:cadc-access-control:1.+'
compile 'org.opencadc:cadc-access-control-server:1.+' //compile 'org.opencadc:cadc-access-control-server:1.+'
compile files('/home/bertocco/opt/opencadc/projects/core/cadc-util/build/libs/cadc-util.jar')
compile files('/home/bertocco/opt/opencadc/projects/reg/cadc-registry/build/libs/cadc-registry.jar')
compile files('/home/bertocco/opt/opencadc/projects/ac/cadc-access-control/build/libs/cadc-access-control.jar')
compile files('/home/bertocco/opt/opencadc/projects/ac/cadc-access-control-server/build/libs/cadc-access-control-server.jar')
testCompile 'junit:junit:4.+' testCompile 'junit:junit:4.+'
} }
......
...@@ -10,6 +10,8 @@ repositories { ...@@ -10,6 +10,8 @@ repositories {
mavenLocal() mavenLocal()
} }
jar.archiveName = "cadc-access-control-identity.jar"
sourceCompatibility = 1.7 sourceCompatibility = 1.7
group = 'org.opencadc' group = 'org.opencadc'
...@@ -18,10 +20,15 @@ version = '1.0.3' ...@@ -18,10 +20,15 @@ version = '1.0.3'
dependencies { dependencies {
compile 'log4j:log4j:1.2.+' compile 'log4j:log4j:1.2.+'
compile 'org.opencadc:cadc-util:1.+' //compile 'org.opencadc:cadc-util:1.+'
compile 'org.opencadc:cadc-registry:1.+' //compile 'org.opencadc:cadc-registry:1.+'
compile 'org.opencadc:cadc-vosi:1.+' //compile 'org.opencadc:cadc-vosi:1.+'
compile 'org.opencadc:cadc-access-control:1.+' //compile 'org.opencadc:cadc-access-control:1.+'
compile files('/home/bertocco/opt/opencadc/projects/core/cadc-log/build/libs/cadc-log.jar')
compile files('/home/bertocco/opt/opencadc/projects/core/cadc-util/build/libs/cadc-util.jar')
compile files('/home/bertocco/opt/opencadc/projects/reg/cadc-registry/build/libs/cadc-registry.jar')
compile files('/home/bertocco/opt/opencadc/projects/reg/cadc-vosi/build/libs/cadc-vosi.jar')
compile files('/home/bertocco/opt/opencadc/projects/ac/cadc-access-control/build/libs/cadc-access-control.jar')
testCompile 'junit:junit:4.+' testCompile 'junit:junit:4.+'
} }
...@@ -10,6 +10,8 @@ repositories { ...@@ -10,6 +10,8 @@ repositories {
mavenLocal() mavenLocal()
} }
jar.archiveName = "cadc-access-control-server.jar"
sourceCompatibility = 1.7 sourceCompatibility = 1.7
group = 'org.opencadc' group = 'org.opencadc'
...@@ -21,13 +23,22 @@ dependencies { ...@@ -21,13 +23,22 @@ dependencies {
compile 'org.json:json:20160212' compile 'org.json:json:20160212'
compile 'xerces:xercesImpl:2.+' compile 'xerces:xercesImpl:2.+'
compile 'com.unboundid:unboundid-ldapsdk:2.3.+' compile 'com.unboundid:unboundid-ldapsdk:2.3.+'
compile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
//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.+'
//compile 'org.opencadc:cadc-uws:1.+'
//compile 'org.opencadc:cadc-uws-server:1.+'
compile 'org.opencadc:cadc-access-control:[1.1.1,)' compile files('/home/bertocco/opt/opencadc/projects/ac/cadc-access-control/build/libs/cadc-access-control.jar')
compile 'org.opencadc:cadc-util:1.+' compile files('/home/bertocco/opt/opencadc/projects/core/cadc-util/build/libs/cadc-util.jar')
compile 'org.opencadc:cadc-log:1.+' compile files('/home/bertocco/opt/opencadc/projects/core/cadc-log/build/libs/cadc-log.jar')
compile 'org.opencadc:cadc-registry:1.+' compile files('/home/bertocco/opt/opencadc/projects/reg/cadc-registry/build/libs/cadc-registry.jar')
compile 'org.opencadc:cadc-uws:1.+' compile files('/home/bertocco/opt/opencadc/projects/uws/cadc-uws/build/libs/cadc-uws.jar')
compile 'org.opencadc:cadc-uws-server:1.+' compile files('/home/bertocco/opt/opencadc/projects/uws/cadc-uws-server/build/libs/cadc-uws-server.jar')
testCompile 'junit:junit:4.+' testCompile 'junit:junit:4.+'
testCompile 'org.easymock:easymock:3.+' testCompile 'org.easymock:easymock:3.+'
......
...@@ -11,6 +11,8 @@ repositories { ...@@ -11,6 +11,8 @@ repositories {
mavenLocal() mavenLocal()
} }
jar.archiveName = "cadc-access-control.jar"
sourceCompatibility = 1.7 sourceCompatibility = 1.7
group = 'org.opencadc' group = 'org.opencadc'
...@@ -24,9 +26,12 @@ dependencies { ...@@ -24,9 +26,12 @@ dependencies {
compile 'org.jdom:jdom2:2.+' compile 'org.jdom:jdom2:2.+'
compile 'org.json:json:20160212' compile 'org.json:json:20160212'
compile 'org.opencadc:cadc-util:1.+' //compile 'org.opencadc:cadc-util:1.+'
compile 'org.opencadc:cadc-cdp:[1.0,)' //compile 'org.opencadc:cadc-cdp:[1.0,)'
compile 'org.opencadc:cadc-registry:1.+' //compile 'org.opencadc:cadc-registry:1.+'
compile files('/home/bertocco/opt/opencadc/projects/core/cadc-util/build/libs/cadc-util.jar')
compile files('/home/bertocco/opt/opencadc/projects/cdp/cadc-cdp/build/libs/cadc-cdp.jar')
compile files('/home/bertocco/opt/opencadc/projects/reg/cadc-registry/build/libs/cadc-registry.jar')
testCompile 'junit:junit:4.+' testCompile 'junit:junit:4.+'
testCompile 'xerces:xercesImpl:2.+' testCompile 'xerces:xercesImpl:2.+'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment