From 27f076fde0281b7dbcc933ef7630d37f6c4bc3c5 Mon Sep 17 00:00:00 2001
From: Sara Bertocco <bertocco@oats.inaf.it>
Date: Fri, 17 Feb 2017 16:22:51 +0100
Subject: [PATCH] local build
---
cadc-access-control-admin/build.gradle | 14 ++++++++++----
cadc-access-control-identity/build.gradle | 17 ++++++++++++-----
cadc-access-control-server/build.gradle | 23 +++++++++++++++++------
cadc-access-control/build.gradle | 11 ++++++++---
4 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/cadc-access-control-admin/build.gradle b/cadc-access-control-admin/build.gradle
index 4c61862d..6adf9401 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 a204a007..0ddf6772 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 ab582da2..b8004ca9 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 d519622d..6d89a63f 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.+'
--
GitLab