diff --git a/cadc-access-control-admin/build.gradle b/cadc-access-control-admin/build.gradle index 4c61862d44ffa9804e53d0194f9265697dfc8b91..6adf94012d32ce9e5ce1a87924511d3e8e5fe64e 100644 --- a/cadc-access-control-admin/build.gradle +++ b/cadc-access-control-admin/build.gradle @@ -11,6 +11,8 @@ repositories { mavenLocal() } +jar.archiveName = "cadc-access-control-admin.jar" + sourceCompatibility = 1.7 group = 'org.opencadc' @@ -26,10 +28,14 @@ dependencies { compile 'com.unboundid:unboundid-ldapsdk:2.3.+' compile 'com.sun.mail:javax.mail:1.+' - compile 'org.opencadc:cadc-util:1.+' - compile 'org.opencadc:cadc-registry:1.+' - compile 'org.opencadc:cadc-access-control:1.+' - compile 'org.opencadc:cadc-access-control-server:1.+' + //compile 'org.opencadc:cadc-util:1.+' + //compile 'org.opencadc:cadc-registry:1.+' + //compile 'org.opencadc:cadc-access-control: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.+' } diff --git a/cadc-access-control-identity/build.gradle b/cadc-access-control-identity/build.gradle index a204a007ce00a554d01b17a79d11b00059582f8d..0ddf6772b113dc4b77c0a638c99c137b09fae100 100644 --- a/cadc-access-control-identity/build.gradle +++ b/cadc-access-control-identity/build.gradle @@ -10,6 +10,8 @@ repositories { mavenLocal() } +jar.archiveName = "cadc-access-control-identity.jar" + sourceCompatibility = 1.7 group = 'org.opencadc' @@ -18,10 +20,15 @@ version = '1.0.3' dependencies { compile 'log4j:log4j:1.2.+' - compile 'org.opencadc:cadc-util:1.+' - compile 'org.opencadc:cadc-registry:1.+' - compile 'org.opencadc:cadc-vosi:1.+' - compile 'org.opencadc:cadc-access-control:1.+' - + //compile 'org.opencadc:cadc-util:1.+' + //compile 'org.opencadc:cadc-registry:1.+' + //compile 'org.opencadc:cadc-vosi: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.+' } diff --git a/cadc-access-control-server/build.gradle b/cadc-access-control-server/build.gradle index ab582da22518bc62f2d768b6a595ffbd9add616f..b8004ca90baf55fa1e0a023aa83a9a4ef769fb62 100644 --- a/cadc-access-control-server/build.gradle +++ b/cadc-access-control-server/build.gradle @@ -10,6 +10,8 @@ repositories { mavenLocal() } +jar.archiveName = "cadc-access-control-server.jar" + sourceCompatibility = 1.7 group = 'org.opencadc' @@ -21,13 +23,22 @@ dependencies { compile 'org.json:json:20160212' compile 'xerces:xercesImpl:2.+' 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 '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 files('/home/bertocco/opt/opencadc/projects/ac/cadc-access-control/build/libs/cadc-access-control.jar') + compile files('/home/bertocco/opt/opencadc/projects/core/cadc-util/build/libs/cadc-util.jar') + compile files('/home/bertocco/opt/opencadc/projects/core/cadc-log/build/libs/cadc-log.jar') + compile files('/home/bertocco/opt/opencadc/projects/reg/cadc-registry/build/libs/cadc-registry.jar') + compile files('/home/bertocco/opt/opencadc/projects/uws/cadc-uws/build/libs/cadc-uws.jar') + compile files('/home/bertocco/opt/opencadc/projects/uws/cadc-uws-server/build/libs/cadc-uws-server.jar') testCompile 'junit:junit:4.+' testCompile 'org.easymock:easymock:3.+' diff --git a/cadc-access-control/build.gradle b/cadc-access-control/build.gradle index d519622d02792714286ebb2eebc5e489c59beb0f..6d89a63f08bd3b4205ac31c4f2dd288917b9f1a5 100644 --- a/cadc-access-control/build.gradle +++ b/cadc-access-control/build.gradle @@ -11,6 +11,8 @@ repositories { mavenLocal() } +jar.archiveName = "cadc-access-control.jar" + sourceCompatibility = 1.7 group = 'org.opencadc' @@ -24,9 +26,12 @@ dependencies { compile 'org.jdom:jdom2:2.+' compile 'org.json:json:20160212' - compile 'org.opencadc:cadc-util:1.+' - compile 'org.opencadc:cadc-cdp:[1.0,)' - compile 'org.opencadc:cadc-registry:1.+' + //compile 'org.opencadc:cadc-util:1.+' + //compile 'org.opencadc:cadc-cdp:[1.0,)' + //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 'xerces:xercesImpl:2.+'